aboutsummaryrefslogtreecommitdiff
path: root/federationapi/federationapi.go
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-08-11 18:19:11 +0100
committerGitHub <noreply@github.com>2020-08-11 18:19:11 +0100
commitbcdf9577a3db0727b4966cfdd3c4471ca6d3f1f6 (patch)
treebc9af1f38e6113e56d597c68e708bea587c49dc0 /federationapi/federationapi.go
parent8b6ab272fb06e59d7747f3f52e1bdd462a52a463 (diff)
Support for server ACLs (#1261)
* First pass at server ACLs (not efficient) * Use transaction origin, update whitelist * Fix federation API test It's sufficient for us to return nothing in response to current state, so that the server ACL check returns no ACLs. * More efficient server ACLs - hopefully * Fix queries * Fix queries * Avoid panics by nil pointers * Bug fixes * Fix state event type * Fix mutex * Update logging * Ignore port when matching servername * Use read mutex * Fix bugs * Fix sync API test * Comments * Add tests, tweaks to behaviour * Fix test output
Diffstat (limited to 'federationapi/federationapi.go')
-rw-r--r--federationapi/federationapi.go1
1 files changed, 0 insertions, 1 deletions
diff --git a/federationapi/federationapi.go b/federationapi/federationapi.go
index e9a8e40a..e838e8e3 100644
--- a/federationapi/federationapi.go
+++ b/federationapi/federationapi.go
@@ -41,7 +41,6 @@ func AddPublicRoutes(
stateAPI currentstateAPI.CurrentStateInternalAPI,
keyAPI keyserverAPI.KeyInternalAPI,
) {
-
routing.Setup(
router, cfg, rsAPI,
eduAPI, federationSenderAPI, keyRing,