fix subpath handling

Signed-off-by: Frank Jogeleit <[email protected]>
kyverno · Apr 11, 2024 · fc6af3d · fc6af3d
1 parent 629d8df
commit fc6af3d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/backend/pkg/auth/handler.go b/backend/pkg/auth/handler.go
@@ -12,15 +12,19 @@ import (
 )
 
 type Handler struct {
+	basePath string
 }
 
-func NewHandler() *Handler {
-	return &Handler{}
+func NewHandler(basePath string) *Handler {
+	return &Handler{
+		basePath: basePath,
+	}
 }
 
 func (h *Handler) Callback(ctx *gin.Context) {
 	user, err := gothic.CompleteUserAuth(ctx.Writer, ctx.Request)
 	if err != nil {
+		zap.L().Error("failed to complete user", zap.Error(err))
 		ctx.AbortWithError(http.StatusInternalServerError, err)
 		return
 	}
@@ -34,7 +38,7 @@ func (h *Handler) Callback(ctx *gin.Context) {
 		return
 	}
 
-	ctx.Redirect(http.StatusTemporaryRedirect, "/")
+	ctx.Redirect(http.StatusTemporaryRedirect, h.basePath)
 }
 
 func (h *Handler) Login(ctx *gin.Context) {
@@ -47,7 +51,7 @@ func (h *Handler) Login(ctx *gin.Context) {
 	session := sessions.Default(ctx)
 	session.Set("profile", NewProfile(user))
 
-	ctx.Redirect(http.StatusTemporaryRedirect, "/")
+	ctx.Redirect(http.StatusTemporaryRedirect, h.basePath)
 }
 
 func (h *Handler) Logout(ctx *gin.Context) {
@@ -56,7 +60,7 @@ func (h *Handler) Logout(ctx *gin.Context) {
 	session.Clear()
 	session.Save()
 
-	ctx.Redirect(http.StatusTemporaryRedirect, "/login")
+	ctx.Redirect(http.StatusTemporaryRedirect, h.basePath+"login")
 }
 
 func (h *Handler) Profile(ctx *gin.Context) {

diff --git a/backend/pkg/auth/router.go b/backend/pkg/auth/router.go
@@ -21,14 +21,14 @@ func Setup(engine *gin.Engine, basePath, provider, tempDir string) {
 	authStore.Options = &gsessions.Options{
 		HttpOnly: true,
 		MaxAge:   86400 * 30,
-		Path:     basePath,
+		Path:     "/",
 	}
 
 	gothic.Store = authStore
 
 	engine.Use(sessions.Sessions(SessionKey, NewStore(authStore)))
 
-	handler := NewHandler()
+	handler := NewHandler(basePath)
 
 	engine.GET("/login", Provider(provider), handler.Login)
 	engine.GET("/logout", Provider(provider), handler.Logout)

diff --git a/backend/pkg/config/resolver.go b/backend/pkg/config/resolver.go
@@ -253,7 +253,7 @@ func (r *Resolver) SetupOAuth(ctx context.Context, engine *gin.Engine) ([]gin.Ha
 	}
 
 	goth.UseProviders(provider)
-	auth.Setup(engine, config.Provider, r.config.OAuth.BasePath(), r.config.TempDir)
+	auth.Setup(engine, r.config.OAuth.BasePath(), config.Provider, r.config.TempDir)
 
 	return []gin.HandlerFunc{auth.Provider(r.config.OAuth.Provider), auth.Auth(r.config.OAuth.BasePath())}, nil
 }
@@ -277,7 +277,7 @@ func (r *Resolver) SetupOIDC(ctx context.Context, engine *gin.Engine) ([]gin.Han
 
 	goth.UseProviders(provider)
 
-	auth.Setup(engine, "openid-connect", r.config.OpenIDConnect.BasePath(), r.config.TempDir)
+	auth.Setup(engine, r.config.OpenIDConnect.BasePath(), "openid-connect", r.config.TempDir)
 
 	return []gin.HandlerFunc{auth.Provider("openid-connect"), auth.Auth(r.config.OpenIDConnect.BasePath())}, nil
 }

diff --git a/backend/pkg/server/api/handler.go b/backend/pkg/server/api/handler.go
@@ -24,6 +24,10 @@ type Handler struct {
 	reporter *reports.ReportGenerator
 }
 
+func (h *Handler) Healthz(ctx *gin.Context) {
+	ctx.JSON(http.StatusOK, nil)
+}
+
 func (h *Handler) Config(ctx *gin.Context) {
 	ctx.JSON(http.StatusOK, h.config)
 }

diff --git a/backend/pkg/server/server.go b/backend/pkg/server/server.go
@@ -62,6 +62,7 @@ func (s *Server) RegisterCluster(name string, client *core.Client, plugins map[s
 func (s *Server) RegisterAPI(c *api.Config, customBoards map[string]api.CustomBoard) {
 	handler := api.NewHandler(c, s.apis, customBoards)
 
+	s.engine.GET("healthz", handler.Healthz)
 	s.api.GET("config", handler.Config)
 	s.api.GET("custom-board/list", handler.ListCustomBoards)
 	s.api.GET("config/:cluster/custom-board/:id", handler.GetCustomBoard)