From 27e95fd1237d13edafc557531932067d329e9733 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Wed, 8 Feb 2023 15:10:56 +0100 Subject: [chore/bugfix] Serve + throttle publickey separately from rest of ActivityPub API (#1461) * serve publickey separately from AP, don't throttle it * update nginx cache documentation, cache main-key too * throttle public key, but separately from other endpoints --- cmd/gotosocial/action/server/server.go | 2 ++ cmd/gotosocial/action/testrig/testrig.go | 1 + 2 files changed, 3 insertions(+) (limited to 'cmd') diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go index f831d6eba..8cc31430b 100644 --- a/cmd/gotosocial/action/server/server.go +++ b/cmd/gotosocial/action/server/server.go @@ -206,6 +206,7 @@ var Start action.GTSAction = func(ctx context.Context) error { clThrottle := middleware.Throttle(cpuMultiplier) // client api s2sThrottle := middleware.Throttle(cpuMultiplier) // server-to-server (AP) fsThrottle := middleware.Throttle(cpuMultiplier) // fileserver / web templates + pkThrottle := middleware.Throttle(cpuMultiplier) // throttle public key endpoint separately gzip := middleware.Gzip() // applied to all except fileserver @@ -217,6 +218,7 @@ var Start action.GTSAction = func(ctx context.Context) error { wellKnownModule.Route(router, gzip, s2sLimit, s2sThrottle) nodeInfoModule.Route(router, s2sLimit, s2sThrottle, gzip) activityPubModule.Route(router, s2sLimit, s2sThrottle, gzip) + activityPubModule.RoutePublicKey(router, s2sLimit, pkThrottle, gzip) webModule.Route(router, fsLimit, fsThrottle, gzip) gts, err := gotosocial.NewServer(dbService, router, federator, mediaManager) diff --git a/cmd/gotosocial/action/testrig/testrig.go b/cmd/gotosocial/action/testrig/testrig.go index e3e907442..baf63a78a 100644 --- a/cmd/gotosocial/action/testrig/testrig.go +++ b/cmd/gotosocial/action/testrig/testrig.go @@ -139,6 +139,7 @@ var Start action.GTSAction = func(ctx context.Context) error { wellKnownModule.Route(router) nodeInfoModule.Route(router) activityPubModule.Route(router) + activityPubModule.RoutePublicKey(router) webModule.Route(router) gts, err := gotosocial.NewServer(dbService, router, federator, mediaManager) -- cgit v1.2.3