diff --git a/.codacy.yml b/.codacy.yml index 4be0db63e..93dca4f8b 100644 --- a/.codacy.yml +++ b/.codacy.yml @@ -8,8 +8,8 @@ exclude_paths: - 'docs/**' - '**/docs/**' - '**/pkg/proto/**' - - 'konnectd/ui_config/**' - - 'konnectd/scripts/**' + - 'idp/ui_config/**' + - 'idp/scripts/**' - 'settings/rollup.config.js' - 'accounts/rollup.config.js' - 'ocis/docker/eos-ocis/Dockerfile' diff --git a/.drone.star b/.drone.star index dac646de7..652b05e2a 100644 --- a/.drone.star +++ b/.drone.star @@ -2,7 +2,7 @@ config = { 'modules': { 'accounts': 'frontend', 'glauth':'', - 'konnectd':'', + 'idp':'', 'ocis': '', 'web':'', 'ocis-pkg':'', @@ -1370,8 +1370,8 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes=[]): 'STORAGE_SHARING_USER_JSON_FILE': '/srv/app/tmp/ocis/shares.json', 'PROXY_ENABLE_BASIC_AUTH': True, 'WEB_UI_CONFIG': '/drone/src/tests/config/drone/ocis-config.json', - 'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/tests/config/drone/identifier-registration.yml', - 'KONNECTD_TLS': 'true', + 'IDP_IDENTIFIER_REGISTRATION_CONF': '/drone/src/tests/config/drone/identifier-registration.yml', + 'IDP_TLS': 'true', 'OCIS_LOG_LEVEL': 'warn', } diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0152c9098..d97f1c95f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -25,7 +25,7 @@ updates: open-pull-requests-limit: 10 - package-ecosystem: "npm" - directory: "/konnectd" + directory: "/idp" schedule: interval: "weekly" open-pull-requests-limit: 10 diff --git a/.gitignore b/.gitignore index 24df6bfce..40cf88772 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ node_modules/ yarn-error.log # Konnectd -konnectd/assets/identifier +idp/assets/identifier # Composer - used for API acceptance tests composer.lock diff --git a/Makefile b/Makefile index 25720e89e..5c2b553f2 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ RESET := $(shell tput -Txterm sgr0) OCIS_MODULES = \ accounts \ glauth \ - konnectd \ + idp \ ocis \ ocis-pkg \ ocs \ diff --git a/accounts/pkg/proto/v0/accounts.pb.micro_test.go b/accounts/pkg/proto/v0/accounts.pb.micro_test.go index 03d8731c6..e905eb295 100644 --- a/accounts/pkg/proto/v0/accounts.pb.micro_test.go +++ b/accounts/pkg/proto/v0/accounts.pb.micro_test.go @@ -126,7 +126,7 @@ func getGroup(group string) *proto.Group { switch group { case "sysusers": return &proto.Group{Id: "34f38767-c937-4eb6-b847-1c175829a2a0", GidNumber: 15000, OnPremisesSamAccountName: "sysusers", DisplayName: "Technical users", Description: "A group for technical users. They should not show up in sharing dialogs.", Members: []*proto.Account{ - {Id: "820ba2a1-3f54-4538-80a4-2d73007e30bf"}, // konnectd + {Id: "820ba2a1-3f54-4538-80a4-2d73007e30bf"}, // idp {Id: "bc596f3c-c955-4328-80a0-60d018b4ad57"}, // reva }} case "users": diff --git a/accounts/pkg/service/v0/service.go b/accounts/pkg/service/v0/service.go index 5896f50c1..cb74008c5 100644 --- a/accounts/pkg/service/v0/service.go +++ b/accounts/pkg/service/v0/service.go @@ -236,14 +236,14 @@ func (s Service) createDefaultAccounts() (err error) { // technical users for kopano and reva { Id: "820ba2a1-3f54-4538-80a4-2d73007e30bf", - PreferredName: "konnectd", - OnPremisesSamAccountName: "konnectd", + PreferredName: "idp", + OnPremisesSamAccountName: "idp", Mail: "idp@example.org", - DisplayName: "Kopano Konnectd", + DisplayName: "Kopano IDP", UidNumber: 10000, GidNumber: 15000, PasswordProfile: &proto.PasswordProfile{ - Password: "$2a$11$ntoTP2W/kyQIuoYpH5mRBuNzaEERYWSwn/zCsY5rtffen4d41y9.6", + Password: "$2y$12$ywfGLDPsSlBTVZU0g.2GZOPO8Wap3rVOpm8e3192VlytNdGWH7x72", }, AccountEnabled: true, MemberOf: []*proto.Group{ @@ -309,7 +309,7 @@ func (s Service) createDefaultAccounts() (err error) { for _, accountID := range []string{ "058bff95-6708-4fe5-91e4-9ea3d377588b", //moss "ddc2004c-0977-11eb-9d3f-a793888cd0f8", //admin - "820ba2a1-3f54-4538-80a4-2d73007e30bf", //konnectd + "820ba2a1-3f54-4538-80a4-2d73007e30bf", //idp "bc596f3c-c955-4328-80a0-60d018b4ad57", //reva } { assignRoleToUser(accountID, settings_svc.BundleUUIDRoleAdmin, s.RoleService, s.log) @@ -327,7 +327,7 @@ func (s Service) createDefaultAccounts() (err error) { func (s Service) createDefaultGroups() (err error) { groups := []proto.Group{ {Id: "34f38767-c937-4eb6-b847-1c175829a2a0", GidNumber: 15000, OnPremisesSamAccountName: "sysusers", DisplayName: "Technical users", Description: "A group for technical users. They should not show up in sharing dialogs.", Members: []*proto.Account{ - {Id: "820ba2a1-3f54-4538-80a4-2d73007e30bf"}, // konnectd + {Id: "820ba2a1-3f54-4538-80a4-2d73007e30bf"}, // idp {Id: "bc596f3c-c955-4328-80a0-60d018b4ad57"}, // reva }}, {Id: "509a9dcd-bb37-4f4f-a01a-19dca27d9cfa", GidNumber: 30000, OnPremisesSamAccountName: "users", DisplayName: "Users", Description: "A group every normal user belongs to.", Members: []*proto.Account{ diff --git a/accounts/ui/tests/acceptance/features/accounts.feature b/accounts/ui/tests/acceptance/features/accounts.feature index 6a10cec45..72f626826 100644 --- a/accounts/ui/tests/acceptance/features/accounts.feature +++ b/accounts/ui/tests/acceptance/features/accounts.feature @@ -4,7 +4,7 @@ Feature: Accounts Given user "Moss" has logged in using the webUI When the user browses to the accounts page Then user "einstein" should be displayed in the accounts list on the WebUI - And user "konnectd" should be displayed in the accounts list on the WebUI + And user "idp" should be displayed in the accounts list on the WebUI And user "marie" should be displayed in the accounts list on the WebUI And user "reva" should be displayed in the accounts list on the WebUI And user "richard" should be displayed in the accounts list on the WebUI @@ -72,4 +72,4 @@ Feature: Accounts Given user "Moss" has logged in using the webUI And the user browses to the accounts page When the user deletes user "bob" using the WebUI - Then user "bob" should not be displayed in the accounts list on the WebUI \ No newline at end of file + Then user "bob" should not be displayed in the accounts list on the WebUI diff --git a/deployments/examples/owncloud10_with_oc_web/docker-compose.yml b/deployments/examples/owncloud10_with_oc_web/docker-compose.yml index 3bc3974f8..f32d3282c 100644 --- a/deployments/examples/owncloud10_with_oc_web/docker-compose.yml +++ b/deployments/examples/owncloud10_with_oc_web/docker-compose.yml @@ -74,11 +74,11 @@ services: PROXY_CONFIG_FILE: "/config/proxy-config.json" PROXY_ENABLE_PRESIGNEDURLS: "false" PROXY_TLS: "false" - # konnectd - binddn must exist as oc10 admin user - KONNECTD_IDENTIFIER_REGISTRATION_CONF: "/config/identifier-registration.yaml" - KONNECTD_INSECURE: "${INSECURE:-false}" - KONNECTD_SIGNING_KID: super - KONNECTD_TLS: 0 + # idp - binddn must exist as oc10 admin user + IDP_IDENTIFIER_REGISTRATION_CONF: "/config/identifier-registration.yaml" + IDP_INSECURE: "${INSECURE:-false}" + IDP_SIGNING_KID: super + IDP_TLS: 0 LDAP_BASEDN: "dc=example,dc=org" LDAP_BINDDN: "cn=admin,dc=example,dc=org" LDAP_BINDPW: "admin" diff --git a/docs/Makefile b/docs/Makefile index 371cbd921..c137e5cfe 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -3,7 +3,7 @@ SHELL := bash OCIS_MODULES = \ accounts \ glauth \ - konnectd \ + idp \ ocis \ ocs \ ocis-pkg \ diff --git a/docs/extensions/konnectd/.gitignore b/docs/extensions/idp/.gitignore similarity index 100% rename from docs/extensions/konnectd/.gitignore rename to docs/extensions/idp/.gitignore diff --git a/docs/extensions/konnectd/_index.md b/docs/extensions/idp/_index.md similarity index 75% rename from docs/extensions/konnectd/_index.md rename to docs/extensions/idp/_index.md index cb65988a1..e4ab82677 100644 --- a/docs/extensions/konnectd/_index.md +++ b/docs/extensions/idp/_index.md @@ -1,8 +1,8 @@ --- -title: Konnectd +title: IDP weight: 20 geekdocRepo: https://github.com/owncloud/ocis -geekdocEditPath: edit/master/docs/extensions/konnectd +geekdocEditPath: edit/master/docs/extensions/idp geekdocFilePath: _index.md geekdocCollapseSection: true --- diff --git a/docs/ocis/_index.md b/docs/ocis/_index.md index 0163c9b33..db64e3261 100644 --- a/docs/ocis/_index.md +++ b/docs/ocis/_index.md @@ -24,9 +24,9 @@ We run a huge [test suite](https://github.com/owncloud/core/tree/master/tests), {{< mermaid class="text-center">}} graph TD proxy --> - konnectd & web & thumbnails & ocs & webdav & storage & accounts & store & settings + idp & web & thumbnails & ocs & webdav & storage & accounts & store & settings -konnectd --> glauth +idp --> glauth storage --> REVA diff --git a/docs/ocis/deployment/basic-remote-setup.md b/docs/ocis/deployment/basic-remote-setup.md index b022cf2c8..f335e8d1f 100644 --- a/docs/ocis/deployment/basic-remote-setup.md +++ b/docs/ocis/deployment/basic-remote-setup.md @@ -62,6 +62,9 @@ This snippet will start the oCIS server with auto generated self signed certific PROXY_HTTP_ADDR=0.0.0.0:9200 \ OCIS_URL=https://your-server:9200 \ KONNECTD_TLS=0 \ +PROXY_TRANSPORT_TLS_KEY=./certs/your-host.key \ +PROXY_TRANSPORT_TLS_CERT=./certs/your-host.crt \ +IDP_TLS=0 \ ./bin/ocis server ``` diff --git a/docs/ocis/deployment/bridge.md b/docs/ocis/deployment/bridge.md index bde2681f4..cdc9f8657 100644 --- a/docs/ocis/deployment/bridge.md +++ b/docs/ocis/deployment/bridge.md @@ -101,7 +101,7 @@ Groups should work as well: $ ldapsearch -x -H ldap://localhost:9125 -b dc=example,dc=com -D "cn=admin,dc=example,dc=com" -W '(objectclass=posixgroup)' ``` -> Note: This is currently a readonly implementation and minimal to the usecase of authenticating users with konnectd. +> Note: This is currently a readonly implementation and minimal to the usecase of authenticating users with idp. ### Start ocis-web @@ -124,21 +124,21 @@ $ bin/web server --web-config-server https://cloud.example.com --oidc-authority `ocis-web` needs to know - `--web-config-server https://cloud.example.com` is ownCloud url with webdav and ocs endpoints (oc10 or ocis) -- `--oidc-authority https://192.168.1.100:9130` the openid connect issuing authority, in our case `oidc-konnectd`, running on port 9130 +- `--oidc-authority https://192.168.1.100:9130` the openid connect issuing authority, in our case `oidc-idp`, running on port 9130 - `--oidc-metadata-url https://192.168.1.100:9130/.well-known/openid-configuration` the openid connect configuration endpoint, typically the issuer host with `.well-known/openid-configuration`, but there are cases when another endpoint is used, eg. ping identity provides multiple endpoints to separate domains -- `--oidc-client-id ocis` the client id we will register later with `ocis-konnectd` in the `identifier-registration.yaml` +- `--oidc-client-id ocis` the client id we will register later with `ocis-idp` in the `identifier-registration.yaml` -### Start ocis-konnectd +### Start ocis-idp #### Get it! In an `ocis` folder ``` -$ git clone git@github.com:owncloud/ocis-konnectd.git -$ cd ocis-konnectd +$ git clone git@github.com:owncloud/ocis-idp.git +$ cd ocis-idp $ make ``` -This should give you a `bin/ocis-konnectd` binary. Try listing the help with `bin/ocis-konnectd --help`. +This should give you a `bin/ocis-idp` binary. Try listing the help with `bin/ocis-idp --help`. #### Set environment variables @@ -183,12 +183,12 @@ Replace `localhost:9100` in the redirect URIs with your `ocis-web` host and port #### Run it! -You can now bring up `ocis-konnectd` with: +You can now bring up `ocis-idp` with: ```console -$ bin/ocis-konnectd server --iss https://192.168.1.100:9130 --identifier-registration-conf assets/identifier-registration.yaml --signing-kid gen1-2020-02-27 +$ bin/ocis-idp server --iss https://192.168.1.100:9130 --identifier-registration-conf assets/identifier-registration.yaml --signing-kid gen1-2020-02-27 ``` -`ocis-konnectd` needs to know +`ocis-idp` needs to know - `--iss https://192.168.1.100:9130` the issuer, which must be a reachable https endpoint. For testing an ip works. HTTPS is NOT optional. This url is exposed in the `https://192.168.1.100:9130/.well-known/openid-configuration` endpoint and clients need to be able to connect to it - `--identifier-registration-conf assets/identifier-registration.yaml` the identifier-registration.yaml you created - `--signing-kid gen1-2020-02-27` a signature key id, otherwise the jwks key has no name, which might cause problems with clients. a random key is ok, but it should change when the actual signing key changes. @@ -203,7 +203,7 @@ $ curl https://192.168.1.100:9130/.well-known/openid-configuration 2. Check if the login works at https://192.168.1.100:9130/signin/v1/identifier -> Note: If you later get a `Unable to find a key for (algorithm, kid):PS256, )` Error make sure you did set a `--signing-kid` when starting `ocis-konnectd` by checking it is present in https://192.168.1.100:9130/konnect/v1/jwks.json +> Note: If you later get a `Unable to find a key for (algorithm, kid):PS256, )` Error make sure you did set a `--signing-kid` when starting `ocis-idp` by checking it is present in https://192.168.1.100:9130/konnect/v1/jwks.json ### Patch owncloud @@ -241,7 +241,7 @@ $CONFIG = [ ``` In the above configuration replace -- `provider-url` with the URL to your `ocis-konnectd` issuer +- `provider-url` with the URL to your `ocis-idp` issuer - `https://cloud.example.com` with the URL to your ownCloud 10 instance - `http://localhost:9100` with the URL to your ownCloud Web instance @@ -251,4 +251,4 @@ In the above configuration replace Aside from the above todos these are the next steps - tie it all together behind `ocis-proxy` -- create an `ocis bridge` command that runs all the ocis services in one step with a properly preconfigured `ocis-konnectd` `identifier-registration.yaml` file for `ownCloud Web` and the owncloud 10 `openidconnect` app, as well as a randomized `--signing-kid`. +- create an `ocis bridge` command that runs all the ocis services in one step with a properly preconfigured `ocis-idp` `identifier-registration.yaml` file for `ownCloud Web` and the owncloud 10 `openidconnect` app, as well as a randomized `--signing-kid`. diff --git a/docs/ocis/deployment/ocis_keycloak.md b/docs/ocis/deployment/ocis_keycloak.md index 34452b7ca..30061fb8b 100644 --- a/docs/ocis/deployment/ocis_keycloak.md +++ b/docs/ocis/deployment/ocis_keycloak.md @@ -19,7 +19,7 @@ geekdocFilePath: ocis_keycloak.md The docker stack consists 4 containers. One of them is Traefik, a proxy which is terminating ssl and forwards the requests to oCIS in the internal docker network. -Keykloak add two containers: Keycloak itself and a PostgreSQL as database. Keycloak will be configured as oCIS' IDP instead of the internal IDP [Konnectd]({{< ref "../../extensions/konnectd/_index.md" >}}) +Keykloak add two containers: Keycloak itself and a PostgreSQL as database. Keycloak will be configured as oCIS' IDP instead of the internal IDP [Konnectd]({{< ref "../../extensions/idp/_index.md" >}}) The other container is oCIS itself running all extensions in one container. In this example oCIS uses [oCIS storage driver]({{< ref "../../extensions/storage/storages.md#storage-drivers" >}}) diff --git a/docs/ocis/deployment/ocis_traefik.md b/docs/ocis/deployment/ocis_traefik.md index 099eb5eb4..0e96a35ff 100644 --- a/docs/ocis/deployment/ocis_traefik.md +++ b/docs/ocis/deployment/ocis_traefik.md @@ -18,7 +18,7 @@ geekdocFilePath: ocis_traefik.md The docker stack consists of two containers. One of them is Traefik, a proxy which is terminating ssl and forwards the requests to oCIS in the internal docker network. -The other one is oCIS itself running all extensions in one container. In this example oCIS uses its internal IDP [Konnectd]({{< ref "../../extensions/konnectd/_index.md" >}}) and the [oCIS storage driver]({{< ref "../../extensions/storage/storages.md#storage-drivers" >}}) +The other one is oCIS itself running all extensions in one container. In this example oCIS uses its internal IDP [Konnectd]({{< ref "../../extensions/idp/_index.md" >}}) and the [oCIS storage driver]({{< ref "../../extensions/storage/storages.md#storage-drivers" >}}) ## Server Deployment diff --git a/docs/ocis/development/debugging.md b/docs/ocis/development/debugging.md index a76bb3276..d213e7529 100644 --- a/docs/ocis/development/debugging.md +++ b/docs/ocis/development/debugging.md @@ -39,7 +39,7 @@ Run the debug binary with `OCIS_LOG_LEVEL=debug bin/ocis-debug server` and then 12920 pts/1 Sl 0:00 bin/ocis-debug reva-users 12929 pts/1 Sl 0:00 bin/ocis-debug glauth 12940 pts/1 Sl 0:00 bin/ocis-debug reva-storage-home-data -12948 pts/1 Sl 0:00 bin/ocis-debug konnectd +12948 pts/1 Sl 0:00 bin/ocis-debug idp 12952 pts/1 Sl 0:00 bin/ocis-debug proxy 12961 pts/1 Sl 0:00 bin/ocis-debug thumbnails 12971 pts/1 Sl 0:00 bin/ocis-debug reva-storage-oc @@ -81,7 +81,7 @@ bin/ocis --log-level=$LOG_LEVEL glauth & bin/ocis --log-level=$LOG_LEVEL graph-explorer & bin/ocis --log-level=$LOG_LEVEL graph & #bin/ocis --log-level=$LOG_LEVEL hello & -bin/ocis --log-level=$LOG_LEVEL konnectd & +bin/ocis --log-level=$LOG_LEVEL idp & #bin/ocis --log-level=$LOG_LEVEL ocs & bin/ocis --log-level=$LOG_LEVEL web & bin/ocis --log-level=$LOG_LEVEL reva-auth-basic & @@ -118,7 +118,7 @@ bin/ocis --log-level=$LOG_LEVEL proxy & 12920 pts/1 Sl 0:00 bin/ocis-debug reva-users 12929 pts/1 Sl 0:00 bin/ocis-debug glauth 12940 pts/1 Sl 0:00 bin/ocis-debug reva-storage-home-data -12948 pts/1 Sl 0:00 bin/ocis-debug konnectd +12948 pts/1 Sl 0:00 bin/ocis-debug idp 12952 pts/1 Sl 0:00 bin/ocis-debug proxy 12961 pts/1 Sl 0:00 bin/ocis-debug thumbnails 12971 pts/1 Sl 0:00 bin/ocis-debug reva-storage-oc diff --git a/docs/ocis/flow-docs/login-flow.md b/docs/ocis/flow-docs/login-flow.md index 81f471d6c..9a3babd3f 100644 --- a/docs/ocis/flow-docs/login-flow.md +++ b/docs/ocis/flow-docs/login-flow.md @@ -44,7 +44,7 @@ sequenceDiagram Note over client, idp: GET /authorize?
response_type=code
&scope=openid%20profile%20email
&client_id=s6BhdRkqt3
&state=af0ifjsldkj
&redirect_uri=https%3A%2F%2Fclient.example.org%2Fcb HTTP/1.1
Host: server.example.com Note over user, idp: 3. Authorization Server Authenticates the End-User. Note over idp,ldap: Either an IdP already exists or a new one is introduced. Since we are not yet using oidc discovery we can only use one IdP. - alt all users managed by konnectd/ocis + alt all users managed by idp/ocis idp->>+glauth: LDAP query/bind glauth->>+graph: GET user with Basic Auth
GraphAPI graph->>+accounts: internal GRPC diff --git a/docs/ocis/flow-docs/request-flow.md b/docs/ocis/flow-docs/request-flow.md index b74fac66e..36ca43dcb 100644 --- a/docs/ocis/flow-docs/request-flow.md +++ b/docs/ocis/flow-docs/request-flow.md @@ -28,7 +28,7 @@ sequenceDiagram Note over client,proxy: What is in a bearer token?
The spec recommends opaque tokens.
Treat it as random byte noise. Note over client,proxy: the proxy MUST authenticate users
using ocis-accounts because it needs
to decide where to send the request %% Mention introspection endpoint for opaque tokens - %% konnectd uses jwt, so we can save a request + %% idp uses jwt, so we can save a request %% either way the token can be used to look up the sub and iss of the user %% or is token check enough? diff --git a/glauth/go.sum b/glauth/go.sum index a1d05c26b..0804382fb 100644 --- a/glauth/go.sum +++ b/glauth/go.sum @@ -224,6 +224,8 @@ github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e h1:khITGSnfDXtByQsLe github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac= +github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/konnectd/.dockerignore b/idp/.dockerignore similarity index 100% rename from konnectd/.dockerignore rename to idp/.dockerignore diff --git a/konnectd/.env b/idp/.env similarity index 100% rename from konnectd/.env rename to idp/.env diff --git a/konnectd/.eslintignore b/idp/.eslintignore similarity index 100% rename from konnectd/.eslintignore rename to idp/.eslintignore diff --git a/konnectd/.eslintrc.json b/idp/.eslintrc.json similarity index 100% rename from konnectd/.eslintrc.json rename to idp/.eslintrc.json diff --git a/konnectd/LICENSE b/idp/LICENSE similarity index 100% rename from konnectd/LICENSE rename to idp/LICENSE diff --git a/konnectd/Makefile b/idp/Makefile similarity index 99% rename from konnectd/Makefile rename to idp/Makefile index 535036368..9f809ca1e 100644 --- a/konnectd/Makefile +++ b/idp/Makefile @@ -1,5 +1,5 @@ SHELL := bash -NAME := konnectd +NAME := idp IMPORT := github.com/owncloud/ocis/$(NAME) BIN := bin DIST := dist diff --git a/konnectd/cmd/konnectd/main.go b/idp/cmd/konnectd/main.go similarity index 68% rename from konnectd/cmd/konnectd/main.go rename to idp/cmd/konnectd/main.go index 2aed1b86c..deeb7ea4d 100644 --- a/konnectd/cmd/konnectd/main.go +++ b/idp/cmd/konnectd/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/ocis/konnectd/pkg/command" + "github.com/owncloud/ocis/idp/pkg/command" ) func main() { diff --git a/konnectd/config/example.json b/idp/config/example.json similarity index 92% rename from konnectd/config/example.json rename to idp/config/example.json index f1bd1d5e0..e70627df4 100644 --- a/konnectd/config/example.json +++ b/idp/config/example.json @@ -15,6 +15,6 @@ "type": "jaeger", "endpoint": "localhost:6831", "collector": "http://localhost:14268/api/traces", - "service": "konnectd" + "service": "idp" } } diff --git a/konnectd/config/example.yml b/idp/config/example.yml similarity index 92% rename from konnectd/config/example.yml rename to idp/config/example.yml index 8fa4a823b..c1a0c74a9 100644 --- a/konnectd/config/example.yml +++ b/idp/config/example.yml @@ -14,6 +14,6 @@ tracing: type: jaeger endpoint: localhost:6831 collector: http://localhost:14268/api/traces - service: konnectd + service: idp ... diff --git a/konnectd/config/identifier-registration.yaml b/idp/config/identifier-registration.yaml similarity index 100% rename from konnectd/config/identifier-registration.yaml rename to idp/config/identifier-registration.yaml diff --git a/konnectd/docker/Dockerfile.linux.amd64 b/idp/docker/Dockerfile.linux.amd64 similarity index 82% rename from konnectd/docker/Dockerfile.linux.amd64 rename to idp/docker/Dockerfile.linux.amd64 index f6e9d3b18..7c4550cf4 100644 --- a/konnectd/docker/Dockerfile.linux.amd64 +++ b/idp/docker/Dockerfile.linux.amd64 @@ -13,7 +13,7 @@ LABEL maintainer="ownCloud GmbH " \ EXPOSE 9130 9134 -ENTRYPOINT ["/usr/bin/ocis-konnectd"] +ENTRYPOINT ["/usr/bin/ocis-idp"] CMD ["server"] -COPY bin/ocis-konnectd /usr/bin/ocis-konnectd +COPY bin/ocis-idp /usr/bin/ocis-idp diff --git a/konnectd/docker/Dockerfile.linux.arm b/idp/docker/Dockerfile.linux.arm similarity index 82% rename from konnectd/docker/Dockerfile.linux.arm rename to idp/docker/Dockerfile.linux.arm index b8b0020fb..c507dbe31 100644 --- a/konnectd/docker/Dockerfile.linux.arm +++ b/idp/docker/Dockerfile.linux.arm @@ -13,7 +13,7 @@ LABEL maintainer="ownCloud GmbH " \ EXPOSE 9130 9134 -ENTRYPOINT ["/usr/bin/ocis-konnectd"] +ENTRYPOINT ["/usr/bin/ocis-idp"] CMD ["server"] -COPY bin/ocis-konnectd /usr/bin/ocis-konnectd +COPY bin/ocis-idp /usr/bin/ocis-idp diff --git a/konnectd/docker/Dockerfile.linux.arm64 b/idp/docker/Dockerfile.linux.arm64 similarity index 82% rename from konnectd/docker/Dockerfile.linux.arm64 rename to idp/docker/Dockerfile.linux.arm64 index a1db7a18c..46a043817 100644 --- a/konnectd/docker/Dockerfile.linux.arm64 +++ b/idp/docker/Dockerfile.linux.arm64 @@ -13,7 +13,7 @@ LABEL maintainer="ownCloud GmbH " \ EXPOSE 9130 9134 -ENTRYPOINT ["/usr/bin/ocis-konnectd"] +ENTRYPOINT ["/usr/bin/ocis-idp"] CMD ["server"] -COPY bin/ocis-konnectd /usr/bin/ocis-konnectd +COPY bin/ocis-idp /usr/bin/ocis-idp diff --git a/idp/docker/manifest.tmpl b/idp/docker/manifest.tmpl new file mode 100644 index 000000000..6367d18ad --- /dev/null +++ b/idp/docker/manifest.tmpl @@ -0,0 +1,22 @@ +image: owncloud/ocis-idp:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +{{#if build.tags}} +tags: +{{#each build.tags}} + - {{this}} +{{/each}} +{{/if}} +manifests: + - image: owncloud/ocis-idp:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + platform: + architecture: amd64 + os: linux + - image: owncloud/ocis-idp:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 + platform: + architecture: arm64 + variant: v8 + os: linux + - image: owncloud/ocis-idp:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm + platform: + architecture: arm + variant: v6 + os: linux diff --git a/konnectd/go.mod b/idp/go.mod similarity index 96% rename from konnectd/go.mod rename to idp/go.mod index d53fc5817..e9b3260b2 100644 --- a/konnectd/go.mod +++ b/idp/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis/konnectd +module github.com/owncloud/ocis/idp go 1.15 diff --git a/konnectd/go.sum b/idp/go.sum similarity index 100% rename from konnectd/go.sum rename to idp/go.sum diff --git a/konnectd/package.json b/idp/package.json similarity index 100% rename from konnectd/package.json rename to idp/package.json diff --git a/konnectd/pkg/assets/assets.go b/idp/pkg/assets/assets.go similarity index 95% rename from konnectd/pkg/assets/assets.go rename to idp/pkg/assets/assets.go index d9e070cd7..9e6884434 100644 --- a/konnectd/pkg/assets/assets.go +++ b/idp/pkg/assets/assets.go @@ -5,7 +5,7 @@ import ( "os" "path" - "github.com/owncloud/ocis/konnectd/pkg/config" + "github.com/owncloud/ocis/idp/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" ) diff --git a/konnectd/pkg/assets/dummy.go b/idp/pkg/assets/dummy.go similarity index 100% rename from konnectd/pkg/assets/dummy.go rename to idp/pkg/assets/dummy.go diff --git a/konnectd/pkg/assets/embed.go b/idp/pkg/assets/embed.go similarity index 100% rename from konnectd/pkg/assets/embed.go rename to idp/pkg/assets/embed.go diff --git a/konnectd/pkg/assets/embed.yml b/idp/pkg/assets/embed.yml similarity index 100% rename from konnectd/pkg/assets/embed.yml rename to idp/pkg/assets/embed.yml diff --git a/konnectd/pkg/assets/option.go b/idp/pkg/assets/option.go similarity index 93% rename from konnectd/pkg/assets/option.go rename to idp/pkg/assets/option.go index 218f46884..54f1eebf5 100644 --- a/konnectd/pkg/assets/option.go +++ b/idp/pkg/assets/option.go @@ -1,7 +1,7 @@ package assets import ( - "github.com/owncloud/ocis/konnectd/pkg/config" + "github.com/owncloud/ocis/idp/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" ) diff --git a/konnectd/pkg/command/health.go b/idp/pkg/command/health.go similarity index 89% rename from konnectd/pkg/command/health.go rename to idp/pkg/command/health.go index dd651282c..ab38e1310 100644 --- a/konnectd/pkg/command/health.go +++ b/idp/pkg/command/health.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/micro/cli/v2" - "github.com/owncloud/ocis/konnectd/pkg/config" - "github.com/owncloud/ocis/konnectd/pkg/flagset" + "github.com/owncloud/ocis/idp/pkg/config" + "github.com/owncloud/ocis/idp/pkg/flagset" ) // Health is the entrypoint for the health command. diff --git a/konnectd/pkg/command/root.go b/idp/pkg/command/root.go similarity index 83% rename from konnectd/pkg/command/root.go rename to idp/pkg/command/root.go index d57dd8f47..aa365be4f 100644 --- a/konnectd/pkg/command/root.go +++ b/idp/pkg/command/root.go @@ -5,21 +5,21 @@ import ( "strings" "github.com/micro/cli/v2" - "github.com/owncloud/ocis/konnectd/pkg/config" - "github.com/owncloud/ocis/konnectd/pkg/flagset" - "github.com/owncloud/ocis/konnectd/pkg/version" + "github.com/owncloud/ocis/idp/pkg/config" + "github.com/owncloud/ocis/idp/pkg/flagset" + "github.com/owncloud/ocis/idp/pkg/version" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/spf13/viper" ) -// Execute is the entry point for the ocis-konnectd command. +// Execute is the entry point for the ocis-idp command. func Execute() error { cfg := config.New() app := &cli.App{ - Name: "ocis-konnectd", + Name: "ocis-idp", Version: version.String, - Usage: "Serve Konnectd API for oCIS", + Usage: "Serve IDP API for oCIS", Compiled: version.Compiled(), Authors: []*cli.Author{ @@ -59,7 +59,7 @@ func Execute() error { // NewLogger initializes a service-specific logger instance. func NewLogger(cfg *config.Config) log.Logger { return log.NewLogger( - log.Name("konnectd"), + log.Name("idp"), log.Level(cfg.Log.Level), log.Pretty(cfg.Log.Pretty), log.Color(cfg.Log.Color), @@ -71,13 +71,13 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error { logger := NewLogger(cfg) viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) - viper.SetEnvPrefix("KONNECTD") + viper.SetEnvPrefix("IDP") viper.AutomaticEnv() if c.IsSet("config-file") { viper.SetConfigFile(c.String("config-file")) } else { - viper.SetConfigName("konnectd") + viper.SetConfigName("idp") viper.AddConfigPath("/etc/ocis") viper.AddConfigPath("$HOME/.ocis") diff --git a/konnectd/pkg/command/server.go b/idp/pkg/command/server.go similarity index 91% rename from konnectd/pkg/command/server.go rename to idp/pkg/command/server.go index a414f16df..bd07bfbdf 100644 --- a/konnectd/pkg/command/server.go +++ b/idp/pkg/command/server.go @@ -14,11 +14,11 @@ import ( "github.com/oklog/run" openzipkin "github.com/openzipkin/zipkin-go" zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" - "github.com/owncloud/ocis/konnectd/pkg/config" - "github.com/owncloud/ocis/konnectd/pkg/flagset" - "github.com/owncloud/ocis/konnectd/pkg/metrics" - "github.com/owncloud/ocis/konnectd/pkg/server/debug" - "github.com/owncloud/ocis/konnectd/pkg/server/http" + "github.com/owncloud/ocis/idp/pkg/config" + "github.com/owncloud/ocis/idp/pkg/flagset" + "github.com/owncloud/ocis/idp/pkg/metrics" + "github.com/owncloud/ocis/idp/pkg/server/debug" + "github.com/owncloud/ocis/idp/pkg/server/http" "go.opencensus.io/stats/view" "go.opencensus.io/trace" ) @@ -38,15 +38,15 @@ func Server(cfg *config.Config) *cli.Command { // StringSliceFlag doesn't support Destination // UPDATE Destination on string flags supported. Wait for https://github.com/urfave/cli/pull/1078 to get to micro/cli if len(c.StringSlice("trusted-proxy")) > 0 { - cfg.Konnectd.TrustedProxy = c.StringSlice("trusted-proxy") + cfg.IDP.TrustedProxy = c.StringSlice("trusted-proxy") } if len(c.StringSlice("allow-scope")) > 0 { - cfg.Konnectd.AllowScope = c.StringSlice("allow-scope") + cfg.IDP.AllowScope = c.StringSlice("allow-scope") } if len(c.StringSlice("signing-private-key")) > 0 { - cfg.Konnectd.SigningPrivateKeyFiles = c.StringSlice("signing-private-key") + cfg.IDP.SigningPrivateKeyFiles = c.StringSlice("signing-private-key") } return ParseConfig(c, cfg) diff --git a/konnectd/pkg/command/version.go b/idp/pkg/command/version.go similarity index 76% rename from konnectd/pkg/command/version.go rename to idp/pkg/command/version.go index 72f6d4227..5be8ea3d4 100644 --- a/konnectd/pkg/command/version.go +++ b/idp/pkg/command/version.go @@ -8,8 +8,8 @@ import ( "github.com/micro/cli/v2" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/konnectd/pkg/config" - "github.com/owncloud/ocis/konnectd/pkg/flagset" + "github.com/owncloud/ocis/idp/pkg/config" + "github.com/owncloud/ocis/idp/pkg/flagset" ) // PrintVersion prints the service versions of all running instances. @@ -17,17 +17,17 @@ func PrintVersion(cfg *config.Config) *cli.Command { return &cli.Command{ Name: "version", Usage: "Print the versions of the running instances", - Flags: flagset.ListKonnectdWithConfig(cfg), + Flags: flagset.ListIDPWithConfig(cfg), Action: func(c *cli.Context) error { reg := *registry.GetRegistry() services, err := reg.GetService(cfg.Service.Namespace + "." + cfg.Service.Name) if err != nil { - fmt.Println(fmt.Errorf("could not get konnectd services from the registry: %v", err)) + fmt.Println(fmt.Errorf("could not get idp services from the registry: %v", err)) return err } if len(services) == 0 { - fmt.Println("No running konnectd service found.") + fmt.Println("No running idp service found.") return nil } diff --git a/konnectd/pkg/config/config.go b/idp/pkg/config/config.go similarity index 97% rename from konnectd/pkg/config/config.go rename to idp/pkg/config/config.go index e3b1e670a..617fda130 100644 --- a/konnectd/pkg/config/config.go +++ b/idp/pkg/config/config.go @@ -57,7 +57,7 @@ type Config struct { HTTP HTTP Tracing Tracing Asset Asset - Konnectd bootstrap.Config + IDP bootstrap.Config Service Service } diff --git a/konnectd/pkg/crypto/gencert.go b/idp/pkg/crypto/gencert.go similarity index 100% rename from konnectd/pkg/crypto/gencert.go rename to idp/pkg/crypto/gencert.go diff --git a/konnectd/pkg/flagset/flagset.go b/idp/pkg/flagset/flagset.go similarity index 66% rename from konnectd/pkg/flagset/flagset.go rename to idp/pkg/flagset/flagset.go index af76c5431..ed348e2c0 100644 --- a/konnectd/pkg/flagset/flagset.go +++ b/idp/pkg/flagset/flagset.go @@ -2,7 +2,7 @@ package flagset import ( "github.com/micro/cli/v2" - "github.com/owncloud/ocis/konnectd/pkg/config" + "github.com/owncloud/ocis/idp/pkg/config" ) // RootWithConfig applies cfg to the root flagset @@ -12,21 +12,21 @@ func RootWithConfig(cfg *config.Config) []cli.Flag { Name: "log-level", Value: "info", Usage: "Set logging level", - EnvVars: []string{"KONNECTD_LOG_LEVEL"}, + EnvVars: []string{"IDP_LOG_LEVEL"}, Destination: &cfg.Log.Level, }, &cli.BoolFlag{ Value: true, Name: "log-pretty", Usage: "Enable pretty logging", - EnvVars: []string{"KONNECTD_LOG_PRETTY"}, + EnvVars: []string{"IDP_LOG_PRETTY"}, Destination: &cfg.Log.Pretty, }, &cli.BoolFlag{ Value: true, Name: "log-color", Usage: "Enable colored logging", - EnvVars: []string{"KONNECTD_LOG_COLOR"}, + EnvVars: []string{"IDP_LOG_COLOR"}, Destination: &cfg.Log.Color, }, } @@ -39,7 +39,7 @@ func HealthWithConfig(cfg *config.Config) []cli.Flag { Name: "debug-addr", Value: "0.0.0.0:9134", Usage: "Address to debug endpoint", - EnvVars: []string{"KONNECTD_DEBUG_ADDR"}, + EnvVars: []string{"IDP_DEBUG_ADDR"}, Destination: &cfg.Debug.Addr, }, } @@ -52,305 +52,305 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { Name: "config-file", Value: "", Usage: "Path to config file", - EnvVars: []string{"KONNECTD_CONFIG_FILE"}, + EnvVars: []string{"IDP_CONFIG_FILE"}, Destination: &cfg.File, }, &cli.BoolFlag{ Name: "tracing-enabled", Usage: "Enable sending traces", - EnvVars: []string{"KONNECTD_TRACING_ENABLED"}, + EnvVars: []string{"IDP_TRACING_ENABLED"}, Destination: &cfg.Tracing.Enabled, }, &cli.StringFlag{ Name: "tracing-type", Value: "jaeger", Usage: "Tracing backend type", - EnvVars: []string{"KONNECTD_TRACING_TYPE"}, + EnvVars: []string{"IDP_TRACING_TYPE"}, Destination: &cfg.Tracing.Type, }, &cli.StringFlag{ Name: "tracing-endpoint", Value: "", Usage: "Endpoint for the agent", - EnvVars: []string{"KONNECTD_TRACING_ENDPOINT"}, + EnvVars: []string{"IDP_TRACING_ENDPOINT"}, Destination: &cfg.Tracing.Endpoint, }, &cli.StringFlag{ Name: "tracing-collector", Value: "", Usage: "Endpoint for the collector", - EnvVars: []string{"KONNECTD_TRACING_COLLECTOR"}, + EnvVars: []string{"IDP_TRACING_COLLECTOR"}, Destination: &cfg.Tracing.Collector, }, &cli.StringFlag{ Name: "tracing-service", - Value: "konnectd", + Value: "idp", Usage: "Service name for tracing", - EnvVars: []string{"KONNECTD_TRACING_SERVICE"}, + EnvVars: []string{"IDP_TRACING_SERVICE"}, Destination: &cfg.Tracing.Service, }, &cli.StringFlag{ Name: "debug-addr", Value: "0.0.0.0:9134", Usage: "Address to bind debug server", - EnvVars: []string{"KONNECTD_DEBUG_ADDR"}, + EnvVars: []string{"IDP_DEBUG_ADDR"}, Destination: &cfg.Debug.Addr, }, &cli.StringFlag{ Name: "debug-token", Value: "", Usage: "Token to grant metrics access", - EnvVars: []string{"KONNECTD_DEBUG_TOKEN"}, + EnvVars: []string{"IDP_DEBUG_TOKEN"}, Destination: &cfg.Debug.Token, }, &cli.BoolFlag{ Name: "debug-pprof", Usage: "Enable pprof debugging", - EnvVars: []string{"KONNECTD_DEBUG_PPROF"}, + EnvVars: []string{"IDP_DEBUG_PPROF"}, Destination: &cfg.Debug.Pprof, }, &cli.BoolFlag{ Name: "debug-zpages", Usage: "Enable zpages debugging", - EnvVars: []string{"KONNECTD_DEBUG_ZPAGES"}, + EnvVars: []string{"IDP_DEBUG_ZPAGES"}, Destination: &cfg.Debug.Zpages, }, &cli.StringFlag{ Name: "http-addr", Value: "0.0.0.0:9130", Usage: "Address to bind http server", - EnvVars: []string{"KONNECTD_HTTP_ADDR"}, + EnvVars: []string{"IDP_HTTP_ADDR"}, Destination: &cfg.HTTP.Addr, }, &cli.StringFlag{ Name: "http-root", Value: "/", Usage: "Root path of http server", - EnvVars: []string{"KONNECTD_HTTP_ROOT"}, + EnvVars: []string{"IDP_HTTP_ROOT"}, Destination: &cfg.HTTP.Root, }, &cli.StringFlag{ Name: "http-namespace", Value: "com.owncloud.web", Usage: "Set the base namespace for service discovery", - EnvVars: []string{"KONNECTD_HTTP_NAMESPACE"}, + EnvVars: []string{"IDP_HTTP_NAMESPACE"}, Destination: &cfg.Service.Namespace, }, &cli.StringFlag{ Name: "name", - Value: "konnectd", + Value: "idp", Usage: "Service name", - EnvVars: []string{"KONNECTD_NAME"}, + EnvVars: []string{"IDP_NAME"}, Destination: &cfg.Service.Name, }, &cli.StringFlag{ Name: "identity-manager", Value: "ldap", Usage: "Identity manager (one of ldap,kc,cookie,dummy)", - EnvVars: []string{"KONNECTD_IDENTITY_MANAGER"}, - Destination: &cfg.Konnectd.IdentityManager, + EnvVars: []string{"IDP_IDENTITY_MANAGER"}, + Destination: &cfg.IDP.IdentityManager, }, &cli.StringFlag{ Name: "transport-tls-cert", Value: "", Usage: "Certificate file for transport encryption", - EnvVars: []string{"KONNECTD_TRANSPORT_TLS_CERT"}, + EnvVars: []string{"IDP_TRANSPORT_TLS_CERT"}, Destination: &cfg.HTTP.TLSCert, }, &cli.StringFlag{ Name: "transport-tls-key", Value: "", Usage: "Secret file for transport encryption", - EnvVars: []string{"KONNECTD_TRANSPORT_TLS_KEY"}, + EnvVars: []string{"IDP_TRANSPORT_TLS_KEY"}, Destination: &cfg.HTTP.TLSKey, }, &cli.StringFlag{ Name: "iss", Usage: "OIDC issuer URL", - EnvVars: []string{"KONNECTD_ISS", "OCIS_URL"}, // KONNECTD_ISS takes precedence over OCIS_URL + EnvVars: []string{"IDP_ISS", "OCIS_URL"}, // IDP_ISS takes precedence over OCIS_URL Value: "https://localhost:9200", - Destination: &cfg.Konnectd.Iss, + Destination: &cfg.IDP.Iss, }, &cli.StringSliceFlag{ Name: "signing-private-key", Usage: "Full path to PEM encoded private key file (must match the --signing-method algorithm)", - EnvVars: []string{"KONNECTD_SIGNING_PRIVATE_KEY"}, + EnvVars: []string{"IDP_SIGNING_PRIVATE_KEY"}, Value: nil, }, &cli.StringFlag{ Name: "signing-kid", Usage: "Value of kid field to use in created tokens (uniquely identifying the signing-private-key)", - EnvVars: []string{"KONNECTD_SIGNING_KID"}, + EnvVars: []string{"IDP_SIGNING_KID"}, Value: "", - Destination: &cfg.Konnectd.SigningKid, + Destination: &cfg.IDP.SigningKid, }, &cli.StringFlag{ Name: "validation-keys-path", Usage: "Full path to a folder containg PEM encoded private or public key files used for token validaton (file name without extension is used as kid)", - EnvVars: []string{"KONNECTD_VALIDATION_KEYS_PATH"}, + EnvVars: []string{"IDP_VALIDATION_KEYS_PATH"}, Value: "", - Destination: &cfg.Konnectd.ValidationKeysPath, + Destination: &cfg.IDP.ValidationKeysPath, }, &cli.StringFlag{ Name: "encryption-secret", Usage: "Full path to a file containing a %d bytes secret key", - EnvVars: []string{"KONNECTD_ENCRYPTION_SECRET"}, + EnvVars: []string{"IDP_ENCRYPTION_SECRET"}, Value: "", - Destination: &cfg.Konnectd.EncryptionSecretFile, + Destination: &cfg.IDP.EncryptionSecretFile, }, &cli.StringFlag{ Name: "signing-method", Usage: "JWT default signing method", - EnvVars: []string{"KONNECTD_SIGNING_METHOD"}, + EnvVars: []string{"IDP_SIGNING_METHOD"}, Value: "PS256", - Destination: &cfg.Konnectd.SigningMethod, + Destination: &cfg.IDP.SigningMethod, }, &cli.StringFlag{ Name: "uri-base-path", Usage: "Custom base path for URI endpoints", - EnvVars: []string{"KONNECTD_URI_BASE_PATH"}, + EnvVars: []string{"IDP_URI_BASE_PATH"}, Value: "", - Destination: &cfg.Konnectd.URIBasePath, + Destination: &cfg.IDP.URIBasePath, }, &cli.StringFlag{ Name: "sign-in-uri", Usage: "Custom redirection URI to sign-in form", - EnvVars: []string{"KONNECTD_SIGN_IN_URI"}, + EnvVars: []string{"IDP_SIGN_IN_URI"}, Value: "", - Destination: &cfg.Konnectd.SignInURI, + Destination: &cfg.IDP.SignInURI, }, &cli.StringFlag{ Name: "signed-out-uri", Usage: "Custom redirection URI to signed-out goodbye page", - EnvVars: []string{"KONNECTD_SIGN_OUT_URI"}, + EnvVars: []string{"IDP_SIGN_OUT_URI"}, Value: "", - Destination: &cfg.Konnectd.SignedOutURI, + Destination: &cfg.IDP.SignedOutURI, }, &cli.StringFlag{ Name: "authorization-endpoint-uri", Usage: "Custom authorization endpoint URI", - EnvVars: []string{"KONNECTD_ENDPOINT_URI"}, + EnvVars: []string{"IDP_ENDPOINT_URI"}, Value: "", - Destination: &cfg.Konnectd.AuthorizationEndpointURI, + Destination: &cfg.IDP.AuthorizationEndpointURI, }, &cli.StringFlag{ Name: "endsession-endpoint-uri", Usage: "Custom endsession endpoint URI", - EnvVars: []string{"KONNECTD_ENDSESSION_ENDPOINT_URI"}, + EnvVars: []string{"IDP_ENDSESSION_ENDPOINT_URI"}, Value: "", - Destination: &cfg.Konnectd.EndsessionEndpointURI, + Destination: &cfg.IDP.EndsessionEndpointURI, }, &cli.StringFlag{ Name: "asset-path", Value: "", Usage: "Path to custom assets", - EnvVars: []string{"KONNECTD_ASSET_PATH"}, + EnvVars: []string{"IDP_ASSET_PATH"}, Destination: &cfg.Asset.Path, }, &cli.StringFlag{ Name: "identifier-client-path", Usage: "Path to the identifier web client base folder", - EnvVars: []string{"KONNECTD_IDENTIFIER_CLIENT_PATH"}, - Value: "/var/tmp/ocis/konnectd", - Destination: &cfg.Konnectd.IdentifierClientPath, + EnvVars: []string{"IDP_IDENTIFIER_CLIENT_PATH"}, + Value: "/var/tmp/ocis/idp", + Destination: &cfg.IDP.IdentifierClientPath, }, &cli.StringFlag{ Name: "identifier-registration-conf", Usage: "Path to a identifier-registration.yaml configuration file", - EnvVars: []string{"KONNECTD_IDENTIFIER_REGISTRATION_CONF"}, + EnvVars: []string{"IDP_IDENTIFIER_REGISTRATION_CONF"}, Value: "./config/identifier-registration.yaml", - Destination: &cfg.Konnectd.IdentifierRegistrationConf, + Destination: &cfg.IDP.IdentifierRegistrationConf, }, &cli.StringFlag{ Name: "identifier-scopes-conf", Usage: "Path to a scopes.yaml configuration file", - EnvVars: []string{"KONNECTD_IDENTIFIER_SCOPES_CONF"}, + EnvVars: []string{"IDP_IDENTIFIER_SCOPES_CONF"}, Value: "", - Destination: &cfg.Konnectd.IdentifierScopesConf, + Destination: &cfg.IDP.IdentifierScopesConf, }, &cli.BoolFlag{ Name: "insecure", Usage: "Disable TLS certificate and hostname validation", - EnvVars: []string{"KONNECTD_INSECURE"}, - Destination: &cfg.Konnectd.Insecure, + EnvVars: []string{"IDP_INSECURE"}, + Destination: &cfg.IDP.Insecure, }, &cli.BoolFlag{ Name: "tls", - Usage: "Use TLS (disable only if konnectd is behind a TLS-terminating reverse-proxy).", - EnvVars: []string{"KONNECTD_TLS"}, + Usage: "Use TLS (disable only if idp is behind a TLS-terminating reverse-proxy).", + EnvVars: []string{"IDP_TLS"}, Value: false, Destination: &cfg.HTTP.TLS, }, &cli.StringSliceFlag{ Name: "trusted-proxy", Usage: "Trusted proxy IP or IP network (can be used multiple times)", - EnvVars: []string{"KONNECTD_TRUSTED_PROXY"}, + EnvVars: []string{"IDP_TRUSTED_PROXY"}, Value: nil, }, &cli.StringSliceFlag{ Name: "allow-scope", Usage: "Allow OAuth 2 scope (can be used multiple times, if not set default scopes are allowed)", - EnvVars: []string{"KONNECTD_ALLOW_SCOPE"}, + EnvVars: []string{"IDP_ALLOW_SCOPE"}, Value: nil, }, &cli.BoolFlag{ Name: "allow-client-guests", Usage: "Allow sign in of client controlled guest users", - EnvVars: []string{"KONNECTD_ALLOW_CLIENT_GUESTS"}, - Destination: &cfg.Konnectd.AllowClientGuests, + EnvVars: []string{"IDP_ALLOW_CLIENT_GUESTS"}, + Destination: &cfg.IDP.AllowClientGuests, }, &cli.BoolFlag{ Name: "allow-dynamic-client-registration", Usage: "Allow dynamic OAuth2 client registration", - EnvVars: []string{"KONNECTD_ALLOW_DYNAMIC_CLIENT_REGISTRATION"}, + EnvVars: []string{"IDP_ALLOW_DYNAMIC_CLIENT_REGISTRATION"}, Value: true, - Destination: &cfg.Konnectd.AllowDynamicClientRegistration, + Destination: &cfg.IDP.AllowDynamicClientRegistration, }, &cli.BoolFlag{ Name: "disable-identifier-webapp", Usage: "Disable built-in identifier-webapp to use a frontend hosted elsewhere.", - EnvVars: []string{"KONNECTD_DISABLE_IDENTIFIER_WEBAPP"}, + EnvVars: []string{"IDP_DISABLE_IDENTIFIER_WEBAPP"}, Value: true, - Destination: &cfg.Konnectd.IdentifierClientDisabled, + Destination: &cfg.IDP.IdentifierClientDisabled, }, &cli.Uint64Flag{ Name: "access-token-expiration", Usage: "Expiration time of access tokens in seconds since generated", - EnvVars: []string{"KONNECTD_ACCESS_TOKEN_EXPIRATION"}, - Destination: &cfg.Konnectd.AccessTokenDurationSeconds, + EnvVars: []string{"IDP_ACCESS_TOKEN_EXPIRATION"}, + Destination: &cfg.IDP.AccessTokenDurationSeconds, Value: 60 * 10, // 10 Minutes. }, &cli.Uint64Flag{ Name: "id-token-expiration", Usage: "Expiration time of id tokens in seconds since generated", - EnvVars: []string{"KONNECTD_ID_TOKEN_EXPIRATION"}, - Destination: &cfg.Konnectd.IDTokenDurationSeconds, + EnvVars: []string{"IDP_ID_TOKEN_EXPIRATION"}, + Destination: &cfg.IDP.IDTokenDurationSeconds, Value: 60 * 60, // 1 Hour }, &cli.Uint64Flag{ Name: "refresh-token-expiration", Usage: "Expiration time of refresh tokens in seconds since generated", - EnvVars: []string{"KONNECTD_REFRESH_TOKEN_EXPIRATION"}, - Destination: &cfg.Konnectd.RefreshTokenDurationSeconds, + EnvVars: []string{"IDP_REFRESH_TOKEN_EXPIRATION"}, + Destination: &cfg.IDP.RefreshTokenDurationSeconds, Value: 60 * 60 * 24 * 365 * 3, // 1 year }, } } -// ListKonnectdWithConfig applies the config to the list commands flags -func ListKonnectdWithConfig(cfg *config.Config) []cli.Flag { +// ListIDPWithConfig applies the config to the list commands flags +func ListIDPWithConfig(cfg *config.Config) []cli.Flag { return []cli.Flag{&cli.StringFlag{ Name: "http-namespace", Value: "com.owncloud.web", Usage: "Set the base namespace for service discovery", - EnvVars: []string{"KONNECTD_HTTP_NAMESPACE"}, + EnvVars: []string{"IDP_HTTP_NAMESPACE"}, Destination: &cfg.Service.Namespace, }, &cli.StringFlag{ Name: "name", - Value: "konnectd", + Value: "idp", Usage: "Service name", - EnvVars: []string{"KONNECTD_NAME"}, + EnvVars: []string{"IDP_NAME"}, Destination: &cfg.Service.Name, }, } diff --git a/konnectd/pkg/log/logrus_wrapper.go b/idp/pkg/log/logrus_wrapper.go similarity index 95% rename from konnectd/pkg/log/logrus_wrapper.go rename to idp/pkg/log/logrus_wrapper.go index 565b6e77d..71f29be2c 100644 --- a/konnectd/pkg/log/logrus_wrapper.go +++ b/idp/pkg/log/logrus_wrapper.go @@ -17,7 +17,7 @@ var levelMapping = levelMap{ logrus.InfoLevel: zerolog.InfoLevel, } -// LogrusWrapper around zerolog. Required because konnectd uses logrus internally. +// LogrusWrapper around zerolog. Required because idp uses logrus internally. type LogrusWrapper struct { zeroLog *zerolog.Logger levelMap levelMap diff --git a/konnectd/pkg/metrics/metrics.go b/idp/pkg/metrics/metrics.go similarity index 97% rename from konnectd/pkg/metrics/metrics.go rename to idp/pkg/metrics/metrics.go index 8c658395e..9a5f912da 100644 --- a/konnectd/pkg/metrics/metrics.go +++ b/idp/pkg/metrics/metrics.go @@ -7,7 +7,7 @@ var ( Namespace = "ocis" // Subsystem defines the subsystem for the defines metrics. - Subsystem = "konnectd" + Subsystem = "idp" ) // Metrics defines the available metrics of this service. diff --git a/konnectd/pkg/middleware/static.go b/idp/pkg/middleware/static.go similarity index 100% rename from konnectd/pkg/middleware/static.go rename to idp/pkg/middleware/static.go diff --git a/konnectd/pkg/server/debug/option.go b/idp/pkg/server/debug/option.go similarity index 95% rename from konnectd/pkg/server/debug/option.go rename to idp/pkg/server/debug/option.go index 0a9b7b739..5e0d17f8a 100644 --- a/konnectd/pkg/server/debug/option.go +++ b/idp/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/owncloud/ocis/konnectd/pkg/config" + "github.com/owncloud/ocis/idp/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" ) diff --git a/konnectd/pkg/server/debug/server.go b/idp/pkg/server/debug/server.go similarity index 96% rename from konnectd/pkg/server/debug/server.go rename to idp/pkg/server/debug/server.go index d88639978..13ab7b9f2 100644 --- a/konnectd/pkg/server/debug/server.go +++ b/idp/pkg/server/debug/server.go @@ -4,7 +4,7 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/konnectd/pkg/config" + "github.com/owncloud/ocis/idp/pkg/config" "github.com/owncloud/ocis/ocis-pkg/service/debug" ) diff --git a/konnectd/pkg/server/http/option.go b/idp/pkg/server/http/option.go similarity index 93% rename from konnectd/pkg/server/http/option.go rename to idp/pkg/server/http/option.go index 4c0cfc84b..3fed9712d 100644 --- a/konnectd/pkg/server/http/option.go +++ b/idp/pkg/server/http/option.go @@ -4,8 +4,8 @@ import ( "context" "github.com/micro/cli/v2" - "github.com/owncloud/ocis/konnectd/pkg/config" - "github.com/owncloud/ocis/konnectd/pkg/metrics" + "github.com/owncloud/ocis/idp/pkg/config" + "github.com/owncloud/ocis/idp/pkg/metrics" "github.com/owncloud/ocis/ocis-pkg/log" ) diff --git a/konnectd/pkg/server/http/server.go b/idp/pkg/server/http/server.go similarity index 95% rename from konnectd/pkg/server/http/server.go rename to idp/pkg/server/http/server.go index bd6f081f5..ab6e79518 100644 --- a/konnectd/pkg/server/http/server.go +++ b/idp/pkg/server/http/server.go @@ -4,8 +4,8 @@ import ( "crypto/tls" "os" - "github.com/owncloud/ocis/konnectd/pkg/crypto" - svc "github.com/owncloud/ocis/konnectd/pkg/service/v0" + "github.com/owncloud/ocis/idp/pkg/crypto" + svc "github.com/owncloud/ocis/idp/pkg/service/v0" "github.com/owncloud/ocis/ocis-pkg/middleware" "github.com/owncloud/ocis/ocis-pkg/service/http" ) diff --git a/konnectd/pkg/service/v0/instrument.go b/idp/pkg/service/v0/instrument.go similarity index 92% rename from konnectd/pkg/service/v0/instrument.go rename to idp/pkg/service/v0/instrument.go index 4abb29d34..9d5ad7322 100644 --- a/konnectd/pkg/service/v0/instrument.go +++ b/idp/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/konnectd/pkg/metrics" + "github.com/owncloud/ocis/idp/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/konnectd/pkg/service/v0/logging.go b/idp/pkg/service/v0/logging.go similarity index 100% rename from konnectd/pkg/service/v0/logging.go rename to idp/pkg/service/v0/logging.go diff --git a/konnectd/pkg/service/v0/option.go b/idp/pkg/service/v0/option.go similarity index 95% rename from konnectd/pkg/service/v0/option.go rename to idp/pkg/service/v0/option.go index ad06f2069..5ddc77d77 100644 --- a/konnectd/pkg/service/v0/option.go +++ b/idp/pkg/service/v0/option.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/konnectd/pkg/config" + "github.com/owncloud/ocis/idp/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" ) diff --git a/konnectd/pkg/service/v0/service.go b/idp/pkg/service/v0/service.go similarity index 81% rename from konnectd/pkg/service/v0/service.go rename to idp/pkg/service/v0/service.go index 319879f53..419726212 100644 --- a/konnectd/pkg/service/v0/service.go +++ b/idp/pkg/service/v0/service.go @@ -11,10 +11,10 @@ import ( "github.com/go-chi/chi" "github.com/gorilla/mux" - "github.com/owncloud/ocis/konnectd/pkg/assets" - "github.com/owncloud/ocis/konnectd/pkg/config" - logw "github.com/owncloud/ocis/konnectd/pkg/log" - "github.com/owncloud/ocis/konnectd/pkg/middleware" + "github.com/owncloud/ocis/idp/pkg/assets" + "github.com/owncloud/ocis/idp/pkg/config" + logw "github.com/owncloud/ocis/idp/pkg/log" + "github.com/owncloud/ocis/idp/pkg/middleware" "github.com/owncloud/ocis/ocis-pkg/log" "stash.kopano.io/kc/konnect/bootstrap" kcconfig "stash.kopano.io/kc/konnect/config" @@ -42,23 +42,23 @@ func NewService(opts ...Option) Service { logger.Fatal().Err(err).Msg("could not initialize env vars") } - if err := createConfigsIfNotExist(assetVFS, options.Config.Konnectd.Iss); err != nil { + if err := createConfigsIfNotExist(assetVFS, options.Config.IDP.Iss); err != nil { logger.Fatal().Err(err).Msg("could not create default config") } - bs, err := bootstrap.Boot(ctx, &options.Config.Konnectd, &kcconfig.Config{ + bs, err := bootstrap.Boot(ctx, &options.Config.IDP, &kcconfig.Config{ Logger: logw.Wrap(logger), }) if err != nil { - logger.Fatal().Err(err).Msg("could not bootstrap konnectd") + logger.Fatal().Err(err).Msg("could not bootstrap idp") } managers := bs.Managers() routes := []server.WithRoutes{managers.Must("identity").(server.WithRoutes)} handlers := managers.Must("handler").(http.Handler) - svc := Konnectd{ + svc := IDP{ logger: options.Logger, config: options.Config, assets: assetVFS, @@ -109,12 +109,12 @@ func createConfigsIfNotExist(assets http.FileSystem, ocisURL string) error { } -// Init vars which are currently not accessible via konnectd api +// Init vars which are currently not accessible via idp api func initKonnectInternalEnvVars() error { var defaults = map[string]string{ "LDAP_URI": "ldap://localhost:9125", - "LDAP_BINDDN": "cn=konnectd,ou=sysusers,dc=example,dc=org", - "LDAP_BINDPW": "konnectd", + "LDAP_BINDDN": "cn=idp,ou=sysusers,dc=example,dc=org", + "LDAP_BINDPW": "idp", "LDAP_BASEDN": "ou=users,dc=example,dc=org", "LDAP_SCOPE": "sub", "LDAP_LOGIN_ATTRIBUTE": "cn", @@ -136,16 +136,16 @@ func initKonnectInternalEnvVars() error { return nil } -// Konnectd defines implements the business logic for Service. -type Konnectd struct { +// IDP defines implements the business logic for Service. +type IDP struct { logger log.Logger config *config.Config mux *chi.Mux assets http.FileSystem } -// initMux initializes the internal konnectd gorilla mux and mounts it in to a ocis chi-router -func (k *Konnectd) initMux(ctx context.Context, r []server.WithRoutes, h http.Handler, options Options) { +// initMux initializes the internal idp gorilla mux and mounts it in to a ocis chi-router +func (k *IDP) initMux(ctx context.Context, r []server.WithRoutes, h http.Handler, options Options) { gm := mux.NewRouter() for _, route := range r { route.AddRoutes(ctx, gm) @@ -176,12 +176,12 @@ func (k *Konnectd) initMux(ctx context.Context, r []server.WithRoutes, h http.Ha } // ServeHTTP implements the Service interface. -func (k Konnectd) ServeHTTP(w http.ResponseWriter, r *http.Request) { +func (k IDP) ServeHTTP(w http.ResponseWriter, r *http.Request) { k.mux.ServeHTTP(w, r) } // Dummy implements the Service interface. -func (k Konnectd) Dummy(w http.ResponseWriter, r *http.Request) { +func (k IDP) Dummy(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "text/plain") w.WriteHeader(http.StatusOK) @@ -189,7 +189,7 @@ func (k Konnectd) Dummy(w http.ResponseWriter, r *http.Request) { } // Index renders the static html with the -func (k Konnectd) Index() http.HandlerFunc { +func (k IDP) Index() http.HandlerFunc { f, err := k.assets.Open("/identifier/index.html") if err != nil { diff --git a/konnectd/pkg/service/v0/tracing.go b/idp/pkg/service/v0/tracing.go similarity index 100% rename from konnectd/pkg/service/v0/tracing.go rename to idp/pkg/service/v0/tracing.go diff --git a/konnectd/pkg/version/version.go b/idp/pkg/version/version.go similarity index 100% rename from konnectd/pkg/version/version.go rename to idp/pkg/version/version.go diff --git a/idp/reflex.conf b/idp/reflex.conf new file mode 100644 index 000000000..7f0d61da4 --- /dev/null +++ b/idp/reflex.conf @@ -0,0 +1,2 @@ +# backend +-r '^(cmd|pkg)/.*\.go$' -R '^node_modules/' -s -- sh -c 'make bin/ocis-idp-debug && bin/ocis-idp-debug --log-level debug server --debug-pprof --debug-zpages' diff --git a/konnectd/scripts/build.js b/idp/scripts/build.js similarity index 100% rename from konnectd/scripts/build.js rename to idp/scripts/build.js diff --git a/konnectd/scripts/start.js b/idp/scripts/start.js similarity index 100% rename from konnectd/scripts/start.js rename to idp/scripts/start.js diff --git a/konnectd/scripts/test.js b/idp/scripts/test.js similarity index 100% rename from konnectd/scripts/test.js rename to idp/scripts/test.js diff --git a/konnectd/templates/CONFIGURATION.tmpl b/idp/templates/CONFIGURATION.tmpl similarity index 86% rename from konnectd/templates/CONFIGURATION.tmpl rename to idp/templates/CONFIGURATION.tmpl index 1ae4a82f1..713987abc 100644 --- a/konnectd/templates/CONFIGURATION.tmpl +++ b/idp/templates/CONFIGURATION.tmpl @@ -3,7 +3,7 @@ title: "Configuration" date: "{{ date "2006-01-02T15:04:05-0700" now }}" weight: 20 geekdocRepo: https://github.com/owncloud/ocis -geekdocEditPath: edit/master/konnectd/templates +geekdocEditPath: edit/master/idp/templates geekdocFilePath: CONFIGURATION.tmpl --- {{- define "options"}} @@ -33,7 +33,7 @@ $HOME/.ocis ./config ``` -For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-konnectd reads `konnectd.json | yaml | toml ...`*. +For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-idp reads `idp.json | yaml | toml ...`*. So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/konnectd/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. @@ -50,12 +50,12 @@ If you prefer to configure the service with commandline flags you can see the av {{ $options := .Options -}} {{ range $com := .Commands }}{{ with (list $options $com) -}} {{ $c := last . -}} -{{ if eq $c.Name "konnectd" -}} +{{ if eq $c.Name "idp" -}} ## Root Command {{ $c.Usage }} -Usage: `konnectd [global options] command [command options] [arguments...]` +Usage: `idp [global options] command [command options] [arguments...]` {{ template "options" . -}} ## Sub Commands @@ -64,12 +64,12 @@ Usage: `konnectd [global options] command [command options] [arguments...]` {{ end -}} {{- range $com := .Commands }}{{ with (list $options $com) -}} {{- $c := last . }} -{{- if ne $c.Name "konnectd" -}} -### konnectd {{ $c.Name }} +{{- if ne $c.Name "idp" -}} +### idp {{ $c.Name }} {{ $c.Usage }} -Usage: `konnectd {{ $c.Name }} [command options] [arguments...]` +Usage: `idp {{ $c.Name }} [command options] [arguments...]` {{ template "options" . }} {{- end -}} {{- end -}} diff --git a/konnectd/tools.go b/idp/tools.go similarity index 100% rename from konnectd/tools.go rename to idp/tools.go diff --git a/konnectd/ui/Makefile b/idp/ui/Makefile similarity index 100% rename from konnectd/ui/Makefile rename to idp/ui/Makefile diff --git a/konnectd/ui/i18n/Makefile b/idp/ui/i18n/Makefile similarity index 100% rename from konnectd/ui/i18n/Makefile rename to idp/ui/i18n/Makefile diff --git a/konnectd/ui/i18n/de.po b/idp/ui/i18n/de.po similarity index 100% rename from konnectd/ui/i18n/de.po rename to idp/ui/i18n/de.po diff --git a/konnectd/ui/i18n/es.po b/idp/ui/i18n/es.po similarity index 100% rename from konnectd/ui/i18n/es.po rename to idp/ui/i18n/es.po diff --git a/konnectd/ui/i18n/fr.po b/idp/ui/i18n/fr.po similarity index 100% rename from konnectd/ui/i18n/fr.po rename to idp/ui/i18n/fr.po diff --git a/konnectd/ui/i18n/hi.po b/idp/ui/i18n/hi.po similarity index 100% rename from konnectd/ui/i18n/hi.po rename to idp/ui/i18n/hi.po diff --git a/konnectd/ui/i18n/hr.po b/idp/ui/i18n/hr.po similarity index 100% rename from konnectd/ui/i18n/hr.po rename to idp/ui/i18n/hr.po diff --git a/konnectd/ui/i18n/hu.po b/idp/ui/i18n/hu.po similarity index 100% rename from konnectd/ui/i18n/hu.po rename to idp/ui/i18n/hu.po diff --git a/konnectd/ui/i18n/is.po b/idp/ui/i18n/is.po similarity index 100% rename from konnectd/ui/i18n/is.po rename to idp/ui/i18n/is.po diff --git a/konnectd/ui/i18n/it.po b/idp/ui/i18n/it.po similarity index 100% rename from konnectd/ui/i18n/it.po rename to idp/ui/i18n/it.po diff --git a/konnectd/ui/i18n/ja.po b/idp/ui/i18n/ja.po similarity index 100% rename from konnectd/ui/i18n/ja.po rename to idp/ui/i18n/ja.po diff --git a/konnectd/ui/i18n/konnect-identifier.pot b/idp/ui/i18n/konnect-identifier.pot similarity index 100% rename from konnectd/ui/i18n/konnect-identifier.pot rename to idp/ui/i18n/konnect-identifier.pot diff --git a/konnectd/ui/i18n/nb.po b/idp/ui/i18n/nb.po similarity index 100% rename from konnectd/ui/i18n/nb.po rename to idp/ui/i18n/nb.po diff --git a/konnectd/ui/i18n/nl.po b/idp/ui/i18n/nl.po similarity index 100% rename from konnectd/ui/i18n/nl.po rename to idp/ui/i18n/nl.po diff --git a/konnectd/ui/i18n/pl.po b/idp/ui/i18n/pl.po similarity index 100% rename from konnectd/ui/i18n/pl.po rename to idp/ui/i18n/pl.po diff --git a/konnectd/ui/i18n/pt_PT.po b/idp/ui/i18n/pt_PT.po similarity index 100% rename from konnectd/ui/i18n/pt_PT.po rename to idp/ui/i18n/pt_PT.po diff --git a/konnectd/ui/i18n/ru.po b/idp/ui/i18n/ru.po similarity index 100% rename from konnectd/ui/i18n/ru.po rename to idp/ui/i18n/ru.po diff --git a/konnectd/ui/i18n/sl.po b/idp/ui/i18n/sl.po similarity index 100% rename from konnectd/ui/i18n/sl.po rename to idp/ui/i18n/sl.po diff --git a/konnectd/ui/i18n/src/messages.json b/idp/ui/i18n/src/messages.json similarity index 100% rename from konnectd/ui/i18n/src/messages.json rename to idp/ui/i18n/src/messages.json diff --git a/konnectd/ui/public/index.html b/idp/ui/public/index.html similarity index 100% rename from konnectd/ui/public/index.html rename to idp/ui/public/index.html diff --git a/konnectd/ui/public/static/logo.svg b/idp/ui/public/static/logo.svg similarity index 100% rename from konnectd/ui/public/static/logo.svg rename to idp/ui/public/static/logo.svg diff --git a/konnectd/ui/src/Main.js b/idp/ui/src/Main.js similarity index 100% rename from konnectd/ui/src/Main.js rename to idp/ui/src/Main.js diff --git a/konnectd/ui/src/Main.test.js b/idp/ui/src/Main.test.js similarity index 100% rename from konnectd/ui/src/Main.test.js rename to idp/ui/src/Main.test.js diff --git a/konnectd/ui/src/Makefile b/idp/ui/src/Makefile similarity index 100% rename from konnectd/ui/src/Makefile rename to idp/ui/src/Makefile diff --git a/konnectd/ui/src/Routes.js b/idp/ui/src/Routes.js similarity index 100% rename from konnectd/ui/src/Routes.js rename to idp/ui/src/Routes.js diff --git a/konnectd/ui/src/actions/common.js b/idp/ui/src/actions/common.js similarity index 100% rename from konnectd/ui/src/actions/common.js rename to idp/ui/src/actions/common.js diff --git a/konnectd/ui/src/actions/login.js b/idp/ui/src/actions/login.js similarity index 100% rename from konnectd/ui/src/actions/login.js rename to idp/ui/src/actions/login.js diff --git a/konnectd/ui/src/actions/types.js b/idp/ui/src/actions/types.js similarity index 100% rename from konnectd/ui/src/actions/types.js rename to idp/ui/src/actions/types.js diff --git a/konnectd/ui/src/actions/utils.js b/idp/ui/src/actions/utils.js similarity index 100% rename from konnectd/ui/src/actions/utils.js rename to idp/ui/src/actions/utils.js diff --git a/konnectd/ui/src/app.css b/idp/ui/src/app.css similarity index 100% rename from konnectd/ui/src/app.css rename to idp/ui/src/app.css diff --git a/konnectd/ui/src/app.js b/idp/ui/src/app.js similarity index 100% rename from konnectd/ui/src/app.js rename to idp/ui/src/app.js diff --git a/konnectd/ui/src/components/ClientDisplayName.js b/idp/ui/src/components/ClientDisplayName.js similarity index 100% rename from konnectd/ui/src/components/ClientDisplayName.js rename to idp/ui/src/components/ClientDisplayName.js diff --git a/konnectd/ui/src/components/Loading.js b/idp/ui/src/components/Loading.js similarity index 100% rename from konnectd/ui/src/components/Loading.js rename to idp/ui/src/components/Loading.js diff --git a/konnectd/ui/src/components/PrivateRoute.js b/idp/ui/src/components/PrivateRoute.js similarity index 100% rename from konnectd/ui/src/components/PrivateRoute.js rename to idp/ui/src/components/PrivateRoute.js diff --git a/konnectd/ui/src/components/RedirectWithQuery.js b/idp/ui/src/components/RedirectWithQuery.js similarity index 100% rename from konnectd/ui/src/components/RedirectWithQuery.js rename to idp/ui/src/components/RedirectWithQuery.js diff --git a/konnectd/ui/src/components/ResponsiveScreen.js b/idp/ui/src/components/ResponsiveScreen.js similarity index 100% rename from konnectd/ui/src/components/ResponsiveScreen.js rename to idp/ui/src/components/ResponsiveScreen.js diff --git a/konnectd/ui/src/components/ScopesList.js b/idp/ui/src/components/ScopesList.js similarity index 100% rename from konnectd/ui/src/components/ScopesList.js rename to idp/ui/src/components/ScopesList.js diff --git a/konnectd/ui/src/components/TextInput.js b/idp/ui/src/components/TextInput.js similarity index 100% rename from konnectd/ui/src/components/TextInput.js rename to idp/ui/src/components/TextInput.js diff --git a/konnectd/ui/src/containers/Goodbye/Goodbyescreen.js b/idp/ui/src/containers/Goodbye/Goodbyescreen.js similarity index 100% rename from konnectd/ui/src/containers/Goodbye/Goodbyescreen.js rename to idp/ui/src/containers/Goodbye/Goodbyescreen.js diff --git a/konnectd/ui/src/containers/Goodbye/index.js b/idp/ui/src/containers/Goodbye/index.js similarity index 100% rename from konnectd/ui/src/containers/Goodbye/index.js rename to idp/ui/src/containers/Goodbye/index.js diff --git a/konnectd/ui/src/containers/Login/Chooseaccount.js b/idp/ui/src/containers/Login/Chooseaccount.js similarity index 100% rename from konnectd/ui/src/containers/Login/Chooseaccount.js rename to idp/ui/src/containers/Login/Chooseaccount.js diff --git a/konnectd/ui/src/containers/Login/Consent.js b/idp/ui/src/containers/Login/Consent.js similarity index 100% rename from konnectd/ui/src/containers/Login/Consent.js rename to idp/ui/src/containers/Login/Consent.js diff --git a/konnectd/ui/src/containers/Login/Login.js b/idp/ui/src/containers/Login/Login.js similarity index 100% rename from konnectd/ui/src/containers/Login/Login.js rename to idp/ui/src/containers/Login/Login.js diff --git a/konnectd/ui/src/containers/Login/Loginscreen.js b/idp/ui/src/containers/Login/Loginscreen.js similarity index 100% rename from konnectd/ui/src/containers/Login/Loginscreen.js rename to idp/ui/src/containers/Login/Loginscreen.js diff --git a/konnectd/ui/src/containers/Login/index.js b/idp/ui/src/containers/Login/index.js similarity index 100% rename from konnectd/ui/src/containers/Login/index.js rename to idp/ui/src/containers/Login/index.js diff --git a/konnectd/ui/src/containers/Welcome/Welcomescreen.js b/idp/ui/src/containers/Welcome/Welcomescreen.js similarity index 100% rename from konnectd/ui/src/containers/Welcome/Welcomescreen.js rename to idp/ui/src/containers/Welcome/Welcomescreen.js diff --git a/konnectd/ui/src/containers/Welcome/index.js b/idp/ui/src/containers/Welcome/index.js similarity index 100% rename from konnectd/ui/src/containers/Welcome/index.js rename to idp/ui/src/containers/Welcome/index.js diff --git a/konnectd/ui/src/errors/index.js b/idp/ui/src/errors/index.js similarity index 100% rename from konnectd/ui/src/errors/index.js rename to idp/ui/src/errors/index.js diff --git a/konnectd/ui/src/images/background.jpg b/idp/ui/src/images/background.jpg similarity index 100% rename from konnectd/ui/src/images/background.jpg rename to idp/ui/src/images/background.jpg diff --git a/konnectd/ui/src/index.js b/idp/ui/src/index.js similarity index 100% rename from konnectd/ui/src/index.js rename to idp/ui/src/index.js diff --git a/konnectd/ui/src/locales/de.json b/idp/ui/src/locales/de.json similarity index 100% rename from konnectd/ui/src/locales/de.json rename to idp/ui/src/locales/de.json diff --git a/konnectd/ui/src/locales/es.json b/idp/ui/src/locales/es.json similarity index 100% rename from konnectd/ui/src/locales/es.json rename to idp/ui/src/locales/es.json diff --git a/konnectd/ui/src/locales/fr.json b/idp/ui/src/locales/fr.json similarity index 100% rename from konnectd/ui/src/locales/fr.json rename to idp/ui/src/locales/fr.json diff --git a/konnectd/ui/src/locales/hi.json b/idp/ui/src/locales/hi.json similarity index 100% rename from konnectd/ui/src/locales/hi.json rename to idp/ui/src/locales/hi.json diff --git a/konnectd/ui/src/locales/hr.json b/idp/ui/src/locales/hr.json similarity index 100% rename from konnectd/ui/src/locales/hr.json rename to idp/ui/src/locales/hr.json diff --git a/konnectd/ui/src/locales/hu.json b/idp/ui/src/locales/hu.json similarity index 100% rename from konnectd/ui/src/locales/hu.json rename to idp/ui/src/locales/hu.json diff --git a/konnectd/ui/src/locales/index.js b/idp/ui/src/locales/index.js similarity index 100% rename from konnectd/ui/src/locales/index.js rename to idp/ui/src/locales/index.js diff --git a/konnectd/ui/src/locales/is.json b/idp/ui/src/locales/is.json similarity index 100% rename from konnectd/ui/src/locales/is.json rename to idp/ui/src/locales/is.json diff --git a/konnectd/ui/src/locales/it.json b/idp/ui/src/locales/it.json similarity index 100% rename from konnectd/ui/src/locales/it.json rename to idp/ui/src/locales/it.json diff --git a/konnectd/ui/src/locales/ja.json b/idp/ui/src/locales/ja.json similarity index 100% rename from konnectd/ui/src/locales/ja.json rename to idp/ui/src/locales/ja.json diff --git a/konnectd/ui/src/locales/nb.json b/idp/ui/src/locales/nb.json similarity index 100% rename from konnectd/ui/src/locales/nb.json rename to idp/ui/src/locales/nb.json diff --git a/konnectd/ui/src/locales/nl.json b/idp/ui/src/locales/nl.json similarity index 100% rename from konnectd/ui/src/locales/nl.json rename to idp/ui/src/locales/nl.json diff --git a/konnectd/ui/src/locales/pl.json b/idp/ui/src/locales/pl.json similarity index 100% rename from konnectd/ui/src/locales/pl.json rename to idp/ui/src/locales/pl.json diff --git a/konnectd/ui/src/locales/pt_PT.json b/idp/ui/src/locales/pt_PT.json similarity index 100% rename from konnectd/ui/src/locales/pt_PT.json rename to idp/ui/src/locales/pt_PT.json diff --git a/konnectd/ui/src/locales/ru.json b/idp/ui/src/locales/ru.json similarity index 100% rename from konnectd/ui/src/locales/ru.json rename to idp/ui/src/locales/ru.json diff --git a/konnectd/ui/src/locales/sl.json b/idp/ui/src/locales/sl.json similarity index 100% rename from konnectd/ui/src/locales/sl.json rename to idp/ui/src/locales/sl.json diff --git a/konnectd/ui/src/models/hello.js b/idp/ui/src/models/hello.js similarity index 100% rename from konnectd/ui/src/models/hello.js rename to idp/ui/src/models/hello.js diff --git a/konnectd/ui/src/reducers/common.js b/idp/ui/src/reducers/common.js similarity index 100% rename from konnectd/ui/src/reducers/common.js rename to idp/ui/src/reducers/common.js diff --git a/konnectd/ui/src/reducers/index.js b/idp/ui/src/reducers/index.js similarity index 100% rename from konnectd/ui/src/reducers/index.js rename to idp/ui/src/reducers/index.js diff --git a/konnectd/ui/src/reducers/login.js b/idp/ui/src/reducers/login.js similarity index 100% rename from konnectd/ui/src/reducers/login.js rename to idp/ui/src/reducers/login.js diff --git a/konnectd/ui/src/store.js b/idp/ui/src/store.js similarity index 100% rename from konnectd/ui/src/store.js rename to idp/ui/src/store.js diff --git a/konnectd/ui/src/utils.js b/idp/ui/src/utils.js similarity index 100% rename from konnectd/ui/src/utils.js rename to idp/ui/src/utils.js diff --git a/konnectd/ui/src/version.js b/idp/ui/src/version.js similarity index 100% rename from konnectd/ui/src/version.js rename to idp/ui/src/version.js diff --git a/konnectd/ui_config/env.js b/idp/ui_config/env.js similarity index 100% rename from konnectd/ui_config/env.js rename to idp/ui_config/env.js diff --git a/konnectd/ui_config/jest/cssTransform.js b/idp/ui_config/jest/cssTransform.js similarity index 100% rename from konnectd/ui_config/jest/cssTransform.js rename to idp/ui_config/jest/cssTransform.js diff --git a/konnectd/ui_config/jest/fileTransform.js b/idp/ui_config/jest/fileTransform.js similarity index 100% rename from konnectd/ui_config/jest/fileTransform.js rename to idp/ui_config/jest/fileTransform.js diff --git a/konnectd/ui_config/modules.js b/idp/ui_config/modules.js similarity index 100% rename from konnectd/ui_config/modules.js rename to idp/ui_config/modules.js diff --git a/konnectd/ui_config/paths.js b/idp/ui_config/paths.js similarity index 100% rename from konnectd/ui_config/paths.js rename to idp/ui_config/paths.js diff --git a/konnectd/ui_config/pnpTs.js b/idp/ui_config/pnpTs.js similarity index 100% rename from konnectd/ui_config/pnpTs.js rename to idp/ui_config/pnpTs.js diff --git a/konnectd/ui_config/webpack.config.js b/idp/ui_config/webpack.config.js similarity index 100% rename from konnectd/ui_config/webpack.config.js rename to idp/ui_config/webpack.config.js diff --git a/konnectd/ui_config/webpackDevServer.config.js b/idp/ui_config/webpackDevServer.config.js similarity index 100% rename from konnectd/ui_config/webpackDevServer.config.js rename to idp/ui_config/webpackDevServer.config.js diff --git a/konnectd/yarn.lock b/idp/yarn.lock similarity index 100% rename from konnectd/yarn.lock rename to idp/yarn.lock diff --git a/konnectd/assets/identifier-registration.yaml b/konnectd/assets/identifier-registration.yaml deleted file mode 100644 index 6e14cc358..000000000 --- a/konnectd/assets/identifier-registration.yaml +++ /dev/null @@ -1,112 +0,0 @@ ---- - -# OpenID Connect client registry. -clients: - - id: web - name: ownCloud web app - trusted: yes - insecure: yes - redirect_uris: - - {{OCIS_URL}}/ - - {{OCIS_URL}}/oidc-callback.html - - {{OCIS_URL}}/oidc-silent-redirect.html - origins: - - {{OCIS_URL}} - - - id: ocis-explorer.js - name: oCIS Graph Explorer - trusted: yes - insecure: yes - - - id: xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69 - secret: UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh - name: ownCloud desktop app - application_type: native - insecure: true - - - id: e4rAsNUSIUs0lF4nbv9FmCeUkTlV9GdgTLDH1b5uie7syb90SzEVrbN7HIpmWJeD - secret: dInFYGV33xKzhbRmpqQltYNdfLdJIfJ9L5ISoKhNoT9qZftpdWSP71VrpGR9pmoD - name: ownCloud Android app - application_type: native - redirect_uris: - - oc://android.owncloud.com - - - id: mxd5OQDk6es5LzOzRvidJNfXLUZS2oN3oUFeXPP8LpPrhx3UroJFduGEYIBOxkY1 - secret: KFeFWWEZO9TkisIQzR3fo7hfiMXlOpaqP8CFuTbSHzV1TUuGECglPxpiVKJfOXIx - name: ownCloud iOS app - application_type: native - redirect_uris: - - oc://ios.owncloud.com - - oc.ios://ios.owncloud.com - - -# - id: playground-trusted.js -# name: Trusted OIDC Playground -# trusted: yes -# application_type: web -# redirect_uris: -# - https://my-host:8509/ -# origins: -# - https://my-host:8509 - -# - id: playground-trusted.js -# name: Trusted Insecure OIDC Playground -# trusted: yes -# application_type: web -# insecure: yes - -# - id: client-with-keys -# secret: super -# application_type: native -# redirect_uris: -# - http://localhost -# trusted_scopes: -# - konnect/guestok -# - kopano/kwm -# jwks: -# keys: -# - kty: EC -# use: sig -# kid: client-with-keys-key-1 -# crv: P-256 -# x: RTZpWoRbjwX1YavmSHVBj6Cy3Yzdkkp6QLvTGB22D0c -# y: jeavjwcX0xlDSchFcBMzXSU7wGs2VPpNxWCwmxFvmF0 -# request_object_signing_alg: ES256 - -# - id: first -# secret: lala -# application_type: native -# redirect_uris: -# - my://app - -# - id: second -# secret: lulu -# application_type: native -# redirect_uris: -# - http://localhost - -# External authority registry. -authorities: -# - id: my-univention -# name: Univention -# client_id: kopano-konnect -# authority_type: oidc -# jwks: -# keys: -# - kty: EC -# use: sig -# kid: example-key-1 -# crv: P-256 -# x: RTZpWoRbjwX1YavmSHVBj6Cy3Yzdkkp6QLvTGB22D0c -# y: jeavjwcX0xlDSchFcBMzXSU7wGs2VPpNxWCwmxFvmF0 -# default: yes -# authorization_endpoint: https://my-univention/signin/v1/identifier/_/authorize -# response_type: id_token -# scopes: -# - openid -# - profile -# identity_claim_name: preferred_username -# identity_aliases: -# external-user-a: local-user-a -# external-user-b: local-user-b -# identity_alias_required: true diff --git a/konnectd/docker/manifest.tmpl b/konnectd/docker/manifest.tmpl deleted file mode 100644 index 1dfcd995c..000000000 --- a/konnectd/docker/manifest.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -image: owncloud/ocis-konnectd:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} -{{#if build.tags}} -tags: -{{#each build.tags}} - - {{this}} -{{/each}} -{{/if}} -manifests: - - image: owncloud/ocis-konnectd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 - platform: - architecture: amd64 - os: linux - - image: owncloud/ocis-konnectd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - variant: v8 - os: linux - - image: owncloud/ocis-konnectd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - variant: v6 - os: linux diff --git a/konnectd/reflex.conf b/konnectd/reflex.conf deleted file mode 100644 index 70558c36a..000000000 --- a/konnectd/reflex.conf +++ /dev/null @@ -1,2 +0,0 @@ -# backend --r '^(cmd|pkg)/.*\.go$' -R '^node_modules/' -s -- sh -c 'make bin/ocis-konnectd-debug && bin/ocis-konnectd-debug --log-level debug server --debug-pprof --debug-zpages' diff --git a/ocis-pkg/go.sum b/ocis-pkg/go.sum index 48c1ff5d5..24b8dc8bc 100644 --- a/ocis-pkg/go.sum +++ b/ocis-pkg/go.sum @@ -217,6 +217,8 @@ github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e h1:khITGSnfDXtByQsLe github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.5.2-0.20210125114636-0c10b333ee69 h1:HNpnnhoHv/7fUSEuW37clWyPz2x9VqJHuhvWBAHjkEU= github.com/cs3org/reva v1.5.2-0.20210125114636-0c10b333ee69/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac= +github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/ocis/docker-compose.yml b/ocis/docker-compose.yml index 337b2d45b..c498752ed 100644 --- a/ocis/docker-compose.yml +++ b/ocis/docker-compose.yml @@ -23,7 +23,7 @@ services: - .:/ocis - ../accounts:/accounts - ../glauth:/glauth - - ../konnectd:/konnectd + - ../idp:/idp - ../web:/web - ../ocis-pkg:/ocis-pkg - ../ocs:/ocs diff --git a/ocis/go.mod b/ocis/go.mod index 036c6840a..22197add2 100644 --- a/ocis/go.mod +++ b/ocis/go.mod @@ -20,7 +20,7 @@ require ( github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200828085053-37fcf3c8f853 github.com/owncloud/ocis/accounts v0.5.3-0.20201103104733-ff2c41028d9b github.com/owncloud/ocis/glauth v0.0.0-00010101000000-000000000000 - github.com/owncloud/ocis/konnectd v0.0.0-00010101000000-000000000000 + github.com/owncloud/ocis/idp v0.0.0-00010101000000-000000000000 github.com/owncloud/ocis/ocis-pkg v0.1.0 github.com/owncloud/ocis/ocs v0.0.0-00010101000000-000000000000 github.com/owncloud/ocis/onlyoffice v0.0.0-00010101000000-000000000000 @@ -44,7 +44,7 @@ replace ( github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.2 github.com/owncloud/ocis/accounts => ../accounts github.com/owncloud/ocis/glauth => ../glauth - github.com/owncloud/ocis/konnectd => ../konnectd + github.com/owncloud/ocis/idp => ../idp github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg github.com/owncloud/ocis/ocs => ../ocs github.com/owncloud/ocis/onlyoffice => ../onlyoffice diff --git a/ocis/go.sum b/ocis/go.sum index 7186bb8c8..ba68cd407 100644 --- a/ocis/go.sum +++ b/ocis/go.sum @@ -729,6 +729,7 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 h1:FdBGmSkD2QpQzRWup//SGObvWf2nq89zj9+ta9OvI3A= github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5/go.mod h1:0YZ2wQSuwviXXXGUiK6zXzskyBLAbLXhamxzcFHSLoM= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= diff --git a/ocis/pkg/command/idp.go b/ocis/pkg/command/idp.go new file mode 100644 index 000000000..ef740ca9e --- /dev/null +++ b/ocis/pkg/command/idp.go @@ -0,0 +1,54 @@ +package command + +import ( + "github.com/micro/cli/v2" + "github.com/owncloud/ocis/idp/pkg/command" + svcconfig "github.com/owncloud/ocis/idp/pkg/config" + "github.com/owncloud/ocis/idp/pkg/flagset" + "github.com/owncloud/ocis/ocis/pkg/config" + "github.com/owncloud/ocis/ocis/pkg/register" + "github.com/owncloud/ocis/ocis/pkg/version" +) + +// IDPCommand is the entrypoint for the idp command. +func IDPCommand(cfg *config.Config) *cli.Command { + return &cli.Command{ + Name: "idp", + Usage: "Start idp server", + Category: "Extensions", + Flags: flagset.ServerWithConfig(cfg.IDP), + Subcommands: []*cli.Command{ + command.PrintVersion(cfg.IDP), + }, + Action: func(c *cli.Context) error { + idpCommand := command.Server(configureIDP(cfg)) + + if err := idpCommand.Before(c); err != nil { + return err + } + + return cli.HandleAction(idpCommand.Action, c) + }, + } +} + +func configureIDP(cfg *config.Config) *svcconfig.Config { + cfg.IDP.Log.Level = cfg.Log.Level + cfg.IDP.Log.Pretty = cfg.Log.Pretty + cfg.IDP.Log.Color = cfg.Log.Color + cfg.IDP.HTTP.TLS = false + cfg.IDP.Service.Version = version.String + + if cfg.Tracing.Enabled { + cfg.IDP.Tracing.Enabled = cfg.Tracing.Enabled + cfg.IDP.Tracing.Type = cfg.Tracing.Type + cfg.IDP.Tracing.Endpoint = cfg.Tracing.Endpoint + cfg.IDP.Tracing.Collector = cfg.Tracing.Collector + } + + return cfg.IDP +} + +func init() { + register.AddCommand(IDPCommand) +} diff --git a/ocis/pkg/command/konnectd.go b/ocis/pkg/command/konnectd.go deleted file mode 100644 index 0cec0a7dd..000000000 --- a/ocis/pkg/command/konnectd.go +++ /dev/null @@ -1,54 +0,0 @@ -package command - -import ( - "github.com/micro/cli/v2" - "github.com/owncloud/ocis/konnectd/pkg/command" - svcconfig "github.com/owncloud/ocis/konnectd/pkg/config" - "github.com/owncloud/ocis/konnectd/pkg/flagset" - "github.com/owncloud/ocis/ocis/pkg/config" - "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/ocis/pkg/version" -) - -// KonnectdCommand is the entrypoint for the konnectd command. -func KonnectdCommand(cfg *config.Config) *cli.Command { - return &cli.Command{ - Name: "konnectd", - Usage: "Start konnectd server", - Category: "Extensions", - Flags: flagset.ServerWithConfig(cfg.Konnectd), - Subcommands: []*cli.Command{ - command.PrintVersion(cfg.Konnectd), - }, - Action: func(c *cli.Context) error { - konnectdCommand := command.Server(configureKonnectd(cfg)) - - if err := konnectdCommand.Before(c); err != nil { - return err - } - - return cli.HandleAction(konnectdCommand.Action, c) - }, - } -} - -func configureKonnectd(cfg *config.Config) *svcconfig.Config { - cfg.Konnectd.Log.Level = cfg.Log.Level - cfg.Konnectd.Log.Pretty = cfg.Log.Pretty - cfg.Konnectd.Log.Color = cfg.Log.Color - cfg.Konnectd.HTTP.TLS = false - cfg.Konnectd.Service.Version = version.String - - if cfg.Tracing.Enabled { - cfg.Konnectd.Tracing.Enabled = cfg.Tracing.Enabled - cfg.Konnectd.Tracing.Type = cfg.Tracing.Type - cfg.Konnectd.Tracing.Endpoint = cfg.Tracing.Endpoint - cfg.Konnectd.Tracing.Collector = cfg.Tracing.Collector - } - - return cfg.Konnectd -} - -func init() { - register.AddCommand(KonnectdCommand) -} diff --git a/ocis/pkg/config/config.go b/ocis/pkg/config/config.go index 7130fec29..4c9bce375 100644 --- a/ocis/pkg/config/config.go +++ b/ocis/pkg/config/config.go @@ -6,8 +6,7 @@ import ( hello "github.com/owncloud/ocis-hello/pkg/config" accounts "github.com/owncloud/ocis/accounts/pkg/config" glauth "github.com/owncloud/ocis/glauth/pkg/config" - konnectd "github.com/owncloud/ocis/konnectd/pkg/config" - pman "github.com/owncloud/ocis/ocis/pkg/runtime/config" + idp "github.com/owncloud/ocis/idp/pkg/config" ocs "github.com/owncloud/ocis/ocs/pkg/config" onlyoffice "github.com/owncloud/ocis/onlyoffice/pkg/config" proxy "github.com/owncloud/ocis/proxy/pkg/config" @@ -17,6 +16,7 @@ import ( thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config" web "github.com/owncloud/ocis/web/pkg/config" webdav "github.com/owncloud/ocis/webdav/pkg/config" + pman "github.com/refs/pman/pkg/config" ) // Log defines the available logging configuration. @@ -75,7 +75,7 @@ type Config struct { Graph *graph.Config GraphExplorer *graphExplorer.Config Hello *hello.Config - Konnectd *konnectd.Config + IDP *idp.Config OCS *ocs.Config Onlyoffice *onlyoffice.Config Web *web.Config @@ -96,7 +96,7 @@ func New() *Config { Graph: graph.New(), GraphExplorer: graphExplorer.New(), Hello: hello.New(), - Konnectd: konnectd.New(), + IDP: idp.New(), OCS: ocs.New(), Onlyoffice: onlyoffice.New(), Web: web.New(), diff --git a/ocis/pkg/runtime/runtime.go b/ocis/pkg/runtime/runtime.go index 8485ceef5..29d176e58 100644 --- a/ocis/pkg/runtime/runtime.go +++ b/ocis/pkg/runtime/runtime.go @@ -33,7 +33,7 @@ var ( // Extensions are oCIS extension services Extensions = []string{ "glauth", - "konnectd", + "idp", "ocs", "onlyoffice", "proxy", diff --git a/ocs/go.sum b/ocs/go.sum index eb768bc7b..fd90302f8 100644 --- a/ocs/go.sum +++ b/ocs/go.sum @@ -416,6 +416,7 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 h1:FdBGmSkD2QpQzRWup//SGObvWf2nq89zj9+ta9OvI3A= github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5/go.mod h1:0YZ2wQSuwviXXXGUiK6zXzskyBLAbLXhamxzcFHSLoM= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= diff --git a/ocs/pkg/server/http/svc_test.go b/ocs/pkg/server/http/svc_test.go index 1e68adaf2..4eceaca08 100644 --- a/ocs/pkg/server/http/svc_test.go +++ b/ocs/pkg/server/http/svc_test.go @@ -51,7 +51,7 @@ const ( userEinstein string = "einstein" userMarie string = "marie" userRichard string = "richard" - userKonnectd string = "konnectd" + userIDP string = "idp" userReva string = "reva" userMoss string = "moss" userAdmin string = "admin" @@ -75,7 +75,7 @@ var defaultMemberOf = map[string][]string{ groupViolinHaters, groupPhysicsLovers, }, - userKonnectd: { + userIDP: { groupSysUsers, }, userRichard: { @@ -103,7 +103,7 @@ var defaultMemberOf = map[string][]string{ var defaultMembers = map[string][]string{ groupSysUsers: { - userKonnectd, + userIDP, userReva, }, groupUsers: { @@ -138,7 +138,7 @@ const ( userIDEinstein string = "4c510ada-c86b-4815-8820-42cdf82c3d51" userIDMarie string = "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c" userIDFeynman string = "932b4540-8d16-481e-8ef4-588e4b6b151c" - userIDKonnectd string = "820ba2a1-3f54-4538-80a4-2d73007e30bf" + userIDIDP string = "820ba2a1-3f54-4538-80a4-2d73007e30bf" userIDReva string = "bc596f3c-c955-4328-80a0-60d018b4ad57" userIDMoss string = "058bff95-6708-4fe5-91e4-9ea3d377588b" userIDAdmin string = "ddc2004c-0977-11eb-9d3f-a793888cd0f8" @@ -172,7 +172,7 @@ var dataPath = createTmpDir() var defaultUsers = []string{ userEinstein, - userKonnectd, + userIDP, userRichard, userReva, userMarie, @@ -181,7 +181,7 @@ var defaultUsers = []string{ } var defaultUserIDs = []string{ userIDEinstein, - userIDKonnectd, + userIDIDP, userIDFeynman, userIDReva, userIDMarie, diff --git a/onlyoffice/go.sum b/onlyoffice/go.sum index 00911b243..ac8bfa6cc 100644 --- a/onlyoffice/go.sum +++ b/onlyoffice/go.sum @@ -200,6 +200,8 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac= +github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -592,6 +594,7 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 h1:FdBGmSkD2QpQzRWup//SGObvWf2nq89zj9+ta9OvI3A= github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5/go.mod h1:0YZ2wQSuwviXXXGUiK6zXzskyBLAbLXhamxzcFHSLoM= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= diff --git a/settings/go.sum b/settings/go.sum index f2cb536c6..db0ef650d 100644 --- a/settings/go.sum +++ b/settings/go.sum @@ -199,6 +199,8 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac= +github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/sonar-project.properties b/sonar-project.properties index d277968bd..7866b049e 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -32,5 +32,5 @@ sonar.pullrequest.key=${env.SONAR_PULL_REQUEST_KEY} sonar.go.coverage.reportPaths=coverage/*_coverage.out # Exclude files -sonar.exclusions=**/third_party,docs/**,changelog/**,*/pkg/assets/embed.go,konnectd/assets/identifier/**,**/package.json,**/rollup.config.js,CHANGELOG.md,**/pkg/proto/**/*.pb.*,deployments/**,tests/**,vendor-bin/**,README.md +sonar.exclusions=**/third_party,docs/**,changelog/**,*/pkg/assets/embed.go,idp/assets/identifier/**,**/package.json,**/rollup.config.js,CHANGELOG.md,**/pkg/proto/**/*.pb.*,deployments/**,tests/**,vendor-bin/**,README.md sonar.coverage.exclusions=**/*_test.go diff --git a/storage/go.sum b/storage/go.sum index 97a18057d..16b2430da 100644 --- a/storage/go.sum +++ b/storage/go.sum @@ -583,6 +583,7 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 h1:FdBGmSkD2QpQzRWup//SGObvWf2nq89zj9+ta9OvI3A= github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5/go.mod h1:0YZ2wQSuwviXXXGUiK6zXzskyBLAbLXhamxzcFHSLoM= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= diff --git a/store/go.sum b/store/go.sum index 9f64f7326..7d60896a3 100644 --- a/store/go.sum +++ b/store/go.sum @@ -230,6 +230,8 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac= +github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= diff --git a/tests/acceptance/docker/src/ocis-base.yml b/tests/acceptance/docker/src/ocis-base.yml index 6e67c210e..9d57e7208 100644 --- a/tests/acceptance/docker/src/ocis-base.yml +++ b/tests/acceptance/docker/src/ocis-base.yml @@ -18,9 +18,9 @@ services: STORAGE_SHARING_USER_JSON_FILE: /srv/app/tmp/ocis/shares.json PROXY_ENABLE_BASIC_AUTH: "true" PHOENIX_WEB_CONFIG: /drone/src/ocis/tests/config/drone/ocis-config.json - KONNECTD_IDENTIFIER_REGISTRATION_CONF: /drone/src/ocis/tests/config/drone/identifier-registration.yml - KONNECTD_ISS: https://ocis-server:9200 - KONNECTD_TLS: "true" + IDP_IDENTIFIER_REGISTRATION_CONF: /drone/src/ocis/tests/config/drone/identifier-registration.yml + IDP_ISS: https://ocis-server:9200 + IDP_TLS: "true" ACCOUNTS_HASH_DIFFICULTY: 4 volumes: - ../../../config:/drone/src/ocis/tests/config diff --git a/thumbnails/go.sum b/thumbnails/go.sum index 9a131540a..64b3f130d 100644 --- a/thumbnails/go.sum +++ b/thumbnails/go.sum @@ -207,6 +207,8 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac= +github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/web/go.sum b/web/go.sum index 84b39f24a..f0d9ef4c4 100644 --- a/web/go.sum +++ b/web/go.sum @@ -202,6 +202,8 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac= +github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/webdav/go.sum b/webdav/go.sum index 1c9d59046..dea3e4910 100644 --- a/webdav/go.sum +++ b/webdav/go.sum @@ -207,6 +207,8 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw= github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac= +github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=