diff options
Diffstat (limited to 'handlers')
| -rw-r--r-- | handlers/admin.go | 7 | ||||
| -rw-r--r-- | handlers/auth_login.go | 7 | ||||
| -rw-r--r-- | handlers/auth_register.go | 7 | ||||
| -rw-r--r-- | handlers/php_proxy.go | 6 | ||||
| -rw-r--r-- | handlers/user.go | 7 |
5 files changed, 15 insertions, 19 deletions
diff --git a/handlers/admin.go b/handlers/admin.go index 2c86b7d..a77bed0 100644 --- a/handlers/admin.go +++ b/handlers/admin.go @@ -3,18 +3,17 @@ package handlers import ( "auth-proxy/config" "auth-proxy/logging" + "auth-proxy/middleware" "auth-proxy/models" "auth-proxy/types" - "auth-proxy/worker" "auth-proxy/utils" + "auth-proxy/worker" "encoding/json" "fmt" "net/http" "strconv" "sync" "time" - - "github.com/gorilla/csrf" ) var workerPool *types.WorkerPool @@ -37,7 +36,7 @@ func AdminPageHandler(w http.ResponseWriter, r *http.Request) { data := map[string]interface{}{ "Paths": config.Paths, "Users": users, - "CSRFToken": csrf.Token(r), + "XSRFToken": middleware.GetXSRFToken(r), } if err := templates.ExecuteTemplate(w, "admin.html", data); err != nil { logging.AppLog.Error("Failed to execute admin template", "error", err) diff --git a/handlers/auth_login.go b/handlers/auth_login.go index 5621dcb..33a3482 100644 --- a/handlers/auth_login.go +++ b/handlers/auth_login.go @@ -3,14 +3,13 @@ package handlers import ( "auth-proxy/config" "auth-proxy/logging" + "auth-proxy/middleware" "auth-proxy/models" "auth-proxy/types" "errors" "html/template" "net/http" "time" - - "github.com/gorilla/csrf" ) var templates = template.Must(template.ParseGlob("templates/*.html")) @@ -88,7 +87,7 @@ func renderLoginWithError(w http.ResponseWriter, r *http.Request, message string "Paths": config.Paths, "Error": message, "RegisterEnabled": config.Paths.RegisterEnabled, - "CSRFToken": csrf.Token(r), + "XSRFToken": middleware.GetXSRFToken(r), } w.WriteHeader(http.StatusUnauthorized) // Set status to indicate failure if err := templates.ExecuteTemplate(w, "login.html", data); err != nil { @@ -114,7 +113,7 @@ func LoginHandler(w http.ResponseWriter, r *http.Request) { data := map[string]interface{}{ "Paths": config.Paths, "RegisterEnabled": config.Paths.RegisterEnabled, - "CSRFToken": csrf.Token(r), + "XSRFToken": middleware.GetXSRFToken(r), } if err := templates.ExecuteTemplate(w, "login.html", data); err != nil { logging.AppLog.Error("Failed to execute login template", "error", err, "ip", ip) diff --git a/handlers/auth_register.go b/handlers/auth_register.go index 9b93494..8382655 100644 --- a/handlers/auth_register.go +++ b/handlers/auth_register.go @@ -3,18 +3,17 @@ package handlers import ( "auth-proxy/config" "auth-proxy/logging" + "auth-proxy/middleware" "auth-proxy/models" "auth-proxy/utils" "net/http" - - "github.com/gorilla/csrf" ) func renderRegisterWithError(w http.ResponseWriter, r *http.Request, message string) { data := map[string]interface{}{ "Paths": config.Paths, "Error": message, - "CSRFToken": csrf.Token(r), + "XSRFToken": middleware.GetXSRFToken(r), } w.WriteHeader(http.StatusBadRequest) // Set status to indicate failure if err := templates.ExecuteTemplate(w, "register.html", data); err != nil { @@ -31,7 +30,7 @@ func RegisterHandler(w http.ResponseWriter, r *http.Request) { ip := logging.GetClientIP(r) data := map[string]interface{}{ "Paths": config.Paths, - "CSRFToken": csrf.Token(r), + "XSRFToken": middleware.GetXSRFToken(r), } if r.Method == http.MethodGet { diff --git a/handlers/php_proxy.go b/handlers/php_proxy.go index 24a38dc..e6966d6 100644 --- a/handlers/php_proxy.go +++ b/handlers/php_proxy.go @@ -3,6 +3,7 @@ package handlers import ( "auth-proxy/config" "auth-proxy/logging" + "auth-proxy/middleware" "auth-proxy/worker" "bytes" "io" @@ -13,7 +14,6 @@ import ( "strconv" "strings" - "github.com/gorilla/csrf" fcgiclient "github.com/tomasen/fcgi_client" ) @@ -79,8 +79,8 @@ func NewPhpProxyHandler(scriptName string) http.Handler { env["AUTH_PATH_ADMIN_USERS_API"] = config.Paths.AdminUsersAPI env["AUTH_ASSETS_PATH"] = config.Paths.Assets - // Pass CSRF token to PHP - env["HTTP_X_CSRF_TOKEN"] = csrf.Token(r) + // Pass XSRF token to PHP + env["HTTP_X_XSRF_TOKEN"] = middleware.GetXSRFToken(r) // Asynchronously log the proxying action to avoid blocking the request. diff --git a/handlers/user.go b/handlers/user.go index 7999755..65ebe83 100644 --- a/handlers/user.go +++ b/handlers/user.go @@ -3,13 +3,12 @@ package handlers import ( "auth-proxy/config" "auth-proxy/logging" + "auth-proxy/middleware" "auth-proxy/models" "auth-proxy/types" "auth-proxy/utils" "encoding/json" "net/http" - - "github.com/gorilla/csrf" ) // AccountPageHandler serves the account page, passing user data to the template. @@ -24,7 +23,7 @@ func AccountPageHandler(w http.ResponseWriter, r *http.Request) { data := map[string]interface{}{ "Paths": config.Paths, "User": user, - "CSRFToken": csrf.Token(r), + "XSRFToken": middleware.GetXSRFToken(r), } if err := templates.ExecuteTemplate(w, "account.html", data); err != nil { logging.AppLog.Error("Failed to execute account template", "error", err, "user_id", user.ID) @@ -37,7 +36,7 @@ func ChangePasswordHandler(w http.ResponseWriter, r *http.Request) { if r.Method == http.MethodGet { data := map[string]interface{}{ "Paths": config.Paths, - "CSRFToken": csrf.Token(r), + "XSRFToken": middleware.GetXSRFToken(r), } if err := templates.ExecuteTemplate(w, "account_password.html", data); err != nil { logging.AppLog.Error("Failed to execute account_password template", "error", err) |