Skip to content

fix: Skip local password creation with device auth if already created #1479

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

Draft
nooreldeenmansour wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: Skip local password creation with device auth if already created #1479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions authd-oidc-brokers/internal/broker/broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,10 @@ func (b *Broker) deviceAuth(ctx context.Context, session *session) (string, isAu
return AuthDenied, errorMessageForDisplay(err, "Failed to retrieve groups from Microsoft Graph API")
}

if passwordFileExists(*session) {
Comment thread
nooreldeenmansour marked this conversation as resolved.
return b.finishAuth(session, authInfo)
}

// Store the auth info in the session so that we can use it when handling the
// next IsAuthenticated call for the new password mode.
session.authInfo = authInfo
Expand Down
14 changes: 13 additions & 1 deletion authd-oidc-brokers/internal/broker/broker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,19 @@ func TestIsAuthenticated(t *testing.T) {
"Successfully_authenticate_user_with_device_auth_and_newpassword": {firstSecret: "-", wantSecondCall: true},
"Successfully_authenticate_user_with_password": {firstMode: authmodes.Password, token: &tokenOptions{}},

"Authenticating_with_qrcode_reacquires_token": {firstSecret: "-", wantSecondCall: true, token: &tokenOptions{}},
"Authenticating_with_qrcode_reacquires_token": {
firstSecret: "-",
token: &tokenOptions{},
wantGroups: []info.Group{{Name: "remote-test-group", UGID: "12345"}, {Name: "local-test-group", UGID: ""}},
wantNextAuthModes: []string{},
},

"Authenticating_with_device_auth_and_existing_password_skips_newpassword": {
firstSecret: "-",
token: &tokenOptions{},
wantGroups: []info.Group{{Name: "remote-test-group", UGID: "12345"}, {Name: "local-test-group", UGID: ""}},
wantNextAuthModes: []string{},
},
"Authenticating_with_password_refreshes_expired_token": {firstMode: authmodes.Password, token: &tokenOptions{expired: true}},
"Authenticating_with_password_still_allowed_if_server_is_unreachable": {
firstMode: authmodes.Password,
Expand Down
1 change: 1 addition & 0 deletions ...th_and_existing_password_skips_newpassword/data/provider_url/test-user@email.com/password
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Definitely a hashed password
1 change: 1 addition & 0 deletions ..._and_existing_password_skips_newpassword/data/provider_url/test-user@email.com/token.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Definitely a token
0 ..._with_qrcode_reacquires_token/second_call → ...ing_password_skips_newpassword/first_call
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ating_with_password_when_no_refresh_token_results_in_device_auth_as_next_mode/second_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: next
data: '{}'
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
4 changes: 2 additions & 2 deletions ...en_is_expired_due_to_ca_sign_in_frequency_results_in_device_auth_as_next_mode/second_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: next
data: '{}'
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
4 changes: 2 additions & 2 deletions ...efresh_token_is_expired_due_to_inactivity_results_in_device_auth_as_next_mode/second_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: next
data: '{}'
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
4 changes: 2 additions & 2 deletions ...th_password_when_refresh_token_is_expired_results_in_device_auth_as_next_mode/second_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: next
data: '{}'
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
4 changes: 2 additions & 2 deletions ...estdata/golden/TestIsAuthenticated/Authenticating_with_qrcode_reacquires_token/first_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: next
data: '{}'
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
Loading