Validate session transfer redirect with saferedirect
The session transfer handler was blindly redirecting to the continue URL from the signed token. Use saferedirect with a trust center domain check to prevent open redirects, and only trigger session transfer for known trust center custom domains instead of any non-base-URL host. Signed-off-by: Bryan Frimin <bryan@getprobo.com>
This commit is contained in:
@@ -176,7 +176,7 @@ func (h *OIDCHandler) buildSessionTransferURL(ctx context.Context, redirectURL s
|
|||||||
|
|
||||||
token, err := authn.SignSessionTransfer(sessionID, redirectURL, h.cookieSecret)
|
token, err := authn.SignSessionTransfer(sessionID, redirectURL, h.cookieSecret)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
h.logger.Error("cannot sign session transfer token", log.Error(err))
|
h.logger.ErrorCtx(ctx, "cannot sign session transfer token", log.Error(err))
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ package trust_v1
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
@@ -84,8 +85,16 @@ func NewMux(
|
|||||||
|
|
||||||
r.Use(compliancepage.NewCompliancePagePresenceMiddleware())
|
r.Use(compliancepage.NewCompliancePagePresenceMiddleware())
|
||||||
|
|
||||||
sessionTransferHandler := NewSessionTransferHandler(iamSvc, cookieConfig, logger)
|
sessionTransferHandler := NewSessionTransferHandler(
|
||||||
r.Get("/session-transfer", sessionTransferHandler.ServeHTTP)
|
iamSvc,
|
||||||
|
cookieConfig,
|
||||||
|
func(ctx context.Context, host string) bool {
|
||||||
|
_, err := trustSvc.GetByDomainName(ctx, host)
|
||||||
|
return err == nil
|
||||||
|
},
|
||||||
|
logger,
|
||||||
|
)
|
||||||
|
r.Method(http.MethodGet, "/session-transfer", sessionTransferHandler)
|
||||||
|
|
||||||
r.Use(authn.NewSessionMiddleware(iamSvc, cookieConfig))
|
r.Use(authn.NewSessionMiddleware(iamSvc, cookieConfig))
|
||||||
r.Use(compliancepage.NewMemberProvisioningMiddleware(trustSvc, logger))
|
r.Use(compliancepage.NewMemberProvisioningMiddleware(trustSvc, logger))
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import (
|
|||||||
"go.gearno.de/kit/log"
|
"go.gearno.de/kit/log"
|
||||||
"go.probo.inc/probo/pkg/gid"
|
"go.probo.inc/probo/pkg/gid"
|
||||||
"go.probo.inc/probo/pkg/iam"
|
"go.probo.inc/probo/pkg/iam"
|
||||||
|
"go.probo.inc/probo/pkg/saferedirect"
|
||||||
"go.probo.inc/probo/pkg/securecookie"
|
"go.probo.inc/probo/pkg/securecookie"
|
||||||
"go.probo.inc/probo/pkg/server/api/authn"
|
"go.probo.inc/probo/pkg/server/api/authn"
|
||||||
)
|
)
|
||||||
@@ -30,18 +31,21 @@ type SessionTransferHandler struct {
|
|||||||
iam *iam.Service
|
iam *iam.Service
|
||||||
sessionCookie *authn.Cookie
|
sessionCookie *authn.Cookie
|
||||||
cookieSecret string
|
cookieSecret string
|
||||||
|
safeRedirect *saferedirect.SafeRedirect
|
||||||
logger *log.Logger
|
logger *log.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewSessionTransferHandler(
|
func NewSessionTransferHandler(
|
||||||
iamSvc *iam.Service,
|
iamSvc *iam.Service,
|
||||||
cookieConfig securecookie.Config,
|
cookieConfig securecookie.Config,
|
||||||
|
allowedHost saferedirect.AllowedHostFunc,
|
||||||
logger *log.Logger,
|
logger *log.Logger,
|
||||||
) *SessionTransferHandler {
|
) *SessionTransferHandler {
|
||||||
return &SessionTransferHandler{
|
return &SessionTransferHandler{
|
||||||
iam: iamSvc,
|
iam: iamSvc,
|
||||||
sessionCookie: authn.NewCookie(&cookieConfig),
|
sessionCookie: authn.NewCookie(&cookieConfig),
|
||||||
cookieSecret: cookieConfig.Secret,
|
cookieSecret: cookieConfig.Secret,
|
||||||
|
safeRedirect: saferedirect.New(allowedHost),
|
||||||
logger: logger,
|
logger: logger,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -82,5 +86,5 @@ func (h *SessionTransferHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
|
|||||||
|
|
||||||
h.sessionCookie.Set(w, session)
|
h.sessionCookie.Set(w, session)
|
||||||
|
|
||||||
http.Redirect(w, r, continueURL, http.StatusFound)
|
h.safeRedirect.Redirect(w, r, continueURL, "/", http.StatusFound)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user