fix login form being submitted to /sso instead of /login

crewjam · May 17, 2024 · e8670d7 · e8670d7
1 parent a32b643
commit e8670d7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/identity_provider.go b/identity_provider.go
@@ -101,6 +101,7 @@ type IdentityProvider struct {
 	Intermediates           []*x509.Certificate
 	MetadataURL             url.URL
 	SSOURL                  url.URL
+	LoginURL                url.URL
 	LogoutURL               url.URL
 	ServiceProviderProvider ServiceProviderProvider
 	SessionProvider         SessionProvider

diff --git a/samlidp/samlidp.go b/samlidp/samlidp.go
@@ -51,6 +51,8 @@ func New(opts Options) (*Server, error) {
 	metadataURL.Path += "/metadata"
 	ssoURL := opts.URL
 	ssoURL.Path += "/sso"
+	loginURL := opts.URL
+	loginURL.Path += "/login"
 	logr := opts.Logger
 	if logr == nil {
 		logr = logger.DefaultLogger
@@ -65,6 +67,7 @@ func New(opts Options) (*Server, error) {
 			Certificate: opts.Certificate,
 			MetadataURL: metadataURL,
 			SSOURL:      ssoURL,
+			LoginURL:    loginURL,
 		},
 		logger: logr,
 		Store:  opts.Store,

diff --git a/samlidp/session.go b/samlidp/session.go
@@ -122,7 +122,7 @@ func (s *Server) sendLoginForm(w http.ResponseWriter, _ *http.Request, req *saml
 		RelayState  string
 	}{
 		Toast:       toast,
-		URL:         req.IDP.SSOURL.String(),
+		URL:         req.IDP.LoginURL.String(),
 		SAMLRequest: base64.StdEncoding.EncodeToString(req.RequestBuffer),
 		RelayState:  req.RelayState,
 	}