-
-
Notifications
You must be signed in to change notification settings - Fork 964
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: ThibaultHerard <[email protected]> Co-authored-by: sebferrer <[email protected]> Co-authored-by: psauvage <[email protected]> Co-authored-by: alexGNX <[email protected]> Co-authored-by: Stoakes <[email protected]>
- Loading branch information
5 people
committed
Aug 18, 2022
1 parent
c589520
commit 19c48c9
Showing
70 changed files
with
3,907 additions
and
18 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| package continuity | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "encoding/json" | ||
| "net/http" | ||
|
|
||
| "github.com/gofrs/uuid" | ||
| "github.com/pkg/errors" | ||
|
|
||
| "github.com/ory/herodot" | ||
| "github.com/ory/x/sqlcon" | ||
|
|
||
| "github.com/ory/kratos/session" | ||
| "github.com/ory/kratos/x" | ||
| ) | ||
|
|
||
| var _ Manager = new(ManagerRelayState) | ||
| var ErrNotResumableRelayState = *herodot.ErrBadRequest.WithError("no resumable session found").WithReasonf("The browser does not contain the necessary RelayState value to resume the session. This is a security violation and was blocked. Please try again!") | ||
|
|
||
| type ( | ||
| managerRelayStateDependencies interface { | ||
| PersistenceProvider | ||
| x.RelayStateProvider | ||
| session.ManagementProvider | ||
| } | ||
| ManagerRelayState struct { | ||
| dr managerRelayStateDependencies | ||
| dc managerCookieDependencies | ||
| } | ||
| ) | ||
|
|
||
| // To ensure continuity even after redirection to the IDP, we cannot use cookies because the IDP and the SP are on two different domains. | ||
| // So we have to pass the continuity value through the relaystate. | ||
| // This value corresponds to the session ID | ||
| func NewManagerRelayState(dr managerRelayStateDependencies, dc managerCookieDependencies) *ManagerRelayState { | ||
| return &ManagerRelayState{dr: dr, dc: dc} | ||
| } | ||
|
|
||
| func (m *ManagerRelayState) Pause(ctx context.Context, w http.ResponseWriter, r *http.Request, name string, opts ...ManagerOption) error { | ||
| if len(name) == 0 { | ||
| return errors.Errorf("continuity container name must be set") | ||
| } | ||
|
|
||
| o, err := newManagerOptions(opts) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| c := NewContainer(name, *o) | ||
|
|
||
| // We have to put the continuity value in the cookie to ensure that value are passed between API and UI | ||
| // It is also useful to pass the value between SP and IDP with POST method because RelayState will take its value from cookie | ||
| if err = x.SessionPersistValues(w, r, m.dc.ContinuityCookieManager(ctx), CookieName, map[string]interface{}{ | ||
| name: c.ID.String(), | ||
| }); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := m.dr.ContinuityPersister().SaveContinuitySession(r.Context(), c); err != nil { | ||
| return errors.WithStack(err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (m *ManagerRelayState) Continue(ctx context.Context, w http.ResponseWriter, r *http.Request, name string, opts ...ManagerOption) (*Container, error) { | ||
| container, err := m.container(ctx, w, r, name) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| o, err := newManagerOptions(opts) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if err := container.Valid(o.iid); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if o.payloadRaw != nil && container.Payload != nil { | ||
| if err := json.NewDecoder(bytes.NewBuffer(container.Payload)).Decode(o.payloadRaw); err != nil { | ||
| return nil, errors.WithStack(err) | ||
| } | ||
| } | ||
|
|
||
| if err := x.SessionUnsetKey(w, r, m.dc.ContinuityCookieManager(ctx), CookieName, name); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if err := m.dc.ContinuityPersister().DeleteContinuitySession(ctx, container.ID); err != nil && !errors.Is(err, sqlcon.ErrNoRows) { | ||
| return nil, err | ||
| } | ||
|
|
||
| return container, nil | ||
| } | ||
|
|
||
| func (m *ManagerRelayState) sid(ctx context.Context, w http.ResponseWriter, r *http.Request, name string) (uuid.UUID, error) { | ||
| var sid uuid.UUID | ||
| if s, err := x.SessionGetStringRelayState(r, m.dc.ContinuityCookieManager(ctx), CookieName, name); err != nil { | ||
| return sid, errors.WithStack(ErrNotResumable.WithDebugf("%+v", err)) | ||
|
|
||
| } else if sid = x.ParseUUID(s); sid == uuid.Nil { | ||
| return sid, errors.WithStack(ErrNotResumable.WithDebug("session id is not a valid uuid")) | ||
|
|
||
| } | ||
|
|
||
| return sid, nil | ||
| } | ||
|
|
||
| func (m *ManagerRelayState) container(ctx context.Context, w http.ResponseWriter, r *http.Request, name string) (*Container, error) { | ||
| sid, err := m.sid(ctx, w, r, name) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| container, err := m.dr.ContinuityPersister().GetContinuitySession(ctx, sid) | ||
|
|
||
| if err != nil { | ||
| _ = x.SessionUnsetKey(w, r, m.dc.ContinuityCookieManager(ctx), CookieName, name) | ||
| } | ||
|
|
||
| if errors.Is(err, sqlcon.ErrNoRows) { | ||
| return nil, errors.WithStack(ErrNotResumable.WithDebugf("Resumable ID from RelayState could not be found in the datastore: %+v", err)) | ||
| } else if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return container, err | ||
| } | ||
|
|
||
| func (m ManagerRelayState) Abort(ctx context.Context, w http.ResponseWriter, r *http.Request, name string) error { | ||
| sid, err := m.sid(ctx, w, r, name) | ||
| if errors.Is(err, &ErrNotResumable) { | ||
| // We do not care about an error here | ||
| return nil | ||
| } else if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := x.SessionUnsetKey(w, r, m.dc.ContinuityCookieManager(ctx), CookieName, name); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := m.dr.ContinuityPersister().DeleteContinuitySession(ctx, sid); err != nil && !errors.Is(err, sqlcon.ErrNoRows) { | ||
| return errors.WithStack(err) | ||
| } | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,4 +46,4 @@ | |
| "additionalProperties": false | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package driver | ||
|
|
||
| import "github.com/ory/kratos/selfservice/flow/saml" | ||
|
|
||
| func (m *RegistryDefault) SAMLHandler() *saml.Handler { | ||
| if m.selfserviceSAMLHandler == nil { | ||
| m.selfserviceSAMLHandler = saml.NewHandler(m) | ||
| } | ||
|
|
||
| return m.selfserviceSAMLHandler | ||
| } |
Oops, something went wrong.