Skip to content

Commit

Permalink
Merge pull request #3081 from owncloud/metadata-service-jwt-token
Browse files Browse the repository at this point in the history
accounts now uses the same reva jwt secret as the metadata storage
  • Loading branch information
wkloucek authored Feb 1, 2022
2 parents 3cbd78f + f0d072e commit 3eeffaa
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
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

0 comments on commit 3eeffaa

Please sign in to comment.