refactor: reorganize project structure following go standards

This commit is contained in:
2026-04-20 15:54:35 +02:00
parent 055ec1fca9
commit 6df8788749
70 changed files with 43 additions and 187 deletions

View File

@@ -0,0 +1,67 @@
package middleware
import (
"net/http"
"strings"
"mal/internal/db"
)
type AccessPolicy struct {
PublicPaths map[string]struct{}
PublicHeads []string
}
func NewAccessPolicy() AccessPolicy {
return AccessPolicy{
PublicPaths: map[string]struct{}{
"/": {},
"/login": {},
"/search": {},
"/api/search": {},
"/api/search-quick": {},
},
PublicHeads: []string{
"/static/",
"/dist/",
},
}
}
func (p AccessPolicy) IsPublicPath(path string) bool {
if _, ok := p.PublicPaths[path]; ok {
return true
}
for _, head := range p.PublicHeads {
if strings.HasPrefix(path, head) {
return true
}
}
return false
}
func RequireGlobalAuthWithPolicy(policy AccessPolicy) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if policy.IsPublicPath(r.URL.Path) {
next.ServeHTTP(w, r)
return
}
user, ok := r.Context().Value(UserContextKey).(*database.User)
if !ok || user == nil {
if strings.HasPrefix(r.URL.Path, "/api/") || r.Header.Get("HX-Request") == "true" {
w.Header().Set("HX-Redirect", "/login")
http.Error(w, "Unauthorized", http.StatusUnauthorized)
} else {
http.Redirect(w, r, "/login", http.StatusFound)
}
return
}
next.ServeHTTP(w, r)
})
}
}

View File

@@ -0,0 +1,64 @@
package middleware
import (
"context"
"net/http"
"strings"
"mal/internal/db"
"mal/api/auth"
)
type contextKey string
const (
UserContextKey contextKey = "user"
)
func Auth(authService *auth.Service) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
cookie, err := r.Cookie("session_id")
if err != nil {
// No session cookie, user is unauthenticated. Proceed, but not logged in.
next.ServeHTTP(w, r)
return
}
user, err := authService.ValidateSession(r.Context(), cookie.Value)
if err != nil {
// Invalid session, proceed as unauthenticated
next.ServeHTTP(w, r)
return
}
// Valid session, bind user to context
ctx := context.WithValue(r.Context(), UserContextKey, user)
next.ServeHTTP(w, r.WithContext(ctx))
})
}
}
func RequireAuth(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
user, ok := r.Context().Value(UserContextKey).(*database.User)
if !ok || user == nil {
if strings.HasPrefix(r.URL.Path, "/api/") {
w.Header().Set("HX-Redirect", "/login")
http.Error(w, "Unauthorized", http.StatusUnauthorized)
} else {
http.Redirect(w, r, "/login", http.StatusFound)
}
return
}
next.ServeHTTP(w, r)
})
}
func GetUser(ctx context.Context) *database.User {
user, ok := ctx.Value(UserContextKey).(*database.User)
if !ok {
return nil
}
return user
}