diff options
| author | James Elliott <james-d-elliott@users.noreply.github.com> | 2022-02-07 00:37:28 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-07 00:37:28 +1100 |
| commit | 26236f491e6d2b16ae2bc8297e33a9dc883f44e5 (patch) | |
| tree | 4eee1e5ee3744ce6e929a9c848ee5c056009c8d7 /internal/server/server.go | |
| parent | 7775d2af0e18d822c4e02c6ae53ee1dea0feb5de (diff) | |
fix(server): use of inconsistent methods for determining origin (#2848)
This unifies the methods to obtain the X-Forwarded-* header values and provides logical fallbacks. In addition, so we can ensure this functionality extends to the templated files we've converted the ServeTemplatedFile method into a function that operates as a middlewares.RequestHandler.
Fixes #2765
Diffstat (limited to 'internal/server/server.go')
| -rw-r--r-- | internal/server/server.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/server/server.go b/internal/server/server.go index d75bb0d4f..cbc53e71b 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -46,11 +46,11 @@ func registerRoutes(configuration schema.Configuration, providers middlewares.Pr serveSwaggerAPIHandler := ServeTemplatedFile(swaggerAssets, apiFile, configuration.Server.AssetPath, duoSelfEnrollment, rememberMe, resetPassword, configuration.Session.Name, configuration.Theme, https) r := router.New() - r.GET("/", serveIndexHandler) + r.GET("/", autheliaMiddleware(serveIndexHandler)) r.OPTIONS("/", autheliaMiddleware(handleOPTIONS)) - r.GET("/api/", serveSwaggerHandler) - r.GET("/api/"+apiFile, serveSwaggerAPIHandler) + r.GET("/api/", autheliaMiddleware(serveSwaggerHandler)) + r.GET("/api/"+apiFile, autheliaMiddleware(serveSwaggerAPIHandler)) for _, f := range rootFiles { r.GET("/"+f, middlewares.AssetOverrideMiddleware(configuration.Server.AssetPath, embeddedFS)) @@ -148,7 +148,7 @@ func registerRoutes(configuration schema.Configuration, providers middlewares.Pr r.GET("/debug/vars", expvarhandler.ExpvarHandler) } - r.NotFound = serveIndexHandler + r.NotFound = autheliaMiddleware(serveIndexHandler) handler := middlewares.LogRequestMiddleware(r.Handler) if configuration.Server.Path != "" { |