commit a7f9e14

Merge: a0f5c7a 9ac13e6 Author: Jörn Friedrich Dreyer <jfd@owncloud.com> Date: Fri May 20 12:24:06 2022 +0000 Merge pull request #3825 from owncloud/lico-cs3-update IDP: allow using cs3 api to authenticate users
owncloud · May 20, 2022 · 1788e7d · 1788e7d
1 parent 77bc66c
commit 1788e7d
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 14 deletions.
diff --git a/extensions/_includes/adoc/idp_configvars.adoc b/extensions/_includes/adoc/idp_configvars.adoc
@@ -105,6 +105,17 @@
 | false
 | 
 
+|`REVA_GATEWAY`
+| string
+| 127.0.0.1:9142
+| CS3 gateway used to authenticate and look up users
+
+|`OCIS_MACHINE_AUTH_API_KEY` +
+`IDP_MACHINE_AUTH_API_KEY`
+| string
+| 
+| Machine auth API key used to impersonate users when looking up their userinfo via the 'cs3' backend.
+
 |`IDP_ASSET_PATH`
 | string
 | 
@@ -115,12 +126,12 @@
 `IDP_ISS`
 | string
 | \https://localhost:9200
-| 
+| The OIDC issuer URL to use.
 
 |`IDP_IDENTITY_MANAGER`
 | string
 | ldap
-| 
+| The identity manager implementation to use, defaults to 'ldap', can be changed to 'cs3', 'kc', 'libregraph', 'cookie' or 'guest'.
 
 |`IDP_URI_BASE_PATH`
 | string
@@ -150,7 +161,7 @@
 |`IDP_INSECURE`
 | bool
 | false
-| 
+| Allow insecure connections to the backend.
 
 |`IDP_ALLOW_CLIENT_GUESTS`
 | bool

diff --git a/extensions/_includes/idp-config-example.yaml b/extensions/_includes/idp-config-example.yaml
@@ -22,6 +22,9 @@ http:
   tls_cert: ~/.ocis/idp/server.crt
   tls_key: ~/.ocis/idp/server.key
   tls: false
+reva:
+  address: 127.0.0.1:9142
+machine_auth_api_key: ""
 asset:
   asset: ""
 idp:

diff --git a/extensions/_includes/idp_configvars.md b/extensions/_includes/idp_configvars.md
@@ -20,15 +20,17 @@
 | IDP_TRANSPORT_TLS_CERT | string | ~/.ocis/idp/server.crt | |
 | IDP_TRANSPORT_TLS_KEY | string | ~/.ocis/idp/server.key | |
 | IDP_TLS | bool | false | |
+| REVA_GATEWAY | string | 127.0.0.1:9142 | CS3 gateway used to authenticate and look up users|
+| OCIS_MACHINE_AUTH_API_KEY<br/>IDP_MACHINE_AUTH_API_KEY | string |  | Machine auth API key used to impersonate users when looking up their userinfo via the 'cs3' backend.|
 | IDP_ASSET_PATH | string |  | |
-| OCIS_URL<br/>OCIS_OIDC_ISSUER<br/>IDP_ISS | string | https://localhost:9200 | |
-| IDP_IDENTITY_MANAGER | string | ldap | |
+| OCIS_URL<br/>OCIS_OIDC_ISSUER<br/>IDP_ISS | string | https://localhost:9200 | The OIDC issuer URL to use.|
+| IDP_IDENTITY_MANAGER | string | ldap | The identity manager implementation to use, defaults to 'ldap', can be changed to 'cs3', 'kc', 'libregraph', 'cookie' or 'guest'.|
 | IDP_URI_BASE_PATH | string |  | |
 | IDP_SIGN_IN_URI | string |  | |
 | IDP_SIGN_OUT_URI | string |  | |
 | IDP_ENDPOINT_URI | string |  | |
 | IDP_ENDSESSION_ENDPOINT_URI | string |  | |
-| IDP_INSECURE | bool | false | |
+| IDP_INSECURE | bool | false | Allow insecure connections to the backend.|
 | IDP_ALLOW_CLIENT_GUESTS | bool | false | |
 | IDP_ALLOW_DYNAMIC_CLIENT_REGISTRATION | bool | false | |
 | IDP_ENCRYPTION_SECRET_FILE | string |  | |

diff --git a/grpc_apis/ocis/messages/search/v0/grpc.md b/grpc_apis/ocis/messages/search/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.search.v0"
 url: /grpc_apis/ocis_messages_search_v0
-date: 2022-05-20T07:51:27Z
+date: 2022-05-20T12:25:02Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/settings/v0/grpc.md b/grpc_apis/ocis/messages/settings/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.settings.v0"
 url: /grpc_apis/ocis_messages_settings_v0
-date: 2022-05-20T07:51:27Z
+date: 2022-05-20T12:25:02Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/store/v0/grpc.md b/grpc_apis/ocis/messages/store/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.store.v0"
 url: /grpc_apis/ocis_messages_store_v0
-date: 2022-05-20T07:51:27Z
+date: 2022-05-20T12:25:02Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/thumbnails/v0/grpc.md b/grpc_apis/ocis/messages/thumbnails/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.thumbnails.v0"
 url: /grpc_apis/ocis_messages_thumbnails_v0
-date: 2022-05-20T07:51:27Z
+date: 2022-05-20T12:25:02Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/search/v0/grpc.md b/grpc_apis/ocis/services/search/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.search.v0"
 url: /grpc_apis/ocis_services_search_v0
-date: 2022-05-20T07:51:27Z
+date: 2022-05-20T12:25:02Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/settings/v0/grpc.md b/grpc_apis/ocis/services/settings/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.settings.v0"
 url: /grpc_apis/ocis_services_settings_v0
-date: 2022-05-20T07:51:27Z
+date: 2022-05-20T12:25:02Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/store/v0/grpc.md b/grpc_apis/ocis/services/store/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.store.v0"
 url: /grpc_apis/ocis_services_store_v0
-date: 2022-05-20T07:51:27Z
+date: 2022-05-20T12:25:02Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/thumbnails/v0/grpc.md b/grpc_apis/ocis/services/thumbnails/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.thumbnails.v0"
 url: /grpc_apis/ocis_services_thumbnails_v0
-date: 2022-05-20T07:51:27Z
+date: 2022-05-20T12:25:02Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---