Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 516
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
Uh oh!
There was an error while loading. Please reload this page.
Changes from all commits
File filter
Filter by extension
Conversations
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| # Supabase | ||
| .branches | ||
| .temp | ||
| signing_keys.json | ||
| # dotenvx | ||
| .env.keys | ||
| 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]) | ||
Uh oh!
There was an error while loading. Please reload this page.
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.