From 81fe704e2cbaff57eaece1b8bc39beca4cac5874 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@acorn.io>
Date: Wed, 16 Oct 2024 10:46:44 -0700
Subject: [PATCH] chore: move around authz, add user auth

---
 pkg/api/authz/authz.go | 89 +++++++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 40 deletions(-)

diff --git a/pkg/api/authz/authz.go b/pkg/api/authz/authz.go
index 92ea4632..57f32878 100644
--- a/pkg/api/authz/authz.go
+++ b/pkg/api/authz/authz.go
@@ -1,6 +1,7 @@
 package authz
 
 import (
+	"maps"
 	"net/http"
 	"slices"
 
@@ -16,6 +17,43 @@ const (
 	anyGroup = "*"
 )
 
+var staticRules = map[string][]string{
+	AdminGroup: {
+		// Yay! Everything
+		"/",
+	},
+	anyGroup: {
+		// Allow access to the UI
+		"/admin/",
+		"/",
+		"/static/",
+		// Allow access to the oauth2 endpoints
+		"/oauth2/",
+		// Allow access to the sign-in page
+		"/sign-in",
+
+		"POST /api/webhooks/{id}",
+		"GET /api/token-request/{id}",
+		"POST /api/token-request",
+		"GET /api/token-request/{id}/{service}",
+
+		"GET /api/auth-providers",
+		"GET /api/auth-providers/{slug}",
+
+		"GET /api/oauth/start/{id}/{service}",
+		"/api/oauth/redirect/{service}",
+
+		"GET /api/app-oauth/authorize/{id}",
+		"GET /api/app-oauth/refresh/{id}",
+		"GET /api/app-oauth/callback/{id}",
+		"GET /api/app-oauth/get-token",
+	},
+	AuthenticatedGroup: {
+		"POST /api/invoke/otto/threads/user",
+		"GET /api/threads/user/events",
+	},
+}
+
 type Authorizer struct {
 	rules []rule
 }
@@ -50,50 +88,21 @@ func defaultRules() []rule {
 		f     = (*fake)(nil)
 	)
 
-	// Build admin mux, admins can assess any URL
-	adminMux := http.NewServeMux()
-	adminMux.Handle("/", f)
-
-	rules = append(rules, rule{
-		group: AdminGroup,
-		mux:   adminMux,
-	})
-
-	// Build mux that anyone can access
-	anyMux := http.NewServeMux()
-	// Allow access to the UI
-	anyMux.Handle("/admin/", f)
-	// Allow access to the oauth2 endpoints
-	anyMux.Handle("/oauth2/", f)
-	// Allow access to the sign-in page
-	anyMux.Handle("/sign-in", f)
-
-	anyMux.Handle("POST /api/webhooks/{id}", f)
-
-	anyMux.Handle("GET /api/token-request/{id}", f)
-	anyMux.Handle("POST /api/token-request", f)
-	anyMux.Handle("GET /api/token-request/{id}/{service}", f)
-
-	anyMux.Handle("GET /api/auth-providers", f)
-	anyMux.Handle("GET /api/auth-providers/{slug}", f)
-
-	anyMux.Handle("GET /api/oauth/start/{id}/{service}", f)
-	anyMux.Handle("/api/oauth/redirect/{service}", f)
-
-	anyMux.Handle("GET /api/app-oauth/authorize/{id}", f)
-	anyMux.Handle("GET /api/app-oauth/refresh/{id}", f)
-	anyMux.Handle("GET /api/app-oauth/callback/{id}", f)
-	anyMux.Handle("GET /api/app-oauth/get-token", f)
-
-	rules = append(rules, rule{
-		group: anyGroup,
-		mux:   anyMux,
-	})
+	for _, group := range slices.Sorted(maps.Keys(staticRules)) {
+		rule := rule{
+			group: group,
+			mux:   http.NewServeMux(),
+		}
+		for _, url := range staticRules[group] {
+			rule.mux.Handle(url, f)
+		}
+		rules = append(rules, rule)
+	}
 
 	return rules
 }
 
-// fake is a fake handler that does nothing
+// fake is a fake handler that does fake things
 type fake struct{}
 
 func (f *fake) ServeHTTP(http.ResponseWriter, *http.Request) {}