aboutsummaryrefslogtreecommitdiff
path: root/keyserver/inthttp
diff options
context:
space:
mode:
authorKegsay <kegan@matrix.org>2020-07-28 18:25:16 +0100
committerGitHub <noreply@github.com>2020-07-28 18:25:16 +0100
commit9a5fb489c5f80148a8512e61c95c8df7bb46d314 (patch)
treee41adb86906181ca1946caa0c250af0ac00b842d /keyserver/inthttp
parentadf7b5929401f56bedba92ef778b5e56feefc479 (diff)
Add QueryKeyChanges (#1228)
Hook some things up to call it as well.
Diffstat (limited to 'keyserver/inthttp')
-rw-r--r--keyserver/inthttp/client.go18
-rw-r--r--keyserver/inthttp/server.go11
2 files changed, 29 insertions, 0 deletions
diff --git a/keyserver/inthttp/client.go b/keyserver/inthttp/client.go
index 4c0f1e53..cd9cf70d 100644
--- a/keyserver/inthttp/client.go
+++ b/keyserver/inthttp/client.go
@@ -29,6 +29,7 @@ const (
PerformUploadKeysPath = "/keyserver/performUploadKeys"
PerformClaimKeysPath = "/keyserver/performClaimKeys"
QueryKeysPath = "/keyserver/queryKeys"
+ QueryKeyChangesPath = "/keyserver/queryKeyChanges"
)
// NewKeyServerClient creates a KeyInternalAPI implemented by talking to a HTTP POST API.
@@ -101,3 +102,20 @@ func (h *httpKeyInternalAPI) QueryKeys(
}
}
}
+
+func (h *httpKeyInternalAPI) QueryKeyChanges(
+ ctx context.Context,
+ request *api.QueryKeyChangesRequest,
+ response *api.QueryKeyChangesResponse,
+) {
+ span, ctx := opentracing.StartSpanFromContext(ctx, "QueryKeyChanges")
+ defer span.Finish()
+
+ apiURL := h.apiURL + QueryKeyChangesPath
+ err := httputil.PostJSON(ctx, span, h.httpClient, apiURL, request, response)
+ if err != nil {
+ response.Error = &api.KeyError{
+ Err: err.Error(),
+ }
+ }
+}
diff --git a/keyserver/inthttp/server.go b/keyserver/inthttp/server.go
index ec78b613..f3d2882c 100644
--- a/keyserver/inthttp/server.go
+++ b/keyserver/inthttp/server.go
@@ -58,4 +58,15 @@ func AddRoutes(internalAPIMux *mux.Router, s api.KeyInternalAPI) {
return util.JSONResponse{Code: http.StatusOK, JSON: &response}
}),
)
+ internalAPIMux.Handle(QueryKeyChangesPath,
+ httputil.MakeInternalAPI("queryKeyChanges", func(req *http.Request) util.JSONResponse {
+ request := api.QueryKeyChangesRequest{}
+ response := api.QueryKeyChangesResponse{}
+ if err := json.NewDecoder(req.Body).Decode(&request); err != nil {
+ return util.MessageResponse(http.StatusBadRequest, err.Error())
+ }
+ s.QueryKeyChanges(req.Context(), &request, &response)
+ return util.JSONResponse{Code: http.StatusOK, JSON: &response}
+ }),
+ )
}