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
170 lines
4.9 KiB
Go
170 lines
4.9 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 routing
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/matrix-org/dendrite/clientapi/httputil"
|
|
"github.com/matrix-org/dendrite/clientapi/jsonerror"
|
|
"github.com/matrix-org/dendrite/keyserver/api"
|
|
userapi "github.com/matrix-org/dendrite/userapi/api"
|
|
"github.com/matrix-org/util"
|
|
)
|
|
|
|
type uploadKeysRequest struct {
|
|
DeviceKeys json.RawMessage `json:"device_keys"`
|
|
OneTimeKeys map[string]json.RawMessage `json:"one_time_keys"`
|
|
}
|
|
|
|
func UploadKeys(req *http.Request, keyAPI api.ClientKeyAPI, device *userapi.Device) util.JSONResponse {
|
|
var r uploadKeysRequest
|
|
resErr := httputil.UnmarshalJSONRequest(req, &r)
|
|
if resErr != nil {
|
|
return *resErr
|
|
}
|
|
|
|
uploadReq := &api.PerformUploadKeysRequest{
|
|
DeviceID: device.ID,
|
|
UserID: device.UserID,
|
|
}
|
|
if r.DeviceKeys != nil {
|
|
uploadReq.DeviceKeys = []api.DeviceKeys{
|
|
{
|
|
DeviceID: device.ID,
|
|
UserID: device.UserID,
|
|
KeyJSON: r.DeviceKeys,
|
|
},
|
|
}
|
|
}
|
|
if r.OneTimeKeys != nil {
|
|
uploadReq.OneTimeKeys = []api.OneTimeKeys{
|
|
{
|
|
DeviceID: device.ID,
|
|
UserID: device.UserID,
|
|
KeyJSON: r.OneTimeKeys,
|
|
},
|
|
}
|
|
}
|
|
|
|
var uploadRes api.PerformUploadKeysResponse
|
|
if err := keyAPI.PerformUploadKeys(req.Context(), uploadReq, &uploadRes); err != nil {
|
|
return util.ErrorResponse(err)
|
|
}
|
|
if uploadRes.Error != nil {
|
|
util.GetLogger(req.Context()).WithError(uploadRes.Error).Error("Failed to PerformUploadKeys")
|
|
return jsonerror.InternalServerError()
|
|
}
|
|
if len(uploadRes.KeyErrors) > 0 {
|
|
util.GetLogger(req.Context()).WithField("key_errors", uploadRes.KeyErrors).Error("Failed to upload one or more keys")
|
|
return util.JSONResponse{
|
|
Code: 400,
|
|
JSON: uploadRes.KeyErrors,
|
|
}
|
|
}
|
|
keyCount := make(map[string]int)
|
|
// we only return key counts when the client uploads OTKs
|
|
if len(uploadRes.OneTimeKeyCounts) > 0 {
|
|
keyCount = uploadRes.OneTimeKeyCounts[0].KeyCount
|
|
}
|
|
return util.JSONResponse{
|
|
Code: 200,
|
|
JSON: struct {
|
|
OTKCounts interface{} `json:"one_time_key_counts"`
|
|
}{keyCount},
|
|
}
|
|
}
|
|
|
|
type queryKeysRequest struct {
|
|
Timeout int `json:"timeout"`
|
|
Token string `json:"token"`
|
|
DeviceKeys map[string][]string `json:"device_keys"`
|
|
}
|
|
|
|
func (r *queryKeysRequest) GetTimeout() time.Duration {
|
|
if r.Timeout == 0 {
|
|
return 10 * time.Second
|
|
}
|
|
return time.Duration(r.Timeout) * time.Millisecond
|
|
}
|
|
|
|
func QueryKeys(req *http.Request, keyAPI api.ClientKeyAPI, device *userapi.Device) util.JSONResponse {
|
|
var r queryKeysRequest
|
|
resErr := httputil.UnmarshalJSONRequest(req, &r)
|
|
if resErr != nil {
|
|
return *resErr
|
|
}
|
|
queryRes := api.QueryKeysResponse{}
|
|
if err := keyAPI.QueryKeys(req.Context(), &api.QueryKeysRequest{
|
|
UserID: device.UserID,
|
|
UserToDevices: r.DeviceKeys,
|
|
Timeout: r.GetTimeout(),
|
|
// TODO: Token?
|
|
}, &queryRes); err != nil {
|
|
return util.ErrorResponse(err)
|
|
}
|
|
return util.JSONResponse{
|
|
Code: 200,
|
|
JSON: map[string]interface{}{
|
|
"device_keys": queryRes.DeviceKeys,
|
|
"master_keys": queryRes.MasterKeys,
|
|
"self_signing_keys": queryRes.SelfSigningKeys,
|
|
"user_signing_keys": queryRes.UserSigningKeys,
|
|
"failures": queryRes.Failures,
|
|
},
|
|
}
|
|
}
|
|
|
|
type claimKeysRequest struct {
|
|
TimeoutMS int `json:"timeout"`
|
|
// The keys to be claimed. A map from user ID, to a map from device ID to algorithm name.
|
|
OneTimeKeys map[string]map[string]string `json:"one_time_keys"`
|
|
}
|
|
|
|
func (r *claimKeysRequest) GetTimeout() time.Duration {
|
|
if r.TimeoutMS == 0 {
|
|
return 10 * time.Second
|
|
}
|
|
return time.Duration(r.TimeoutMS) * time.Millisecond
|
|
}
|
|
|
|
func ClaimKeys(req *http.Request, keyAPI api.ClientKeyAPI) util.JSONResponse {
|
|
var r claimKeysRequest
|
|
resErr := httputil.UnmarshalJSONRequest(req, &r)
|
|
if resErr != nil {
|
|
return *resErr
|
|
}
|
|
claimRes := api.PerformClaimKeysResponse{}
|
|
if err := keyAPI.PerformClaimKeys(req.Context(), &api.PerformClaimKeysRequest{
|
|
OneTimeKeys: r.OneTimeKeys,
|
|
Timeout: r.GetTimeout(),
|
|
}, &claimRes); err != nil {
|
|
return jsonerror.InternalAPIError(req.Context(), err)
|
|
}
|
|
if claimRes.Error != nil {
|
|
util.GetLogger(req.Context()).WithError(claimRes.Error).Error("failed to PerformClaimKeys")
|
|
return jsonerror.InternalServerError()
|
|
}
|
|
return util.JSONResponse{
|
|
Code: 200,
|
|
JSON: map[string]interface{}{
|
|
"one_time_keys": claimRes.OneTimeKeys,
|
|
"failures": claimRes.Failures,
|
|
},
|
|
}
|
|
}
|