mirror of
https://github.com/matrix-org/dendrite.git
synced 2024-11-23 14:51:56 -06:00
c45d0936b5
* Generic-based internal HTTP API (tested out on a few endpoints in the federation API)
* Add `PerformInvite`
* More tweaks
* Fix metric name
* Fix LookupStateIDs
* Lots of changes to clients
* Some serverside stuff
* Some error handling
* Use paths as metric names
* Revert "Use paths as metric names"
This reverts commit a9323a6a34
.
* Namespace metric names
* Remove duplicate entry
* Remove another duplicate entry
* Tweak error handling
* Some more tweaks
* Update error behaviour
* Some more error tweaking
* Fix API path for `PerformDeleteKeys`
* Fix another path
* Tweak federation client proxying
* Fix another path
* Don't return typed nils
* Some more tweaks, not that it makes any difference
* Tweak federation client proxying
* Maybe fix the key backup test
175 lines
5.1 KiB
Go
175 lines
5.1 KiB
Go
// Copyright 2020 The Matrix.org Foundation C.I.C.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package inthttp
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net/http"
|
|
|
|
"github.com/matrix-org/dendrite/internal/httputil"
|
|
"github.com/matrix-org/dendrite/keyserver/api"
|
|
userapi "github.com/matrix-org/dendrite/userapi/api"
|
|
)
|
|
|
|
// HTTP paths for the internal HTTP APIs
|
|
const (
|
|
InputDeviceListUpdatePath = "/keyserver/inputDeviceListUpdate"
|
|
PerformUploadKeysPath = "/keyserver/performUploadKeys"
|
|
PerformClaimKeysPath = "/keyserver/performClaimKeys"
|
|
PerformDeleteKeysPath = "/keyserver/performDeleteKeys"
|
|
PerformUploadDeviceKeysPath = "/keyserver/performUploadDeviceKeys"
|
|
PerformUploadDeviceSignaturesPath = "/keyserver/performUploadDeviceSignatures"
|
|
QueryKeysPath = "/keyserver/queryKeys"
|
|
QueryKeyChangesPath = "/keyserver/queryKeyChanges"
|
|
QueryOneTimeKeysPath = "/keyserver/queryOneTimeKeys"
|
|
QueryDeviceMessagesPath = "/keyserver/queryDeviceMessages"
|
|
QuerySignaturesPath = "/keyserver/querySignatures"
|
|
)
|
|
|
|
// NewKeyServerClient creates a KeyInternalAPI implemented by talking to a HTTP POST API.
|
|
// If httpClient is nil an error is returned
|
|
func NewKeyServerClient(
|
|
apiURL string,
|
|
httpClient *http.Client,
|
|
) (api.KeyInternalAPI, error) {
|
|
if httpClient == nil {
|
|
return nil, errors.New("NewKeyServerClient: httpClient is <nil>")
|
|
}
|
|
return &httpKeyInternalAPI{
|
|
apiURL: apiURL,
|
|
httpClient: httpClient,
|
|
}, nil
|
|
}
|
|
|
|
type httpKeyInternalAPI struct {
|
|
apiURL string
|
|
httpClient *http.Client
|
|
}
|
|
|
|
func (h *httpKeyInternalAPI) SetUserAPI(i userapi.KeyserverUserAPI) {
|
|
// no-op: doesn't need it
|
|
}
|
|
|
|
func (h *httpKeyInternalAPI) PerformClaimKeys(
|
|
ctx context.Context,
|
|
request *api.PerformClaimKeysRequest,
|
|
response *api.PerformClaimKeysResponse,
|
|
) error {
|
|
return httputil.CallInternalRPCAPI(
|
|
"PerformClaimKeys", h.apiURL+PerformClaimKeysPath,
|
|
h.httpClient, ctx, request, response,
|
|
)
|
|
}
|
|
|
|
func (h *httpKeyInternalAPI) PerformDeleteKeys(
|
|
ctx context.Context,
|
|
request *api.PerformDeleteKeysRequest,
|
|
response *api.PerformDeleteKeysResponse,
|
|
) error {
|
|
return httputil.CallInternalRPCAPI(
|
|
"PerformDeleteKeys", h.apiURL+PerformDeleteKeysPath,
|
|
h.httpClient, ctx, request, response,
|
|
)
|
|
}
|
|
|
|
func (h *httpKeyInternalAPI) PerformUploadKeys(
|
|
ctx context.Context,
|
|
request *api.PerformUploadKeysRequest,
|
|
response *api.PerformUploadKeysResponse,
|
|
) error {
|
|
return httputil.CallInternalRPCAPI(
|
|
"PerformUploadKeys", h.apiURL+PerformUploadKeysPath,
|
|
h.httpClient, ctx, request, response,
|
|
)
|
|
}
|
|
|
|
func (h *httpKeyInternalAPI) QueryKeys(
|
|
ctx context.Context,
|
|
request *api.QueryKeysRequest,
|
|
response *api.QueryKeysResponse,
|
|
) error {
|
|
return httputil.CallInternalRPCAPI(
|
|
"QueryKeys", h.apiURL+QueryKeysPath,
|
|
h.httpClient, ctx, request, response,
|
|
)
|
|
}
|
|
|
|
func (h *httpKeyInternalAPI) QueryOneTimeKeys(
|
|
ctx context.Context,
|
|
request *api.QueryOneTimeKeysRequest,
|
|
response *api.QueryOneTimeKeysResponse,
|
|
) error {
|
|
return httputil.CallInternalRPCAPI(
|
|
"QueryOneTimeKeys", h.apiURL+QueryOneTimeKeysPath,
|
|
h.httpClient, ctx, request, response,
|
|
)
|
|
}
|
|
|
|
func (h *httpKeyInternalAPI) QueryDeviceMessages(
|
|
ctx context.Context,
|
|
request *api.QueryDeviceMessagesRequest,
|
|
response *api.QueryDeviceMessagesResponse,
|
|
) error {
|
|
return httputil.CallInternalRPCAPI(
|
|
"QueryDeviceMessages", h.apiURL+QueryDeviceMessagesPath,
|
|
h.httpClient, ctx, request, response,
|
|
)
|
|
}
|
|
|
|
func (h *httpKeyInternalAPI) QueryKeyChanges(
|
|
ctx context.Context,
|
|
request *api.QueryKeyChangesRequest,
|
|
response *api.QueryKeyChangesResponse,
|
|
) error {
|
|
return httputil.CallInternalRPCAPI(
|
|
"QueryKeyChanges", h.apiURL+QueryKeyChangesPath,
|
|
h.httpClient, ctx, request, response,
|
|
)
|
|
}
|
|
|
|
func (h *httpKeyInternalAPI) PerformUploadDeviceKeys(
|
|
ctx context.Context,
|
|
request *api.PerformUploadDeviceKeysRequest,
|
|
response *api.PerformUploadDeviceKeysResponse,
|
|
) error {
|
|
return httputil.CallInternalRPCAPI(
|
|
"PerformUploadDeviceKeys", h.apiURL+PerformUploadDeviceKeysPath,
|
|
h.httpClient, ctx, request, response,
|
|
)
|
|
}
|
|
|
|
func (h *httpKeyInternalAPI) PerformUploadDeviceSignatures(
|
|
ctx context.Context,
|
|
request *api.PerformUploadDeviceSignaturesRequest,
|
|
response *api.PerformUploadDeviceSignaturesResponse,
|
|
) error {
|
|
return httputil.CallInternalRPCAPI(
|
|
"PerformUploadDeviceSignatures", h.apiURL+PerformUploadDeviceSignaturesPath,
|
|
h.httpClient, ctx, request, response,
|
|
)
|
|
}
|
|
|
|
func (h *httpKeyInternalAPI) QuerySignatures(
|
|
ctx context.Context,
|
|
request *api.QuerySignaturesRequest,
|
|
response *api.QuerySignaturesResponse,
|
|
) error {
|
|
return httputil.CallInternalRPCAPI(
|
|
"QuerySignatures", h.apiURL+QuerySignaturesPath,
|
|
h.httpClient, ctx, request, response,
|
|
)
|
|
}
|