mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-25 13:38:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not start openid connect provider - OCIS will use konnectd by def… (#61)

Browse Source 
* Do not start openid connect provider - OCIS will use konnectd by default

* default to konnectd as oidc

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

Co-authored-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Thomas Müller
2020-02-13 21:25:52 +01:00
committed by GitHub
parent f1e6fb3c54
commit 584d47daa8
3 changed files with 4 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/command/frontend.go
-45
View File
@@ -138,51 +138,6 @@ func Frontend(cfg *config.Config) *cli.Command {
"gateway": "", // TODO not needed?
"transfer_shared_secret": cfg.Reva.TransferSecret,
},
"wellknown": map[string]interface{}{
"issuer": cfg.Reva.OIDC.Issuer,
"authorization_endpoint": cfg.Reva.OIDC.Issuer + "/oauth2/auth",
"token_endpoint": cfg.Reva.OIDC.Issuer + "/oauth2/token",
"revocation_endpoint": cfg.Reva.OIDC.Issuer + "/oauth2/auth",
"introspection_endpoint": cfg.Reva.OIDC.Issuer + "/oauth2/introspect",
"userinfo_endpoint": cfg.Reva.OIDC.Issuer + "/oauth2/userinfo",
},
"oidcprovider": map[string]interface{}{
"prefix": "oauth2",
"gateway": cfg.Reva.Gateway.URL,
"issuer": cfg.Reva.OIDC.Issuer,
"clients": map[string]interface{}{
// TODO make these configurable
// note: always use authorization code flow, see https://developer.okta.com/blog/2019/05/01/is-the-oauth-implicit-flow-dead for details
"phoenix": map[string]interface{}{
"id": "phoenix",
"redirect_uris": []string{"http://localhost:9100/oidc-callback.html", "http://localhost:9100/"},
"grant_types": []string{"implicit", "refresh_token", "authorization_code", "password", "client_credentials"},
"response_types": []string{"code"},
"scopes": []string{"openid", "profile", "email", "offline"},
"public": true, // force PKCS for public clients
},
// desktop
"xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69": map[string]interface{}{
"id": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69",
"client_secret": "$2y$12$pKsCQPp8e/UOL1QDQhT3g.1J.KK8oMJACbEXIqRD0LiOxvgey.TtS",
// preregister localhost ports for the desktop
"redirect_uris": desktopRedirectURIs,
"grant_types": []string{"implicit", "refresh_token", "authorization_code", "password", "client_credentials"},
"response_types": []string{"code"},
"scopes": []string{"openid", "profile", "email", "offline", "offline_access"},
},
// TODO add cli command for token fetching
"cli": map[string]interface{}{
"id": "cli",
"client_secret": "$2a$10$IxMdI6d.LIRZPpSfEwNoeu4rY3FhDREsxFJXikcgdRRAStxUlsuEO", // = "foobar"
// use hardcoded port credentials for cli
"redirect_uris": []string{"http://localhost:18080/callback"},
"grant_types": []string{"implicit", "refresh_token", "authorization_code", "password", "client_credentials"},
"response_types": []string{"code"},
"scopes": []string{"openid", "profile", "email", "offline"},
},
},
},
"ocdav": map[string]interface{}{
"prefix": "",
"chunk_folder": "/var/tmp/revad/chunks",
pkg/flagset/authbearer.go
+2 -1
View File
@@ -86,13 +86,14 @@ func AuthBearerWithConfig(cfg *config.Config) []cli.Flag {
&cli.StringFlag{
Name: "oidc-issuer",
Value: "http://localhost:9140",
Value: "https://localhost:9130",
Usage: "OIDC issuer",
EnvVars: []string{"REVA_OIDC_ISSUER"},
Destination: &cfg.Reva.OIDC.Issuer,
},
&cli.BoolFlag{
Name: "oidc-insecure",
Value: true,
Usage: "OIDC allow insecure communication",
EnvVars: []string{"REVA_OIDC_INSECURE"},
Destination: &cfg.Reva.OIDC.Insecure,
pkg/flagset/frontend.go
+2 -1
View File
@@ -113,13 +113,14 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
&cli.StringFlag{
Name: "oidc-issuer",
Value: "http://localhost:9140",
Value: "https://localhost:9130",
Usage: "OIDC issuer",
EnvVars: []string{"REVA_OIDC_ISSUER"},
Destination: &cfg.Reva.OIDC.Issuer,
},
&cli.BoolFlag{
Name: "oidc-insecure",
Value: true,
Usage: "OIDC allow insecure communication",
EnvVars: []string{"REVA_OIDC_INSECURE"},
Destination: &cfg.Reva.OIDC.Insecure,