6 Commits
Author SHA1 Message Date
janishutz 90d7076726 chore: remove code causing crash 2026-09-28 11:57:58 +02:00
janishutz 58855ed3a2 chore: revert some fixes, make it work with stubs as well 2026-09-28 11:56:19 +02:00
janishutz bb548cc2c3 fix: confused var 2026-09-28 11:51:46 +02:00
janishutz d6a551d80f fix: custom check middleware enabling 2026-09-28 11:50:26 +02:00
janishutz 6bcaff2d88 chore: logging for custom middleware 2026-09-28 11:46:46 +02:00
janishutz e6b8422a1e fix: function pointer removed
Apparently go doesn't support those
2026-09-28 11:39:39 +02:00
2 changed files with 14 additions and 7 deletions

No files matched your search

+7 -5
View File
@@ -32,14 +32,14 @@ var (
// Wraps the normal configure function, but also gives you access to change the User Function, which is called upon login. // Wraps the normal configure function, but also gives you access to change the User Function, which is called upon login.
// It is used to create or update a user. // It is used to create or update a user.
// The check middleware may be nil, in which case a default is used. Otherwise should be a valid gin middleware, calling c.Next() if okay to proceed. // The check middleware may be nil, in which case a default is used. Otherwise should be a valid gin middleware, calling c.Next() if okay to proceed.
func ConfigureFull(r *gin.Engine, app_url string, default_redirect string, user_function UserFunc, stubs_on_unconfigured bool, check_middleware *func(c *gin.Context)) { func ConfigureFull(r *gin.Engine, app_url string, default_redirect string, user_function UserFunc, stubs_on_unconfigured bool, check_middleware func(c *gin.Context)) {
userFunc = user_function userFunc = user_function
Configure(r, app_url, default_redirect, stubs_on_unconfigured, check_middleware) Configure(r, app_url, default_redirect, stubs_on_unconfigured, check_middleware)
} }
// Configure and set up the login SDK // Configure and set up the login SDK
// The check middleware may be nil, in which case a default is used. Otherwise should be a valid gin middleware, calling c.Next() if okay to proceed. // The check middleware may be nil, in which case a default is used. Otherwise should be a valid gin middleware, calling c.Next() if okay to proceed.
func Configure(r *gin.Engine, app_url string, default_redirect string, stubs_on_unconfigured bool, check_middleware *func(c *gin.Context)) { func Configure(r *gin.Engine, app_url string, default_redirect string, stubs_on_unconfigured bool, check_middleware func(c *gin.Context)) {
issuer := os.Getenv("OIDC_ISSUER") issuer := os.Getenv("OIDC_ISSUER")
clientID := os.Getenv("OIDC_CLIENT_ID") clientID := os.Getenv("OIDC_CLIENT_ID")
clientSecret := os.Getenv("OIDC_CLIENT_SECRET") clientSecret := os.Getenv("OIDC_CLIENT_SECRET")
@@ -48,7 +48,7 @@ func Configure(r *gin.Engine, app_url string, default_redirect string, stubs_on_
if issuer == "" || clientID == "" || clientSecret == "" { if issuer == "" || clientID == "" || clientSecret == "" {
if stubs_on_unconfigured { if stubs_on_unconfigured {
log.Println("[JHID] WARNING: OIDC not set up due to missing environment variables. Falling back to stubs") log.Println("[JHID] WARNING: OIDC not set up due to missing environment variables. Falling back to stubs")
startStubs(r) startStubs(r, check_middleware)
return return
} else { } else {
log.Fatal("[JHID] One or more requried environment variables are missing. See docs for more information") log.Fatal("[JHID] One or more requried environment variables are missing. See docs for more information")
@@ -72,17 +72,19 @@ func Configure(r *gin.Engine, app_url string, default_redirect string, stubs_on_
r.GET("/auth/v2/login", loginHandler) r.GET("/auth/v2/login", loginHandler)
r.GET("/auth/v2/verify", callbackHandler) r.GET("/auth/v2/verify", callbackHandler)
check_finalizer := func(ctx *gin.Context) { ctx.JSON(200, gin.H{"success": "true"}) }
if check_middleware == nil { if check_middleware == nil {
r.GET("/auth/v2/check", EnsureLogin(false), check_finalizer) r.GET("/auth/v2/check", EnsureLogin(false), check_finalizer)
} else { } else {
r.GET("/auth/v2/check", EnsureLogin(false), *check_middleware, check_finalizer) log.Println("[JHID] Custom check middleware enabled")
r.GET("/auth/v2/check", EnsureLogin(false), check_middleware, check_finalizer)
} }
r.GET("/auth/v2/logout", logoutHandler) r.GET("/auth/v2/logout", logoutHandler)
log.Println("[JHID] Configured successfully") log.Println("[JHID] Configured successfully")
} }
func check_finalizer(ctx *gin.Context) { ctx.JSON(200, gin.H{"success": "true"}) }
func ErrorHandler() gin.HandlerFunc { func ErrorHandler() gin.HandlerFunc {
return func(c *gin.Context) { return func(c *gin.Context) {
c.Next() c.Next()
+7 -2
View File
@@ -7,10 +7,15 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
func startStubs(r *gin.Engine) { func startStubs(r *gin.Engine, check_middleware func(c *gin.Context)) {
r.GET("/auth/v2/login", stubsHandler) r.GET("/auth/v2/login", stubsHandler)
r.GET("/auth/v2/verify", stubsHandler) r.GET("/auth/v2/verify", stubsHandler)
r.GET("/auth/v2/check", EnsureLogin(false), func(ctx *gin.Context) { ctx.JSON(200, gin.H{"success": "true"}) }) if check_middleware == nil {
r.GET("/auth/v2/check", EnsureLogin(false), check_finalizer)
} else {
log.Println("[JHID] Custom check middleware enabled")
r.GET("/auth/v2/check", EnsureLogin(false), check_middleware, check_finalizer)
}
r.GET("/auth/v2/logout", logoutHandler) r.GET("/auth/v2/logout", logoutHandler)
} }