Skip to content
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

accounts now uses the same reva jwt secret as the metadata storage #3081

Merged
merged 1 commit into from
Feb 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion accounts/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ type Disk struct {
// CS3 is the cs3 implementation of the storage.
type CS3 struct {
ProviderAddr string `ocisConfig:"provider_addr" env:"ACCOUNTS_STORAGE_CS3_PROVIDER_ADDR"`
JWTSecret string `ocisConfig:"jwt_secret" env:"ACCOUNTS_STORAGE_CS3_JWT_SECRET"`
}

// ServiceUser defines the user required for EOS.
Expand Down
1 change: 0 additions & 1 deletion accounts/pkg/config/defaultconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ func DefaultConfig() *Config {
},
CS3: CS3{
ProviderAddr: "localhost:9215",
JWTSecret: "Pive-Fumkiu4",
},
},
Index: Index{
Expand Down
2 changes: 1 addition & 1 deletion accounts/pkg/service/v0/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func configFromSvc(cfg *config.Config) (*idxcfg.Config, error) {
Backend: cfg.Repo.Backend,
CS3: idxcfg.CS3{
ProviderAddr: cfg.Repo.CS3.ProviderAddr,
JWTSecret: cfg.Repo.CS3.JWTSecret,
JWTSecret: cfg.TokenManager.JWTSecret,
},
}
default:
Expand Down
8 changes: 8 additions & 0 deletions changelog/unreleased/fix-accounts-metadata-jwt-token.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Bugfix: use same jwt secret for accounts as for metadata storage

We've the metadata storage uses the same jwt secret as all other REVA services.
Therefore the accounts service needs to use the same secret.

Secrets are documented here: https://owncloud.dev/ocis/deployment/#change-default-secrets

https://github.com/owncloud/ocis/pull/3081