Wrap up 1.1.0
This commit is contained in:
@@ -1,9 +1,13 @@
|
||||
package web
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"github.com/sirrobot01/decypharr/internal/config"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
"net/http"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func (wb *Web) verifyAuth(username, password string) bool {
|
||||
@@ -32,3 +36,68 @@ func (wb *Web) skipAuthHandler(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
http.Redirect(w, r, "/", http.StatusSeeOther)
|
||||
}
|
||||
|
||||
// isValidAPIToken checks if the request contains a valid API token
|
||||
func (wb *Web) isValidAPIToken(r *http.Request) bool {
|
||||
// Check Authorization header for Bearer token
|
||||
authHeader := r.Header.Get("Authorization")
|
||||
if authHeader == "" {
|
||||
return false
|
||||
}
|
||||
|
||||
// Support both "Bearer <token>" and "Token <token>" formats
|
||||
var token string
|
||||
if strings.HasPrefix(authHeader, "Bearer ") {
|
||||
token = strings.TrimPrefix(authHeader, "Bearer ")
|
||||
} else if strings.HasPrefix(authHeader, "Token ") {
|
||||
token = strings.TrimPrefix(authHeader, "Token ")
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
|
||||
if token == "" {
|
||||
return false
|
||||
}
|
||||
|
||||
// Get auth config and check if token exists
|
||||
auth := config.Get().GetAuth()
|
||||
if auth == nil || auth.APIToken == "" {
|
||||
return false
|
||||
}
|
||||
|
||||
// Check if the provided token matches the configured token
|
||||
return token == auth.APIToken
|
||||
}
|
||||
|
||||
// generateAPIToken creates a new random API token
|
||||
func (wb *Web) generateAPIToken() (string, error) {
|
||||
bytes := make([]byte, 32) // 256-bit token
|
||||
if _, err := rand.Read(bytes); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return hex.EncodeToString(bytes), nil
|
||||
}
|
||||
|
||||
// refreshAPIToken generates a new API token and saves it
|
||||
func (wb *Web) refreshAPIToken() (string, error) {
|
||||
auth := config.Get().GetAuth()
|
||||
if auth == nil {
|
||||
return "", fmt.Errorf("authentication not configured")
|
||||
}
|
||||
|
||||
// Generate new token
|
||||
token, err := wb.generateAPIToken()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// Update auth config
|
||||
auth.APIToken = token
|
||||
|
||||
// Save auth config
|
||||
if err := config.Get().SaveAuth(auth); err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return token, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user