Merge branch 'presigned-urls'

cmd/appview/main.go

@@ -1,22 +1,14 @@
 package main
 
 import (
-	"fmt"
 	"os"
-	"time"
 
 	"github.com/distribution/distribution/v3/registry"
 	_ "github.com/distribution/distribution/v3/registry/auth/token"
-	_ "github.com/distribution/distribution/v3/registry/storage/driver/filesystem"
 	_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
-	_ "github.com/distribution/distribution/v3/registry/storage/driver/s3-aws"
 
 	// Register our custom middleware
-	_ "atcr.io/pkg/middleware"
-
-	"atcr.io/pkg/auth/oauth"
-	"atcr.io/pkg/auth/token"
-	"atcr.io/pkg/middleware"
+	_ "atcr.io/pkg/appview/middleware"
 )
 
 func main() {
@@ -26,11 +18,3 @@ func main() {
 		os.Exit(1)
 	}
 }
-
-// Suppress unused import warnings
-var _ = fmt.Sprint
-var _ = os.Stdout
-var _ = time.Now
-var _ = oauth.NewRefresher
-var _ = token.NewIssuer
-var _ = middleware.SetGlobalRefresher

cmd/appview/serve.go

@@ -19,16 +19,15 @@ import (
 	sqlite3 "github.com/mattn/go-sqlite3"
 	"github.com/spf13/cobra"
 
+	"atcr.io/pkg/appview/middleware"
 	"atcr.io/pkg/auth/oauth"
 	"atcr.io/pkg/auth/token"
-	"atcr.io/pkg/middleware"
 
 	// UI components
 	"atcr.io/pkg/appview"
 	"atcr.io/pkg/appview/db"
 	uihandlers "atcr.io/pkg/appview/handlers"
 	"atcr.io/pkg/appview/jetstream"
-	appmiddleware "atcr.io/pkg/appview/middleware"
 	"github.com/gorilla/mux"
 )
 
@@ -473,7 +472,7 @@ func initializeUIRoutes(database *sql.DB, readOnlyDB *sql.DB, sessionStore *db.S
 
 	// Public routes (with optional auth for navbar)
 	// SECURITY: Public pages use read-only DB
-	router.Handle("/", appmiddleware.OptionalAuth(sessionStore, database)(
+	router.Handle("/", middleware.OptionalAuth(sessionStore, database)(
 		&uihandlers.HomeHandler{
 			DB:          readOnlyDB,
 			Templates:   templates,
@@ -481,7 +480,7 @@ func initializeUIRoutes(database *sql.DB, readOnlyDB *sql.DB, sessionStore *db.S
 		},
 	)).Methods("GET")
 
-	router.Handle("/api/recent-pushes", appmiddleware.OptionalAuth(sessionStore, database)(
+	router.Handle("/api/recent-pushes", middleware.OptionalAuth(sessionStore, database)(
 		&uihandlers.RecentPushesHandler{
 			DB:          readOnlyDB,
 			Templates:   templates,
@@ -490,7 +489,7 @@ func initializeUIRoutes(database *sql.DB, readOnlyDB *sql.DB, sessionStore *db.S
 	)).Methods("GET")
 
 	// SECURITY: Search uses read-only DB to prevent writes and limit access to sensitive tables
-	router.Handle("/search", appmiddleware.OptionalAuth(sessionStore, database)(
+	router.Handle("/search", middleware.OptionalAuth(sessionStore, database)(
 		&uihandlers.SearchHandler{
 			DB:          readOnlyDB,
 			Templates:   templates,
@@ -498,7 +497,7 @@ func initializeUIRoutes(database *sql.DB, readOnlyDB *sql.DB, sessionStore *db.S
 		},
 	)).Methods("GET")
 
-	router.Handle("/api/search-results", appmiddleware.OptionalAuth(sessionStore, database)(
+	router.Handle("/api/search-results", middleware.OptionalAuth(sessionStore, database)(
 		&uihandlers.SearchResultsHandler{
 			DB:          readOnlyDB,
 			Templates:   templates,
@@ -507,7 +506,7 @@ func initializeUIRoutes(database *sql.DB, readOnlyDB *sql.DB, sessionStore *db.S
 	)).Methods("GET")
 
 	// API route for repository stats (public, read-only)
-	router.Handle("/api/stats/{handle}/{repository}", appmiddleware.OptionalAuth(sessionStore, database)(
+	router.Handle("/api/stats/{handle}/{repository}", middleware.OptionalAuth(sessionStore, database)(
 		&uihandlers.GetStatsHandler{
 			DB:        readOnlyDB,
 			Directory: oauthApp.Directory(),
@@ -515,7 +514,7 @@ func initializeUIRoutes(database *sql.DB, readOnlyDB *sql.DB, sessionStore *db.S
 	)).Methods("GET")
 
 	// API routes for stars (require authentication)
-	router.Handle("/api/stars/{handle}/{repository}", appmiddleware.RequireAuth(sessionStore, database)(
+	router.Handle("/api/stars/{handle}/{repository}", middleware.RequireAuth(sessionStore, database)(
 		&uihandlers.StarRepositoryHandler{
 			DB:        database, // Needs write access
 			Directory: oauthApp.Directory(),
@@ -523,7 +522,7 @@ func initializeUIRoutes(database *sql.DB, readOnlyDB *sql.DB, sessionStore *db.S
 		},
 	)).Methods("POST")
 
-	router.Handle("/api/stars/{handle}/{repository}", appmiddleware.RequireAuth(sessionStore, database)(
+	router.Handle("/api/stars/{handle}/{repository}", middleware.RequireAuth(sessionStore, database)(
 		&uihandlers.UnstarRepositoryHandler{
 			DB:        database, // Needs write access
 			Directory: oauthApp.Directory(),
@@ -531,7 +530,7 @@ func initializeUIRoutes(database *sql.DB, readOnlyDB *sql.DB, sessionStore *db.S
 		},
 	)).Methods("DELETE")
 
-	router.Handle("/api/stars/{handle}/{repository}", appmiddleware.OptionalAuth(sessionStore, database)(
+	router.Handle("/api/stars/{handle}/{repository}", middleware.OptionalAuth(sessionStore, database)(
 		&uihandlers.CheckStarHandler{
 			DB:        readOnlyDB, // Read-only check
 			Directory: oauthApp.Directory(),
@@ -539,7 +538,7 @@ func initializeUIRoutes(database *sql.DB, readOnlyDB *sql.DB, sessionStore *db.S
 		},
 	)).Methods("GET")
 
-	router.Handle("/u/{handle}", appmiddleware.OptionalAuth(sessionStore, database)(
+	router.Handle("/u/{handle}", middleware.OptionalAuth(sessionStore, database)(
 		&uihandlers.UserPageHandler{
 			DB:          readOnlyDB,
 			Templates:   templates,
@@ -547,7 +546,7 @@ func initializeUIRoutes(database *sql.DB, readOnlyDB *sql.DB, sessionStore *db.S
 		},
 	)).Methods("GET")
 
-	router.Handle("/r/{handle}/{repository}", appmiddleware.OptionalAuth(sessionStore, database)(
+	router.Handle("/r/{handle}/{repository}", middleware.OptionalAuth(sessionStore, database)(
 		&uihandlers.RepositoryPageHandler{
 			DB:          readOnlyDB,
 			Templates:   templates,
@@ -559,7 +558,7 @@ func initializeUIRoutes(database *sql.DB, readOnlyDB *sql.DB, sessionStore *db.S
 
 	// Authenticated routes
 	authRouter := router.NewRoute().Subrouter()
-	authRouter.Use(appmiddleware.RequireAuth(sessionStore, database))
+	authRouter.Use(middleware.RequireAuth(sessionStore, database))
 
 	authRouter.Handle("/settings", &uihandlers.SettingsHandler{
 		Templates:   templates,