Skip to content

Fix panic when an invalid oauth2 name is passed (#20820) #20900

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
techknowlogick merged 3 commits into from
Aug 22, 2022
Merged

Fix panic when an invalid oauth2 name is passed (#20820) #20900

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6d425f
Fix panic when an invalid oauth2 name is passed (#20820)
balki Aug 17, 2022
4b69bef
Merge branch 'release/v1.17' into backport-20820-v1.17
lunny Aug 21, 2022
d3fa97d
Merge branch 'release/v1.17' into backport-20820-v1.17
lunny Aug 22, 2022
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
6 changes: 5 additions & 1 deletion models/auth/oauth2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,10 +512,14 @@ func GetActiveOAuth2ProviderSources() ([]*Source, error) {
func GetActiveOAuth2SourceByName(name string) (*Source, error) {
authSource := new(Source)
has, err := db.GetEngine(db.DefaultContext).Where("name = ? and type = ? and is_active = ?", name, OAuth2, true).Get(authSource)
if !has || err != nil {
if err != nil {
return nil, err
}

if !has {
return nil, fmt.Errorf("oauth2 source not found, name: %q", name)
}

return authSource, nil
}

Expand Down