urgent fix for ratelimits

superisaac · Nov 25, 2024 · 70e6602 · 70e6602
1 parent bf1e9a6
commit 70e6602
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/server/account.go b/server/account.go
@@ -34,6 +34,15 @@ func AccFromContext(ctx context.Context) *Acc {
 	panic("context does not have account")
 }
 
+func AccFromContextOrNil(ctx context.Context) *Acc {
+	if v := ctx.Value("account"); v != nil {
+		if acc, ok := v.(*Acc); ok {
+			return acc
+		}
+	}
+	return nil
+}
+
 type AccHandler struct {
 	rootCtx context.Context
 	next    http.Handler

diff --git a/server/ratelimit.go b/server/ratelimit.go
@@ -22,7 +22,11 @@ func NewRatelimitHandler(rootCtx context.Context, next http.Handler) *RatelimitH
 }
 
 func (handler *RatelimitHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	acc := AccFromContext(r.Context())
+	acc := AccFromContextOrNil(r.Context())
+	if acc == nil {
+		handler.next.ServeHTTP(w, r)
+		return
+	}
 	var ratelimit RatelimitConfig
 	var accName string
 	if acc != nil {