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.

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

Jump to bottom

add missing gatewaysvc config #1716

Merged
merged 1 commit into from Feb 25, 2021
Merged

add missing gatewaysvc config #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/unreleased/add-missing-gatewaysvc-config.md
View file
Open in desktop
@@ -0,0 +1,5 @@
Bugfix: Add missing gateway config

The auth provider `ldap` and `oidc` drivers now need to be able talk to the reva gateway. We added the `gatewayscv` to the config that is passed to reva.

https://github.com/owncloud/ocis/pull/1716
1 change: 1 addition & 0 deletions storage/pkg/command/authbasic.go
View file
Open in desktop
Expand Up @@ -101,6 +101,7 @@ func AuthBasic(cfg *config.Config) *cli.Command {
"bind_username": cfg.Reva.LDAP.BindDN,
"bind_password": cfg.Reva.LDAP.BindPassword,
"idp": cfg.Reva.LDAP.IDP,
"gatewaysvc": cfg.Reva.Gateway.Endpoint,
"schema": map[string]interface{}{
"dn": "dn",
"uid": cfg.Reva.LDAP.UserSchema.UID,
Expand Down
11 changes: 6 additions & 5 deletions storage/pkg/command/authbearer.go
View file
Open in desktop
Expand Up @@ -91,11 +91,12 @@ func AuthBearer(cfg *config.Config) *cli.Command {
"auth_manager": "oidc",
"auth_managers": map[string]interface{}{
"oidc": map[string]interface{}{
"issuer": cfg.Reva.OIDC.Issuer,
"insecure": cfg.Reva.OIDC.Insecure,
"id_claim": cfg.Reva.OIDC.IDClaim,
"uid_claim": cfg.Reva.OIDC.UIDClaim,
"gid_claim": cfg.Reva.OIDC.GIDClaim,
"issuer": cfg.Reva.OIDC.Issuer,
"insecure": cfg.Reva.OIDC.Insecure,
"id_claim": cfg.Reva.OIDC.IDClaim,
"uid_claim": cfg.Reva.OIDC.UIDClaim,
"gid_claim": cfg.Reva.OIDC.GIDClaim,
"gatewaysvc": cfg.Reva.Gateway.Endpoint,
},
},
},
Expand Down
10 changes: 10 additions & 0 deletions storage/pkg/flagset/authbasic.go
View file
Open in desktop
Expand Up @@ -59,6 +59,16 @@ func AuthBasicWithConfig(cfg *config.Config) []cli.Flag {
Usage: "--service authprovider [--service otherservice]",
EnvVars: []string{"STORAGE_AUTH_BASIC_SERVICES"},
},

// Gateway

&cli.StringFlag{
Name: "gateway-url",
Value: "localhost:9142",
Usage: "URL to use for the storage gateway service",
EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"},
Destination: &cfg.Reva.Gateway.Endpoint,
},
}

flags = append(flags, TracingWithConfig(cfg)...)
Expand Down
10 changes: 10 additions & 0 deletions storage/pkg/flagset/authbearer.go
View file
Open in desktop
Expand Up @@ -86,6 +86,16 @@ func AuthBearerWithConfig(cfg *config.Config) []cli.Flag {
Usage: "--service authprovider [--service otherservice]",
EnvVars: []string{"STORAGE_AUTH_BEARER_SERVICES"},
},

// Gateway

&cli.StringFlag{
Name: "gateway-url",
Value: "localhost:9142",
Usage: "URL to use for the storage gateway service",
EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"},
Destination: &cfg.Reva.Gateway.Endpoint,
},
}

flags = append(flags, TracingWithConfig(cfg)...)
Expand Down