-
Notifications
You must be signed in to change notification settings - Fork 346
fix JWK endpoints returning empty keys #4662
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.
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
Closed
olamilekan000
wants to merge
1
commit into
supabase:develop
from
olamilekan000:fix-jwk-endpoint-returning-empty-keys
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| # Supabase | ||
| .branches | ||
| .temp | ||
| signing_keys.json | ||
|
|
||
| # dotenvx | ||
| .env.keys | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -882,10 +882,8 @@ func (c *config) Validate(fsys fs.FS) error { | |
| } | ||
| } | ||
| if len(c.Auth.SigningKeysPath) > 0 { | ||
| if f, err := fsys.Open(c.Auth.SigningKeysPath); err != nil { | ||
| return errors.Errorf("failed to read signing keys: %w", err) | ||
| } else if c.Auth.SigningKeys, err = fetcher.ParseJSON[[]JWK](f); err != nil { | ||
| return errors.Errorf("failed to decode signing keys: %w", err) | ||
| if err := c.loadSigningKeys(fsys); err != nil { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this refactor is unnecessary because ParseJSON closes the reader automatically |
||
| return err | ||
| } | ||
| } | ||
| if err := c.Auth.Hook.validate(); err != nil { | ||
|
|
@@ -946,6 +944,26 @@ func (c *config) Validate(fsys fs.FS) error { | |
| return nil | ||
| } | ||
|
|
||
| func (c *config) loadSigningKeys(fsys fs.FS) error { | ||
| f, err := fsys.Open(c.Auth.SigningKeysPath) | ||
| if err != nil { | ||
| if errors.Is(err, os.ErrNotExist) { | ||
| fmt.Fprintf(os.Stderr, "WARN: signing keys file not found: %s - will be created during init\n", c.Auth.SigningKeysPath) | ||
| return nil | ||
| } | ||
| return fmt.Errorf("failed to read signing keys: %w", err) | ||
| } | ||
| defer f.Close() | ||
|
|
||
| signingKeys, err := fetcher.ParseJSON[[]JWK](f) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to decode signing keys: %w", err) | ||
| } | ||
|
|
||
| c.Auth.SigningKeys = signingKeys | ||
| return nil | ||
| } | ||
|
|
||
| func assertEnvLoaded(s string) error { | ||
| if matches := envPattern.FindStringSubmatch(s); len(matches) > 1 { | ||
| fmt.Fprintln(os.Stderr, "WARN: environment variable is unset:", matches[1]) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since
supabase initis no longer a prerequisite forsupabase start, we cannot assume users will always run init before start. Let's handle signing key generation as part of config loading instead.