Skip to content

Don't init singing keys if oauth2 provider disabled #32177

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 2 commits into from
Oct 3, 2024
Merged

Don't init singing keys if oauth2 provider disabled #32177

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f88e2a7
Don't init singing keys if oauth2 provider disabled
lunny Oct 2, 2024
50fb273
Merge branch 'release/v1.22' into lunny/clean_oauth2-2
GiteaBot Oct 3, 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
8 changes: 6 additions & 2 deletions services/auth/source/oauth2/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,14 @@ const ProviderHeaderKey = "gitea-oauth2-provider"

// Init initializes the oauth source
func Init(ctx context.Context) error {
if err := InitSigningKey(); err != nil {
return err
// this is for oauth2 provider
if setting.OAuth2.Enabled {
if err := InitSigningKey(); err != nil {
return err
}
}

// others for oauth2 clients
// Lock our mutex
gothRWMutex.Lock()

Expand Down