Skip to content

Custom relayState generator #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crewjam merged 5 commits into from
Mar 25, 2021
Merged

Custom relayState generator #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8d66034
Custom relayState generator
haalcala Dec 7, 2020
65c0718
Merge branch 'main' into feature_custom_state_generator
haalcala Mar 11, 2021
0006fcc
fmt
crewjam Mar 25, 2021
dde3713
fmt
crewjam Mar 25, 2021
cd29e9e
fmt
crewjam Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions samlsp/new.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type Options struct {
SignRequest bool
ForceAuthn bool // TODO(ross): this should be *bool
CookieSameSite http.SameSite
RelayStateFunc func(w http.ResponseWriter, r *http.Request) string
}

// DefaultSessionCodec returns the default SessionCodec for the provided options,
Expand Down Expand Up @@ -72,6 +73,7 @@ func DefaultRequestTracker(opts Options, serviceProvider *saml.ServiceProvider)
NamePrefix: "saml_",
Codec: DefaultTrackedRequestCodec(opts),
MaxAge: saml.MaxIssueDelay,
RelayStateFunc: opts.RelayStateFunc,
SameSite: opts.CookieSameSite,
}
}
Expand Down
9 changes: 9 additions & 0 deletions samlsp/request_tracker_cookie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ type CookieRequestTracker struct {
NamePrefix string
Codec TrackedRequestCodec
MaxAge time.Duration
RelayStateFunc func(w http.ResponseWriter, r *http.Request) string
SameSite http.SameSite
}

Expand All @@ -30,6 +31,14 @@ func (t CookieRequestTracker) TrackRequest(w http.ResponseWriter, r *http.Reques
SAMLRequestID: samlRequestID,
URI: r.URL.String(),
}

if t.RelayStateFunc != nil {
relayState := t.RelayStateFunc(w, r)
if relayState != "" {
trackedRequest.Index = relayState
}
}

signedTrackedRequest, err := t.Codec.Encode(trackedRequest)
if err != nil {
return "", err
Expand Down