11 Commits
3 changed files with 40 additions and 8 deletions

No files matched your search

+9
View File
@@ -128,6 +128,15 @@ func logoutHandler(c *gin.Context) {
session := sessions.Default(c) session := sessions.Default(c)
session.Clear() session.Clear()
session.Save() session.Save()
redir := ""
if c.Query("returnTo") != "" {
redir = c.Query("returnTo")
}
if redir != "" {
c.Redirect(307, redir)
} else {
c.Redirect(307, defaultRedirect)
}
} }
// Ensure that a user is currently logged in. // Ensure that a user is currently logged in.
+24 -6
View File
@@ -20,23 +20,35 @@ func createRandomString(n int) (string, error) {
return base64.URLEncoding.EncodeToString(s), nil return base64.URLEncoding.EncodeToString(s), nil
} }
type UserFunc func(userid string, name string, email string)
var ( var (
config oauth2.Config config oauth2.Config
userFunc func(userid string, name string, email string) userFunc UserFunc
verifier oidc.IDTokenVerifier verifier oidc.IDTokenVerifier
defaultRedirect string defaultRedirect string
) )
// Configure and set up the login SDK. // Wraps the normal configure function, but also gives you access to change the User Function, which is called upon login.
func Configure(r *gin.Engine, app_url string, default_redirect string, stubs_on_unconfigured bool) { // 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.
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
Configure(r, app_url, default_redirect, stubs_on_unconfigured, check_middleware)
}
// 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.
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")
defaultRedirect = default_redirect
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")
@@ -45,7 +57,6 @@ func Configure(r *gin.Engine, app_url string, default_redirect string, stubs_on_
provider, err := oidc.NewProvider(context.Background(), issuer) provider, err := oidc.NewProvider(context.Background(), issuer)
verifier = *provider.Verifier(&oidc.Config{ClientID: clientID}) verifier = *provider.Verifier(&oidc.Config{ClientID: clientID})
defaultRedirect = default_redirect
if err != nil { if err != nil {
log.Fatal("[JHID] Provider resolution failed with error", err) log.Fatal("[JHID] Provider resolution failed with error", err)
@@ -61,12 +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)
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)
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)
} }