Merge pull request #15 from jmpsec/saml-login

Redirect to SAML login

cmd/admin/auth.go

@@ -51,13 +51,13 @@ func handlerAuthCheck(h http.Handler) http.Handler {
 				cookiev, err := r.Cookie(samlConfig.TokenName)
 				if err != nil {
 					log.Printf("error extracting JWT data: %v", err)
-					http.Redirect(w, r, forbiddenPath, http.StatusFound)
+					http.Redirect(w, r, samlConfig.LoginURL, http.StatusFound)
 					return
 				}
 				jwtdata, err := parseJWTFromCookie(samlData.KeyPair, cookiev.Value)
 				if err != nil {
 					log.Printf("error parsing JWT: %v", err)
-					http.Redirect(w, r, forbiddenPath, http.StatusFound)
+					http.Redirect(w, r, samlConfig.LoginURL, http.StatusFound)
 					return
 				}
 				// Check if user is already authenticated
@@ -79,6 +79,8 @@ func handlerAuthCheck(h http.Handler) http.Handler {
 					session, err = sessionsmgr.Save(r, w, u)
 					if err != nil {
 						log.Printf("session error: %v", err)
+						http.Redirect(w, r, samlConfig.LoginURL, http.StatusFound)
+						return
 					}
 				}
 				// Update metadata for the user

cmd/admin/saml.go

@@ -17,6 +17,7 @@ type JSONConfigurationSAML struct {
 	KeyPath     string `json:"keypath"`
 	MetaDataURL string `json:"metadataurl"`
 	RootURL     string `json:"rooturl"`
+	LoginURL    string `json:"loginurl"`
 	TokenName   string `json:"nametoken"`
 	EmailAttr   string `json:"attremail"`
 	UserAttr    string `json:"attruser"`

cmd/admin/static/css/custom.css

@@ -11,7 +11,7 @@
 
 .img-logo {
   max-width: 100%;
-  height: auto;
+  height: 20em;
   object-fit: cover;
 }