Skip to content

Lock goth/gothic and Re-attempt OAuth2 registration on login if registration failed at startup (#16564) #16570

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
merged 3 commits into from
Jul 29, 2021
Merged

Lock goth/gothic and Re-attempt OAuth2 registration on login if registration failed at startup (#16564) #16570

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73c03f5
Add locking to goth and gothic calls with a RWMutex
zeripath Jul 27, 2021
b1e452d
Reattempt oauth2 registration on login if registration failed
zeripath Jul 28, 2021
69478a8
Merge branch 'release/v1.15' into backport-16564
6543 Jul 29, 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
Prev Previous commit
Next Next commit
Reattempt oauth2 registration on login if registration failed 
If OAuth2 registration fails at startup we currently disable the
login_source however an alternative approach could be to reattempt
registration on login attempt.

Fix #16096

Signed-off-by: Andrew Thornton <[email protected]>
  • Loading branch information
@zeripath
zeripath committed Jul 28, 2021
commit b1e452d4a6a1e5944b133376cb32f7bb66ca4c0d
5 changes: 0 additions & 5 deletions models/oauth2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,6 @@ func initOAuth2LoginSources() error {
err := oauth2.RegisterProvider(source.Name, oAuth2Config.Provider, oAuth2Config.ClientID, oAuth2Config.ClientSecret, oAuth2Config.OpenIDConnectAutoDiscoveryURL, oAuth2Config.CustomURLMapping)
if err != nil {
log.Critical("Unable to register source: %s due to Error: %v. This source will be disabled.", source.Name, err)
source.IsActived = false
if err = UpdateSource(source); err != nil {
log.Critical("Unable to update source %s to disable it. Error: %v", err)
return err
}
}
}
return nil
Expand Down