- Added a reset of the models.Setting struct before querying for settings in both the Manager and Cerberus components to avoid ID leakage from previous queries. - Introduced new functions in Cerberus for checking admin authentication and admin whitelist status. - Enhanced middleware logic to allow admin users to bypass ACL checks if their IP is whitelisted. - Added tests to verify the behavior of the middleware with respect to ACLs and admin whitelisting. - Created a new utility for checking if an IP is in a CIDR list. - Updated various services to use `Where` clause for fetching records by ID instead of directly passing the ID to `First`, ensuring consistency in query patterns. - Added comprehensive tests for settings queries to demonstrate and verify the fix for ID leakage issues.
88 lines
2.2 KiB
Go
88 lines
2.2 KiB
Go
package middleware
|
|
|
|
import (
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/Wikid82/charon/backend/internal/services"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func AuthMiddleware(authService *services.AuthService) gin.HandlerFunc {
|
|
return func(c *gin.Context) {
|
|
if bypass, exists := c.Get("emergency_bypass"); exists {
|
|
if bypassActive, ok := bypass.(bool); ok && bypassActive {
|
|
c.Set("role", "admin")
|
|
c.Set("userID", uint(0))
|
|
c.Next()
|
|
return
|
|
}
|
|
}
|
|
|
|
tokenString, ok := extractAuthToken(c)
|
|
if !ok {
|
|
c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Authorization header required"})
|
|
return
|
|
}
|
|
|
|
claims, err := authService.ValidateToken(tokenString)
|
|
if err != nil {
|
|
c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Invalid token"})
|
|
return
|
|
}
|
|
|
|
c.Set("userID", claims.UserID)
|
|
c.Set("role", claims.Role)
|
|
c.Next()
|
|
}
|
|
}
|
|
|
|
func extractAuthToken(c *gin.Context) (string, bool) {
|
|
authHeader := c.GetHeader("Authorization")
|
|
|
|
if authHeader == "" {
|
|
// Try cookie first for browser flows (including WebSocket upgrades)
|
|
if cookie, err := c.Cookie("auth_token"); err == nil && cookie != "" {
|
|
authHeader = "Bearer " + cookie
|
|
}
|
|
}
|
|
|
|
// DEPRECATED: Query parameter authentication for WebSocket connections
|
|
// This fallback exists only for backward compatibility and will be removed in a future version.
|
|
// Query parameters are logged in access logs and should not be used for sensitive data.
|
|
// Use HttpOnly cookies instead, which are automatically sent by browsers and not logged.
|
|
if authHeader == "" {
|
|
if token := c.Query("token"); token != "" {
|
|
authHeader = "Bearer " + token
|
|
}
|
|
}
|
|
|
|
if authHeader == "" {
|
|
return "", false
|
|
}
|
|
|
|
tokenString := strings.TrimPrefix(authHeader, "Bearer ")
|
|
if tokenString == "" {
|
|
return "", false
|
|
}
|
|
|
|
return tokenString, true
|
|
}
|
|
|
|
func RequireRole(role string) gin.HandlerFunc {
|
|
return func(c *gin.Context) {
|
|
userRole, exists := c.Get("role")
|
|
if !exists {
|
|
c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
|
return
|
|
}
|
|
|
|
if userRole.(string) != role && userRole.(string) != "admin" {
|
|
c.AbortWithStatusJSON(http.StatusForbidden, gin.H{"error": "Forbidden"})
|
|
return
|
|
}
|
|
|
|
c.Next()
|
|
}
|
|
}
|