Skip to content
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

feat: separate 2fa refresh from 1st factor refresh #3961

Merged
merged 2 commits into from
Jun 20, 2024
Merged

feat: separate 2fa refresh from 1st factor refresh #3961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d058104
feat: separate 2fa refresh from 1st factor refresh
aeneasr Jun 20, 2024
81697c1
chore: synchronize workspaces
aeneasr Jun 20, 2024
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
19 changes: 14 additions & 5 deletions selfservice/flow/login/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,25 @@ preLoginHook:
switch strategy := s.(type) {
case FormHydrator:
switch {
case f.IsRefresh():
populateErr = strategy.PopulateLoginMethodRefresh(r, f)
case f.RequestedAAL == identity.AuthenticatorAssuranceLevel1:
if h.d.Config().SelfServiceLoginFlowIdentifierFirstEnabled(r.Context()) {
switch {
case f.IsRefresh():
// Refreshing takes precedence over identifier_first auth which can not be a refresh flow.
// Therefor this comes first.
populateErr = strategy.PopulateLoginMethodFirstFactorRefresh(r, f)
case h.d.Config().SelfServiceLoginFlowIdentifierFirstEnabled(r.Context()):
populateErr = strategy.PopulateLoginMethodIdentifierFirstIdentification(r, f)
} else {
default:
populateErr = strategy.PopulateLoginMethodFirstFactor(r, f)
}
case f.RequestedAAL == identity.AuthenticatorAssuranceLevel2:
populateErr = strategy.PopulateLoginMethodSecondFactor(r, f)
switch {
case f.IsRefresh():
// Refresh takes precedence.
populateErr = strategy.PopulateLoginMethodSecondFactorRefresh(r, f)
default:
populateErr = strategy.PopulateLoginMethodSecondFactor(r, f)
}
}
case OneStepFormHydrator:
populateErr = strategy.PopulateLoginMethod(r, f.RequestedAAL, f)
Expand Down
3 changes: 2 additions & 1 deletion selfservice/flow/login/strategy_form_hydrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ type OneStepFormHydrator interface {
}

type FormHydrator interface {
PopulateLoginMethodRefresh(r *http.Request, sr *Flow) error
PopulateLoginMethodFirstFactorRefresh(r *http.Request, sr *Flow) error
PopulateLoginMethodFirstFactor(r *http.Request, sr *Flow) error
PopulateLoginMethodSecondFactor(r *http.Request, sr *Flow) error
PopulateLoginMethodSecondFactorRefresh(r *http.Request, sr *Flow) error
PopulateLoginMethodIdentifierFirstCredentials(r *http.Request, sr *Flow, options ...FormHydratorModifier) error
PopulateLoginMethodIdentifierFirstIdentification(r *http.Request, sr *Flow) error
}
Expand Down
0 ..._2fa_and_request_is_1fa_with_refresh.json → ...e_is_used_for_2fa_but_request_is_1fa.json
View file
Open in desktop
File renamed without changes.
0 ...asswordless_login_and_request_is_1fa.json → ...asswordless_login_and_request_is_1fa.json
View file
Open in desktop
File renamed without changes.
0 ...e_is_used_for_2fa_but_request_is_1fa.json → ..._2fa_and_request_is_1fa_with_refresh.json
View file
Open in desktop
File renamed without changes.
0 ...ogin_and_request_is_1fa_with_refresh.json → ...ogin_and_request_is_1fa_with_refresh.json
View file
Open in desktop
File renamed without changes.
54 changes: 0 additions & 54 deletions ...Hydration-method=PopulateLoginMethodRefresh-case=code_is_used_for_passwordless_login.json
View file
Open in desktop

This file was deleted.

0 ...e_is_used_for_2fa_and_request_is_2fa.json → ...e_is_used_for_2fa_and_request_is_2fa.json
View file
Open in desktop
File renamed without changes.
0 ...asswordless_login_and_request_is_2fa.json → ...asswordless_login_and_request_is_2fa.json
View file
Open in desktop
File renamed without changes.
0 ..._2fa_and_request_is_2fa_with_refresh.json → ..._2fa_and_request_is_2fa_with_refresh.json
View file
Open in desktop
File renamed without changes.
0 ...ogin_and_request_is_2fa_with_refresh.json → ...ogin_and_request_is_2fa_with_refresh.json
View file
Open in desktop
File renamed without changes.
6 changes: 5 additions & 1 deletion selfservice/strategy/code/strategy_login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ func (s *Strategy) loginVerifyCode(ctx context.Context, r *http.Request, f *logi
return i, nil
}

func (s *Strategy) PopulateLoginMethodRefresh(r *http.Request, f *login.Flow) error {
func (s *Strategy) PopulateLoginMethodFirstFactorRefresh(r *http.Request, f *login.Flow) error {
return s.PopulateMethod(r, f)
}

Expand All @@ -384,6 +384,10 @@ func (s *Strategy) PopulateLoginMethodSecondFactor(r *http.Request, f *login.Flo
return s.PopulateMethod(r, f)
}

func (s *Strategy) PopulateLoginMethodSecondFactorRefresh(r *http.Request, f *login.Flow) error {
return s.PopulateMethod(r, f)
}

func (s *Strategy) PopulateLoginMethodIdentifierFirstCredentials(r *http.Request, f *login.Flow, _ ...login.FormHydratorModifier) error {
if s.deps.Config().SelfServiceCodeStrategy(r.Context()).PasswordlessEnabled {
f.GetUI().Nodes.Append(
Expand Down
109 changes: 47 additions & 62 deletions selfservice/strategy/code/strategy_login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,84 +831,69 @@ func TestFormHydration(t *testing.T) {
})

t.Run("method=PopulateLoginMethodFirstFactor", func(t *testing.T) {
t.Run("case=aal1", func(t *testing.T) {
t.Run("case=code is used for 2fa but request is 1fa", func(t *testing.T) {
r, f := newFlow(mfaEnabled, t)
f.RequestedAAL = identity.AuthenticatorAssuranceLevel1
require.NoError(t, fh.PopulateLoginMethodFirstFactor(r, f))
toSnapshot(t, f)
})

t.Run("case=code is used for passwordless login and request is 1fa", func(t *testing.T) {
r, f := newFlow(passwordlessEnabled, t)
f.RequestedAAL = identity.AuthenticatorAssuranceLevel1
require.NoError(t, fh.PopulateLoginMethodFirstFactor(r, f))
toSnapshot(t, f)
})

t.Run("case=code is used for passwordless login and request is 1fa with refresh", func(t *testing.T) {
r, f := newFlow(passwordlessEnabled, t)
f.RequestedAAL = identity.AuthenticatorAssuranceLevel1
f.Refresh = true
require.NoError(t, fh.PopulateLoginMethodFirstFactor(r, f))
toSnapshot(t, f)
})

t.Run("case=code is used for 2fa and request is 1fa with refresh", func(t *testing.T) {
r, f := newFlow(mfaEnabled, t)
f.RequestedAAL = identity.AuthenticatorAssuranceLevel1
f.Refresh = true
require.NoError(t, fh.PopulateLoginMethodFirstFactor(r, f))
toSnapshot(t, f)
})
t.Run("case=code is used for 2fa but request is 1fa", func(t *testing.T) {
r, f := newFlow(mfaEnabled, t)
f.RequestedAAL = identity.AuthenticatorAssuranceLevel1
require.NoError(t, fh.PopulateLoginMethodFirstFactor(r, f))
toSnapshot(t, f)
})

t.Run("case=aal2", func(t *testing.T) {
t.Run("case=code is used for 2fa and request is 2fa", func(t *testing.T) {
r, f := newFlow(mfaEnabled, t)
toMFARequest(r, f)
require.NoError(t, fh.PopulateLoginMethodFirstFactor(r, f))
toSnapshot(t, f)
})
t.Run("case=code is used for passwordless login and request is 1fa", func(t *testing.T) {
r, f := newFlow(passwordlessEnabled, t)
f.RequestedAAL = identity.AuthenticatorAssuranceLevel1
require.NoError(t, fh.PopulateLoginMethodFirstFactor(r, f))
toSnapshot(t, f)
})
})

t.Run("case=code is used for passwordless login and request is 2fa", func(t *testing.T) {
r, f := newFlow(passwordlessEnabled, t)
toMFARequest(r, f)
require.NoError(t, fh.PopulateLoginMethodFirstFactor(r, f))
toSnapshot(t, f)
})
t.Run("method=PopulateLoginMethodFirstFactorRefresh", func(t *testing.T) {
t.Run("case=code is used for passwordless login and request is 1fa with refresh", func(t *testing.T) {
r, f := newFlow(passwordlessEnabled, t)
f.RequestedAAL = identity.AuthenticatorAssuranceLevel1
f.Refresh = true
require.NoError(t, fh.PopulateLoginMethodFirstFactorRefresh(r, f))
toSnapshot(t, f)
})

t.Run("case=code is used for 2fa and request is 2fa with refresh", func(t *testing.T) {
r, f := newFlow(mfaEnabled, t)
toMFARequest(r, f)
f.Refresh = true
require.NoError(t, fh.PopulateLoginMethodFirstFactor(r, f))
toSnapshot(t, f)
})
t.Run("case=code is used for 2fa and request is 1fa with refresh", func(t *testing.T) {
r, f := newFlow(mfaEnabled, t)
f.RequestedAAL = identity.AuthenticatorAssuranceLevel1
f.Refresh = true
require.NoError(t, fh.PopulateLoginMethodFirstFactorRefresh(r, f))
toSnapshot(t, f)
})
})

t.Run("case=code is used for passwordless login and request is 2fa with refresh", func(t *testing.T) {
r, f := newFlow(passwordlessEnabled, t)
toMFARequest(r, f)
f.Refresh = true
require.NoError(t, fh.PopulateLoginMethodFirstFactor(r, f))
toSnapshot(t, f)
})
t.Run("method=PopulateLoginMethodSecondFactor", func(t *testing.T) {
t.Run("case=code is used for 2fa and request is 2fa", func(t *testing.T) {
r, f := newFlow(mfaEnabled, t)
toMFARequest(r, f)
require.NoError(t, fh.PopulateLoginMethodSecondFactor(r, f))
toSnapshot(t, f)
})

t.Run("case=code is used for passwordless login and request is 2fa", func(t *testing.T) {
r, f := newFlow(passwordlessEnabled, t)
toMFARequest(r, f)
require.NoError(t, fh.PopulateLoginMethodSecondFactor(r, f))
toSnapshot(t, f)
})
})

t.Run("method=PopulateLoginMethodRefresh", func(t *testing.T) {
t.Run("case=code is used for 2fa", func(t *testing.T) {
t.Run("method=PopulateLoginMethodSecondFactorRefresh", func(t *testing.T) {
t.Run("case=code is used for 2fa and request is 2fa with refresh", func(t *testing.T) {
r, f := newFlow(mfaEnabled, t)
toMFARequest(r, f)
f.Refresh = true
require.NoError(t, fh.PopulateLoginMethodFirstFactor(r, f))
require.NoError(t, fh.PopulateLoginMethodSecondFactorRefresh(r, f))
toSnapshot(t, f)
})

t.Run("case=code is used for passwordless login", func(t *testing.T) {
t.Run("case=code is used for passwordless login and request is 2fa with refresh", func(t *testing.T) {
r, f := newFlow(passwordlessEnabled, t)
toMFARequest(r, f)
f.Refresh = true
require.NoError(t, fh.PopulateLoginMethodFirstFactor(r, f))
require.NoError(t, fh.PopulateLoginMethodSecondFactorRefresh(r, f))
toSnapshot(t, f)
})
})
Expand Down
0 ...hodRefresh-case=code_is_used_for_2fa.json → ...opulateLoginMethodFirstFactorRefresh.json
View file
Open in desktop
File renamed without changes.
6 changes: 5 additions & 1 deletion selfservice/strategy/idfirst/strategy_login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func (s *Strategy) Login(w http.ResponseWriter, r *http.Request, f *login.Flow,
return nil, flow.ErrCompletedByStrategy
}

func (s *Strategy) PopulateLoginMethodRefresh(r *http.Request, sr *login.Flow) error {
func (s *Strategy) PopulateLoginMethodFirstFactorRefresh(r *http.Request, sr *login.Flow) error {
return nil
}

Expand All @@ -127,6 +127,10 @@ func (s *Strategy) PopulateLoginMethodSecondFactor(r *http.Request, sr *login.Fl
return nil
}

func (s *Strategy) PopulateLoginMethodSecondFactorRefresh(r *http.Request, sr *login.Flow) error {
return nil
}

func (s *Strategy) PopulateLoginMethodIdentifierFirstIdentification(r *http.Request, f *login.Flow) error {
f.UI.SetCSRF(s.d.GenerateCSRFToken(r))

Expand Down
8 changes: 7 additions & 1 deletion selfservice/strategy/idfirst/strategy_login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,9 +436,15 @@ func TestFormHydration(t *testing.T) {
toSnapshot(t, f)
})

t.Run("method=PopulateLoginMethodFirstFactorRefresh", func(t *testing.T) {
r, f := newFlow(ctx, t)
require.NoError(t, fh.PopulateLoginMethodFirstFactorRefresh(r, f))
toSnapshot(t, f)
})

t.Run("method=PopulateLoginMethodRefresh", func(t *testing.T) {
r, f := newFlow(ctx, t)
require.NoError(t, fh.PopulateLoginMethodRefresh(r, f))
require.NoError(t, fh.PopulateLoginMethodSecondFactorRefresh(r, f))
toSnapshot(t, f)
})

Expand Down
37 changes: 37 additions & 0 deletions ...ategy/oidc/.snapshots/TestFormHydration-method=PopulateLoginMethodFirstFactorRefresh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[
{
"type": "input",
"group": "default",
"attributes": {
"name": "csrf_token",
"type": "hidden",
"required": true,
"disabled": false,
"node_type": "input"
},
"messages": [],
"meta": {}
},
{
"type": "input",
"group": "oidc",
"attributes": {
"name": "provider",
"type": "submit",
"value": "test-provider",
"disabled": false,
"node_type": "input"
},
"messages": [],
"meta": {
"label": {
"id": 1010002,
"text": "Sign in with test-provider",
"type": "info",
"context": {
"provider": "test-provider"
}
}
}
}
]
15 changes: 15 additions & 0 deletions ...tegy/oidc/.snapshots/TestFormHydration-method=PopulateLoginMethodSecondFactorRefresh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
{
"type": "input",
"group": "default",
"attributes": {
"name": "csrf_token",
"type": "hidden",
"required": true,
"disabled": false,
"node_type": "input"
},
"messages": [],
"meta": {}
}
]
6 changes: 5 additions & 1 deletion selfservice/strategy/oidc/strategy_login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ func (s *Strategy) Login(w http.ResponseWriter, r *http.Request, f *login.Flow,
return nil, errors.WithStack(flow.ErrCompletedByStrategy)
}

func (s *Strategy) PopulateLoginMethodRefresh(r *http.Request, lf *login.Flow) error {
func (s *Strategy) PopulateLoginMethodFirstFactorRefresh(r *http.Request, lf *login.Flow) error {
conf, err := s.Config(r.Context())
if err != nil {
return err
Expand Down Expand Up @@ -331,6 +331,10 @@ func (s *Strategy) PopulateLoginMethodSecondFactor(r *http.Request, sr *login.Fl
return nil
}

func (s *Strategy) PopulateLoginMethodSecondFactorRefresh(r *http.Request, sr *login.Flow) error {
return nil
}

func (s *Strategy) PopulateLoginMethodIdentifierFirstCredentials(r *http.Request, f *login.Flow, mods ...login.FormHydratorModifier) error {
if f.Type != flow.TypeBrowser {
return nil
Expand Down
10 changes: 8 additions & 2 deletions selfservice/strategy/oidc/strategy_login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,20 @@ func TestFormHydration(t *testing.T) {
toSnapshot(t, f)
})

t.Run("method=PopulateLoginMethodRefresh", func(t *testing.T) {
t.Run("method=PopulateLoginMethodFirstFactorRefresh", func(t *testing.T) {
r, f := newFlow(ctx, t)

id := createIdentity(t, ctx, reg, x.NewUUID(), providerID)
r.Header = testhelpers.NewHTTPClientWithIdentitySessionToken(t, ctx, reg, id).Transport.(*testhelpers.TransportWithHeader).GetHeader()
f.Refresh = true

require.NoError(t, fh.PopulateLoginMethodRefresh(r, f))
require.NoError(t, fh.PopulateLoginMethodFirstFactorRefresh(r, f))
toSnapshot(t, f)
})

t.Run("method=PopulateLoginMethodSecondFactorRefresh", func(t *testing.T) {
r, f := newFlow(ctx, t)
require.NoError(t, fh.PopulateLoginMethodFirstFactorRefresh(r, f))
toSnapshot(t, f)
})

Expand Down
1 change: 0 additions & 1 deletion .../strategy/passkey/.snapshots/TestFormHydration-method=PopulateLoginMethodFirstFactor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"type": "script",
"group": "webauthn",
"attributes": {
"src": "http://ORY-MYC0XYW5H3:4433/.well-known/ory/webauthn.js",
"async": true,
"referrerpolicy": "no-referrer",
"crossorigin": "anonymous",
Expand Down
1 change: 0 additions & 1 deletion ...on-method=PopulateLoginMethodRefresh.json → ...opulateLoginMethodFirstFactorRefresh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"type": "script",
"group": "webauthn",
"attributes": {
"src": "http://ORY-MYC0XYW5H3:4433/.well-known/ory/webauthn.js",
"async": true,
"referrerpolicy": "no-referrer",
"crossorigin": "anonymous",
Expand Down
Loading
Loading