sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add missing gatewaysvc config

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2021-02-25 08:41:19 +00:00
parent b8ac8f1ddd
commit 059bec1a7a
5 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog/unreleased/add-missing-gatewaysvc-config.md
+5
View File
@@ -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
storage/pkg/command/authbasic.go
+1
View File
@@ -101,6 +101,7 @@ func AuthBasic(cfg *config.Config) *cli.Command {
"bind_username": cfg.Reva.LDAP.BindDN, "bind_username": cfg.Reva.LDAP.BindDN,
"bind_password": cfg.Reva.LDAP.BindPassword, "bind_password": cfg.Reva.LDAP.BindPassword,
"idp": cfg.Reva.LDAP.IDP, "idp": cfg.Reva.LDAP.IDP,
"gatewaysvc": cfg.Reva.Gateway.Endpoint,
"schema": map[string]interface{}{ "schema": map[string]interface{}{
"dn": "dn", "dn": "dn",
"uid": cfg.Reva.LDAP.UserSchema.UID, "uid": cfg.Reva.LDAP.UserSchema.UID,
storage/pkg/command/authbearer.go
+6 -5
View File
@@ -91,11 +91,12 @@ func AuthBearer(cfg *config.Config) *cli.Command {
"auth_manager": "oidc", "auth_manager": "oidc",
"auth_managers": map[string]interface{}{ "auth_managers": map[string]interface{}{
"oidc": map[string]interface{}{ "oidc": map[string]interface{}{
"issuer": cfg.Reva.OIDC.Issuer, "issuer": cfg.Reva.OIDC.Issuer,
"insecure": cfg.Reva.OIDC.Insecure, "insecure": cfg.Reva.OIDC.Insecure,
"id_claim": cfg.Reva.OIDC.IDClaim, "id_claim": cfg.Reva.OIDC.IDClaim,
"uid_claim": cfg.Reva.OIDC.UIDClaim, "uid_claim": cfg.Reva.OIDC.UIDClaim,
"gid_claim": cfg.Reva.OIDC.GIDClaim, "gid_claim": cfg.Reva.OIDC.GIDClaim,
"gatewaysvc": cfg.Reva.Gateway.Endpoint,
}, },
}, },
}, },
storage/pkg/flagset/authbasic.go
+10
View File
@@ -59,6 +59,16 @@ func AuthBasicWithConfig(cfg *config.Config) []cli.Flag {
Usage: "--service authprovider [--service otherservice]", Usage: "--service authprovider [--service otherservice]",
EnvVars: []string{"STORAGE_AUTH_BASIC_SERVICES"}, 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)...) flags = append(flags, TracingWithConfig(cfg)...)
storage/pkg/flagset/authbearer.go
+10
View File
@@ -86,6 +86,16 @@ func AuthBearerWithConfig(cfg *config.Config) []cli.Flag {
Usage: "--service authprovider [--service otherservice]", Usage: "--service authprovider [--service otherservice]",
EnvVars: []string{"STORAGE_AUTH_BEARER_SERVICES"}, 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)...) flags = append(flags, TracingWithConfig(cfg)...)