diff --git a/glauth/.github/config.yml b/glauth/.github/config.yml index f418fe2a5..a71bc42ea 100644 --- a/glauth/.github/config.yml +++ b/glauth/.github/config.yml @@ -2,7 +2,7 @@ # Comment to be posted to on PRs that don't update documentation updateDocsComment: > - Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis-glauth/blob/master/changelog/README.md) item based on your changes. + Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis/glauth/blob/master/changelog/README.md) item based on your changes. updateDocsWhiteList: - Tests-only - tests-only diff --git a/glauth/CHANGELOG.md b/glauth/CHANGELOG.md index d1804cc6a..149be8be9 100644 --- a/glauth/CHANGELOG.md +++ b/glauth/CHANGELOG.md @@ -2,27 +2,27 @@ The following sections list the changes in ocis-glauth unreleased. -[unreleased]: https://github.com/owncloud/ocis-glauth/compare/v0.5.0...master +[unreleased]: https://github.com/owncloud/ocis/glauth/compare/v0.5.0...master ## Summary -* Bugfix - Return invalid credentials when user was not found: [#30](https://github.com/owncloud/ocis-glauth/pull/30) -* Bugfix - Query numeric attribute values without quotes: [#28](https://github.com/owncloud/ocis-glauth/issues/28) +* Bugfix - Return invalid credentials when user was not found: [#30](https://github.com/owncloud/ocis/glauth/pull/30) +* Bugfix - Query numeric attribute values without quotes: [#28](https://github.com/owncloud/ocis/glauth/issues/28) * Bugfix - Use searchBaseDN if already a user/group name: [#214](https://github.com/owncloud/product/issues/214) -* Bugfix - Fix LDAP substring startswith filters: [#31](https://github.com/owncloud/ocis-glauth/pull/31) +* Bugfix - Fix LDAP substring startswith filters: [#31](https://github.com/owncloud/ocis/glauth/pull/31) ## Details -* Bugfix - Return invalid credentials when user was not found: [#30](https://github.com/owncloud/ocis-glauth/pull/30) +* Bugfix - Return invalid credentials when user was not found: [#30](https://github.com/owncloud/ocis/glauth/pull/30) We were relying on an error code of the ListAccounts call when the username and password was wrong. But the list will be empty if no user with the given login was found. So we also need to check if the list of accounts is empty. - https://github.com/owncloud/ocis-glauth/pull/30 + https://github.com/owncloud/ocis/glauth/pull/30 -* Bugfix - Query numeric attribute values without quotes: [#28](https://github.com/owncloud/ocis-glauth/issues/28) +* Bugfix - Query numeric attribute values without quotes: [#28](https://github.com/owncloud/ocis/glauth/issues/28) Some LDAP properties like `uidnumber` and `gidnumber` are numeric. When an OS tries to look up a user it will not only try to lookup the user by username, but also by the `uidnumber`: @@ -31,8 +31,8 @@ The following sections list the changes in ocis-glauth unreleased. changes that to `uid_number eq 20000`. The removed quotes allow the parser in ocis-accounts to identify the numeric literal. - https://github.com/owncloud/ocis-glauth/issues/28 - https://github.com/owncloud/ocis-glauth/pull/29 + https://github.com/owncloud/ocis/glauth/issues/28 + https://github.com/owncloud/ocis/glauth/pull/29 https://github.com/owncloud/ocis-accounts/pull/68 @@ -43,119 +43,119 @@ The following sections list the changes in ocis-glauth unreleased. fixed this by including an additional query part if the searchBaseDN contains a CN. https://github.com/owncloud/product/issues/214 - https://github.com/owncloud/ocis-glauth/pull/32 + https://github.com/owncloud/ocis/glauth/pull/32 -* Bugfix - Fix LDAP substring startswith filters: [#31](https://github.com/owncloud/ocis-glauth/pull/31) +* Bugfix - Fix LDAP substring startswith filters: [#31](https://github.com/owncloud/ocis/glauth/pull/31) Filters like `(mail=mar*)` are currentld not parsed correctly, but they are used when searching for recipients. This PR correctly converts them to odata filters like `startswith(mail,'mar')`. - https://github.com/owncloud/ocis-glauth/pull/31 + https://github.com/owncloud/ocis/glauth/pull/31 # Changelog for [0.5.0] (2020-07-23) The following sections list the changes in ocis-glauth 0.5.0. -[0.5.0]: https://github.com/owncloud/ocis-glauth/compare/v0.4.0...v0.5.0 +[0.5.0]: https://github.com/owncloud/ocis/glauth/compare/v0.4.0...v0.5.0 ## Summary -* Bugfix - Ignore case when comparing objectclass values: [#26](https://github.com/owncloud/ocis-glauth/pull/26) -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#24](https://github.com/owncloud/ocis-glauth/pull/24) -* Enhancement - Handle ownCloudUUID attribute: [#27](https://github.com/owncloud/ocis-glauth/pull/27) -* Enhancement - Implement group queries: [#22](https://github.com/owncloud/ocis-glauth/issues/22) +* Bugfix - Ignore case when comparing objectclass values: [#26](https://github.com/owncloud/ocis/glauth/pull/26) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#24](https://github.com/owncloud/ocis/glauth/pull/24) +* Enhancement - Handle ownCloudUUID attribute: [#27](https://github.com/owncloud/ocis/glauth/pull/27) +* Enhancement - Implement group queries: [#22](https://github.com/owncloud/ocis/glauth/issues/22) ## Details -* Bugfix - Ignore case when comparing objectclass values: [#26](https://github.com/owncloud/ocis-glauth/pull/26) +* Bugfix - Ignore case when comparing objectclass values: [#26](https://github.com/owncloud/ocis/glauth/pull/26) The LDAP equality comparison is specified as case insensitive. We fixed the comparison for objectclass properties. - https://github.com/owncloud/ocis-glauth/pull/26 + https://github.com/owncloud/ocis/glauth/pull/26 -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#24](https://github.com/owncloud/ocis-glauth/pull/24) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#24](https://github.com/owncloud/ocis/glauth/pull/24) ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. - https://github.com/owncloud/ocis-glauth/pull/24 + https://github.com/owncloud/ocis/glauth/pull/24 -* Enhancement - Handle ownCloudUUID attribute: [#27](https://github.com/owncloud/ocis-glauth/pull/27) +* Enhancement - Handle ownCloudUUID attribute: [#27](https://github.com/owncloud/ocis/glauth/pull/27) Clients can now query an accounts immutable id by using the [new `ownCloudUUID` attribute](https://github.com/butonic/owncloud-ldap-schema/blob/master/owncloud.schema#L28-L34). - https://github.com/owncloud/ocis-glauth/pull/27 + https://github.com/owncloud/ocis/glauth/pull/27 -* Enhancement - Implement group queries: [#22](https://github.com/owncloud/ocis-glauth/issues/22) +* Enhancement - Implement group queries: [#22](https://github.com/owncloud/ocis/glauth/issues/22) Refactored the handler and implemented group queries. - https://github.com/owncloud/ocis-glauth/issues/22 - https://github.com/owncloud/ocis-glauth/pull/23 + https://github.com/owncloud/ocis/glauth/issues/22 + https://github.com/owncloud/ocis/glauth/pull/23 # Changelog for [0.4.0] (2020-03-18) The following sections list the changes in ocis-glauth 0.4.0. -[0.4.0]: https://github.com/owncloud/ocis-glauth/compare/v0.2.0...v0.4.0 +[0.4.0]: https://github.com/owncloud/ocis/glauth/compare/v0.2.0...v0.4.0 ## Summary -* Enhancement - Configuration: [#11](https://github.com/owncloud/ocis-glauth/pull/11) -* Enhancement - Improve default settings: [#12](https://github.com/owncloud/ocis-glauth/pull/12) -* Enhancement - Generate temporary ldap certificates if LDAPS is enabled: [#12](https://github.com/owncloud/ocis-glauth/pull/12) -* Enhancement - Provide additional tls-endpoint: [#12](https://github.com/owncloud/ocis-glauth/pull/12) +* Enhancement - Configuration: [#11](https://github.com/owncloud/ocis/glauth/pull/11) +* Enhancement - Improve default settings: [#12](https://github.com/owncloud/ocis/glauth/pull/12) +* Enhancement - Generate temporary ldap certificates if LDAPS is enabled: [#12](https://github.com/owncloud/ocis/glauth/pull/12) +* Enhancement - Provide additional tls-endpoint: [#12](https://github.com/owncloud/ocis/glauth/pull/12) ## Details -* Enhancement - Configuration: [#11](https://github.com/owncloud/ocis-glauth/pull/11) +* Enhancement - Configuration: [#11](https://github.com/owncloud/ocis/glauth/pull/11) Extensions should be responsible of configuring themselves. We use Viper for config loading from default paths. Environment variables **WILL** take precedence over config files. - https://github.com/owncloud/ocis-glauth/pull/11 + https://github.com/owncloud/ocis/glauth/pull/11 -* Enhancement - Improve default settings: [#12](https://github.com/owncloud/ocis-glauth/pull/12) +* Enhancement - Improve default settings: [#12](https://github.com/owncloud/ocis/glauth/pull/12) This helps achieve zero-config in single-binary. - https://github.com/owncloud/ocis-glauth/pull/12 + https://github.com/owncloud/ocis/glauth/pull/12 -* Enhancement - Generate temporary ldap certificates if LDAPS is enabled: [#12](https://github.com/owncloud/ocis-glauth/pull/12) +* Enhancement - Generate temporary ldap certificates if LDAPS is enabled: [#12](https://github.com/owncloud/ocis/glauth/pull/12) This change helps to achieve zero-configuration in single-binary mode. - https://github.com/owncloud/ocis-glauth/pull/12 + https://github.com/owncloud/ocis/glauth/pull/12 -* Enhancement - Provide additional tls-endpoint: [#12](https://github.com/owncloud/ocis-glauth/pull/12) +* Enhancement - Provide additional tls-endpoint: [#12](https://github.com/owncloud/ocis/glauth/pull/12) Ocis-glauth is now able to concurrently serve a encrypted and an unencrypted ldap-port. Please note that only SSL (no StarTLS) is supported at the moment. - https://github.com/owncloud/ocis-glauth/pull/12 + https://github.com/owncloud/ocis/glauth/pull/12 # Changelog for [0.2.0] (2020-03-17) The following sections list the changes in ocis-glauth 0.2.0. -[0.2.0]: https://github.com/owncloud/ocis-glauth/compare/v0.3.0...v0.2.0 +[0.2.0]: https://github.com/owncloud/ocis/glauth/compare/v0.3.0...v0.2.0 ## Summary -* Change - Default to config based user backend: [#6](https://github.com/owncloud/ocis-glauth/pull/6) +* Change - Default to config based user backend: [#6](https://github.com/owncloud/ocis/glauth/pull/6) ## Details -* Change - Default to config based user backend: [#6](https://github.com/owncloud/ocis-glauth/pull/6) +* Change - Default to config based user backend: [#6](https://github.com/owncloud/ocis/glauth/pull/6) We changed the default configuration to use the config file backend instead of the ownCloud backend. @@ -163,21 +163,21 @@ The following sections list the changes in ocis-glauth 0.2.0. The config backend currently only has two hard coded users: demo and admin. To switch back to the ownCloud backend use `GLAUTH_BACKEND_DATASTORE=owncloud` - https://github.com/owncloud/ocis-glauth/pull/6 + https://github.com/owncloud/ocis/glauth/pull/6 # Changelog for [0.3.0] (2020-03-17) The following sections list the changes in ocis-glauth 0.3.0. -[0.3.0]: https://github.com/owncloud/ocis-glauth/compare/v0.1.0...v0.3.0 +[0.3.0]: https://github.com/owncloud/ocis/glauth/compare/v0.1.0...v0.3.0 ## Summary -* Change - Use physicist demo users: [#5](https://github.com/owncloud/ocis-glauth/issues/5) +* Change - Use physicist demo users: [#5](https://github.com/owncloud/ocis/glauth/issues/5) ## Details -* Change - Use physicist demo users: [#5](https://github.com/owncloud/ocis-glauth/issues/5) +* Change - Use physicist demo users: [#5](https://github.com/owncloud/ocis/glauth/issues/5) Demo users like admin, demo and test don't allow you to tell a story. Which is why we changed the set of hard coded demo users to `einstein`, `marie` and `feynman`. You should know who they are. @@ -185,23 +185,23 @@ The following sections list the changes in ocis-glauth 0.3.0. that is what these users use as their email domain. There are also `konnectd` and `reva` for technical purposes, eg. to allow konnectd and reva to bind to glauth. - https://github.com/owncloud/ocis-glauth/issues/5 + https://github.com/owncloud/ocis/glauth/issues/5 # Changelog for [0.1.0] (2020-02-28) The following sections list the changes in ocis-glauth 0.1.0. -[0.1.0]: https://github.com/owncloud/ocis-glauth/compare/178b6ccde34b64a88e8c14a9acb5857a4c6a3164...v0.1.0 +[0.1.0]: https://github.com/owncloud/ocis/glauth/compare/178b6ccde34b64a88e8c14a9acb5857a4c6a3164...v0.1.0 ## Summary -* Enhancement - Initial release of basic version: [#1](https://github.com/owncloud/ocis-glauth/pull/1) +* Enhancement - Initial release of basic version: [#1](https://github.com/owncloud/ocis/glauth/pull/1) ## Details -* Enhancement - Initial release of basic version: [#1](https://github.com/owncloud/ocis-glauth/pull/1) +* Enhancement - Initial release of basic version: [#1](https://github.com/owncloud/ocis/glauth/pull/1) Just prepare an initial basic version to provide a glauth service. - https://github.com/owncloud/ocis-glauth/pull/1 + https://github.com/owncloud/ocis/glauth/pull/1 diff --git a/glauth/changelog/0.1.0_2020-02-28/initial-release.md b/glauth/changelog/0.1.0_2020-02-28/initial-release.md index 1405ca38c..5c3a891f3 100644 --- a/glauth/changelog/0.1.0_2020-02-28/initial-release.md +++ b/glauth/changelog/0.1.0_2020-02-28/initial-release.md @@ -2,4 +2,4 @@ Enhancement: Initial release of basic version Just prepare an initial basic version to provide a glauth service. -https://github.com/owncloud/ocis-glauth/pull/1 +https://github.com/owncloud/ocis/glauth/pull/1 diff --git a/glauth/changelog/0.2.0_2020-03-17/pull-6.md b/glauth/changelog/0.2.0_2020-03-17/pull-6.md index 35d66d5e4..3e636597d 100644 --- a/glauth/changelog/0.2.0_2020-03-17/pull-6.md +++ b/glauth/changelog/0.2.0_2020-03-17/pull-6.md @@ -4,4 +4,4 @@ We changed the default configuration to use the config file backend instead of t The config backend currently only has two hard coded users: demo and admin. To switch back to the ownCloud backend use `GLAUTH_BACKEND_DATASTORE=owncloud` -https://github.com/owncloud/ocis-glauth/pull/6 +https://github.com/owncloud/ocis/glauth/pull/6 diff --git a/glauth/changelog/0.3.0_2020-03-17/physics-users.md b/glauth/changelog/0.3.0_2020-03-17/physics-users.md index 967d1cf70..a5461995d 100644 --- a/glauth/changelog/0.3.0_2020-03-17/physics-users.md +++ b/glauth/changelog/0.3.0_2020-03-17/physics-users.md @@ -2,4 +2,4 @@ Change: use physicist demo users Demo users like admin, demo and test don't allow you to tell a story. Which is why we changed the set of hard coded demo users to `einstein`, `marie` and `feynman`. You should know who they are. This also changes the ldap domain from `dc=owncloud,dc=com` to `dc=example,dc=org` because that is what these users use as their email domain. There are also `konnectd` and `reva` for technical purposes, eg. to allow konnectd and reva to bind to glauth. -https://github.com/owncloud/ocis-glauth/issues/5 \ No newline at end of file +https://github.com/owncloud/ocis/glauth/issues/5 diff --git a/glauth/changelog/0.4.0_2020-03-18/11 b/glauth/changelog/0.4.0_2020-03-18/11 index a6dadef7a..08f8cc747 100644 --- a/glauth/changelog/0.4.0_2020-03-18/11 +++ b/glauth/changelog/0.4.0_2020-03-18/11 @@ -2,4 +2,4 @@ Enhancement: Configuration Extensions should be responsible of configuring themselves. We use Viper for config loading from default paths. Environment variables **WILL** take precedence over config files. -https://github.com/owncloud/ocis-glauth/pull/11 +https://github.com/owncloud/ocis/glauth/pull/11 diff --git a/glauth/changelog/0.4.0_2020-03-18/default-settings.md b/glauth/changelog/0.4.0_2020-03-18/default-settings.md index e207a44b2..35c0f72eb 100644 --- a/glauth/changelog/0.4.0_2020-03-18/default-settings.md +++ b/glauth/changelog/0.4.0_2020-03-18/default-settings.md @@ -2,4 +2,4 @@ Enhancement: Improve default settings This helps achieve zero-config in single-binary. -https://github.com/owncloud/ocis-glauth/pull/12 +https://github.com/owncloud/ocis/glauth/pull/12 diff --git a/glauth/changelog/0.4.0_2020-03-18/generate-dev-certs.md b/glauth/changelog/0.4.0_2020-03-18/generate-dev-certs.md index 407d9f10c..0e0bb820f 100644 --- a/glauth/changelog/0.4.0_2020-03-18/generate-dev-certs.md +++ b/glauth/changelog/0.4.0_2020-03-18/generate-dev-certs.md @@ -2,4 +2,4 @@ Enhancement: Generate temporary ldap certificates if LDAPS is enabled This change helps to achieve zero-configuration in single-binary mode. -https://github.com/owncloud/ocis-glauth/pull/12 +https://github.com/owncloud/ocis/glauth/pull/12 diff --git a/glauth/changelog/0.4.0_2020-03-18/tls-endpoint.md b/glauth/changelog/0.4.0_2020-03-18/tls-endpoint.md index dac7d1af4..a27ee7243 100644 --- a/glauth/changelog/0.4.0_2020-03-18/tls-endpoint.md +++ b/glauth/changelog/0.4.0_2020-03-18/tls-endpoint.md @@ -3,4 +3,4 @@ Enhancement: Provide additional tls-endpoint ocis-glauth is now able to concurrently serve a encrypted and an unencrypted ldap-port. Please note that only SSL (no StarTLS) is supported at the moment. -https://github.com/owncloud/ocis-glauth/pull/12 +https://github.com/owncloud/ocis/glauth/pull/12 diff --git a/glauth/changelog/0.5.0_2020-07-23/handle-ownclouduuid.md b/glauth/changelog/0.5.0_2020-07-23/handle-ownclouduuid.md index 472871e32..3286b8b82 100644 --- a/glauth/changelog/0.5.0_2020-07-23/handle-ownclouduuid.md +++ b/glauth/changelog/0.5.0_2020-07-23/handle-ownclouduuid.md @@ -3,4 +3,4 @@ Enhancement: handle ownCloudUUID attribute Clients can now query an accounts immutable id by using the [new `ownCloudUUID` attribute](https://github.com/butonic/owncloud-ldap-schema/blob/master/owncloud.schema#L28-L34). -https://github.com/owncloud/ocis-glauth/pull/27 \ No newline at end of file +https://github.com/owncloud/ocis/glauth/pull/27 diff --git a/glauth/changelog/0.5.0_2020-07-23/ignore-case-for-objectclass-value.md b/glauth/changelog/0.5.0_2020-07-23/ignore-case-for-objectclass-value.md index 00d6219f4..48f4a20e3 100644 --- a/glauth/changelog/0.5.0_2020-07-23/ignore-case-for-objectclass-value.md +++ b/glauth/changelog/0.5.0_2020-07-23/ignore-case-for-objectclass-value.md @@ -2,4 +2,4 @@ Bugfix: ignore case when comparing objectclass values The LDAP equality comparison is specified as case insensitive. We fixed the comparison for objectclass properties. -https://github.com/owncloud/ocis-glauth/pull/26 +https://github.com/owncloud/ocis/glauth/pull/26 diff --git a/glauth/changelog/0.5.0_2020-07-23/implement-group-queries.md b/glauth/changelog/0.5.0_2020-07-23/implement-group-queries.md index 85684ed6f..70100c74e 100644 --- a/glauth/changelog/0.5.0_2020-07-23/implement-group-queries.md +++ b/glauth/changelog/0.5.0_2020-07-23/implement-group-queries.md @@ -2,5 +2,5 @@ Enhancement: implement group queries Refactored the handler and implemented group queries. -https://github.com/owncloud/ocis-glauth/issues/22 -https://github.com/owncloud/ocis-glauth/pull/23 +https://github.com/owncloud/ocis/glauth/issues/22 +https://github.com/owncloud/ocis/glauth/pull/23 diff --git a/glauth/changelog/0.5.0_2020-07-23/use-alpine-latest.md b/glauth/changelog/0.5.0_2020-07-23/use-alpine-latest.md index b507c18af..b485a75eb 100644 --- a/glauth/changelog/0.5.0_2020-07-23/use-alpine-latest.md +++ b/glauth/changelog/0.5.0_2020-07-23/use-alpine-latest.md @@ -2,4 +2,4 @@ Bugfix: build docker images with alpine:latest instead of alpine:edge ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. -https://github.com/owncloud/ocis-glauth/pull/24 +https://github.com/owncloud/ocis/glauth/pull/24 diff --git a/glauth/changelog/CHANGELOG.tmpl b/glauth/changelog/CHANGELOG.tmpl index 28058bb7c..094ff9430 100644 --- a/glauth/changelog/CHANGELOG.tmpl +++ b/glauth/changelog/CHANGELOG.tmpl @@ -10,17 +10,17 @@ The following sections list the changes in ocis-glauth {{ .Version }}. {{ if ne (len $allVersions) $next -}} {{ $previousVersion := (index $allVersions $next).Version -}} {{ if eq .Version "unreleased" -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-glauth/compare/v{{ $previousVersion }}...master +[{{ .Version }}]: https://github.com/owncloud/ocis/glauth/compare/v{{ $previousVersion }}...master {{ else -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-glauth/compare/v{{ $previousVersion }}...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/glauth/compare/v{{ $previousVersion }}...v{{ .Version }} {{ end -}} {{ end -}} {{- /* last version managed by calens, end of the loop */ -}} {{ if eq .Version "0.1.0" -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-glauth/compare/178b6ccde34b64a88e8c14a9acb5857a4c6a3164...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/glauth/compare/178b6ccde34b64a88e8c14a9acb5857a4c6a3164...v{{ .Version }} {{ end -}} {{ else -}} diff --git a/glauth/changelog/TEMPLATE b/glauth/changelog/TEMPLATE index cdc64ea5b..213440611 100644 --- a/glauth/changelog/TEMPLATE +++ b/glauth/changelog/TEMPLATE @@ -7,5 +7,5 @@ The text in the paragraphs is written in past tense. The last section is a list of issue URLs, PR URLs and other URLs. The first issue ID (or the first PR ID, in case there aren't any issue links) is used as the primary ID. -https://github.com/owncloud/ocis-glauth/issues/1234 -https://github.com/owncloud/ocis-glauth/pull/55555 +https://github.com/owncloud/ocis/glauth/issues/1234 +https://github.com/owncloud/ocis/glauth/pull/55555 diff --git a/glauth/changelog/unreleased/fix-bind-when-not-found.md b/glauth/changelog/unreleased/fix-bind-when-not-found.md index 81c77e7fe..588bda51c 100644 --- a/glauth/changelog/unreleased/fix-bind-when-not-found.md +++ b/glauth/changelog/unreleased/fix-bind-when-not-found.md @@ -2,4 +2,4 @@ Bugfix: return invalid credentials when user was not found We were relying on an error code of the ListAccounts call when the username and password was wrong. But the list will be empty if no user with the given login was found. So we also need to check if the list of accounts is empty. -https://github.com/owncloud/ocis-glauth/pull/30 \ No newline at end of file +https://github.com/owncloud/ocis/glauth/pull/30 diff --git a/glauth/changelog/unreleased/fix-int-queries.md b/glauth/changelog/unreleased/fix-int-queries.md index 3c3e98d24..d693de090 100644 --- a/glauth/changelog/unreleased/fix-int-queries.md +++ b/glauth/changelog/unreleased/fix-int-queries.md @@ -2,6 +2,6 @@ Bugfix: query numeric attribute values without quotes Some LDAP properties like `uidnumber` and `gidnumber` are numeric. When an OS tries to look up a user it will not only try to lookup the user by username, but also by the `uidnumber`: `(&(objectclass=posixAccount)(uidnumber=20000))`. The accounts backend for glauth was sending that as a string query `uid_number eq '20000'` in the ListAccounts query. This PR changes that to `uid_number eq 20000`. The removed quotes allow the parser in ocis-accounts to identify the numeric literal. -https://github.com/owncloud/ocis-glauth/issues/28 -https://github.com/owncloud/ocis-glauth/pull/29 -https://github.com/owncloud/ocis-accounts/pull/68 \ No newline at end of file +https://github.com/owncloud/ocis/glauth/issues/28 +https://github.com/owncloud/ocis/glauth/pull/29 +https://github.com/owncloud/ocis-accounts/pull/68 diff --git a/glauth/changelog/unreleased/fix-searchbasedn.md b/glauth/changelog/unreleased/fix-searchbasedn.md index 6635a722b..7b0b0967d 100644 --- a/glauth/changelog/unreleased/fix-searchbasedn.md +++ b/glauth/changelog/unreleased/fix-searchbasedn.md @@ -3,4 +3,4 @@ Bugfix: Use searchBaseDN if already a user/group name In case of the searchBaseDN already referencing a user or group, the search query was ignoring the user/group name entirely, because the searchBaseDN is not part of the LDAP filters. We fixed this by including an additional query part if the searchBaseDN contains a CN. https://github.com/owncloud/product/issues/214 -https://github.com/owncloud/ocis-glauth/pull/32 +https://github.com/owncloud/ocis/glauth/pull/32 diff --git a/glauth/changelog/unreleased/fix-startswith-queries.md b/glauth/changelog/unreleased/fix-startswith-queries.md index eb9eacd1b..dda5ea8cd 100644 --- a/glauth/changelog/unreleased/fix-startswith-queries.md +++ b/glauth/changelog/unreleased/fix-startswith-queries.md @@ -2,4 +2,4 @@ Bugfix: fix LDAP substring startswith filters Filters like `(mail=mar*)` are currentld not parsed correctly, but they are used when searching for recipients. This PR correctly converts them to odata filters like `startswith(mail,'mar')`. -https://github.com/owncloud/ocis-glauth/pull/31 \ No newline at end of file +https://github.com/owncloud/ocis/glauth/pull/31 diff --git a/glauth/cmd/ocis-glauth/main.go b/glauth/cmd/ocis-glauth/main.go index 742fe0c60..7aaf51c22 100644 --- a/glauth/cmd/ocis-glauth/main.go +++ b/glauth/cmd/ocis-glauth/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/ocis-glauth/pkg/command" + "github.com/owncloud/ocis/glauth/pkg/command" ) func main() { diff --git a/glauth/docs/getting-started.md b/glauth/docs/getting-started.md index d5a40a99c..f28c31e1f 100644 --- a/glauth/docs/getting-started.md +++ b/glauth/docs/getting-started.md @@ -149,7 +149,7 @@ If you prefer to configure the service with commandline flags you can see the av ### Configuration file -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-glauth/tree/master/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/glauth.yml`, `${HOME}/.ocis/glauth.yml` or `$(pwd)/config/glauth.yml`. +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/glauth/tree/master/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/glauth.yml`, `${HOME}/.ocis/glauth.yml` or `$(pwd)/config/glauth.yml`. ## Usage diff --git a/glauth/docs/license.md b/glauth/docs/license.md index 4b4503831..914cd70bd 100644 --- a/glauth/docs/license.md +++ b/glauth/docs/license.md @@ -7,4 +7,4 @@ geekdocEditPath: edit/master/docs geekdocFilePath: license.md --- -This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis-glauth/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. +This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis/glauth/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. diff --git a/glauth/go.mod b/glauth/go.mod index e335b1d1d..f36d19869 100644 --- a/glauth/go.mod +++ b/glauth/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis-glauth +module github.com/owncloud/ocis/glauth go 1.13 diff --git a/glauth/go.sum b/glauth/go.sum index fbbe26006..e43265478 100644 --- a/glauth/go.sum +++ b/glauth/go.sum @@ -285,6 +285,7 @@ github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqL github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/forestgiant/sliceutil v0.0.0-20160425183142-94783f95db6c/go.mod h1:pFdJbAhRf7rh6YYMUdIQGyzne6zYL1tCUW8QV2B3UfY= github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= @@ -419,6 +420,7 @@ github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= @@ -460,6 +462,7 @@ github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= @@ -560,6 +563,7 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= @@ -623,17 +627,20 @@ github.com/marten-seemann/qtls v0.4.1 h1:YlT8QP3WCCvvok7MGEZkMldXbyqgr8oFg5/n8Gt github.com/marten-seemann/qtls v0.4.1/go.mod h1:pxVXcHHw1pNIt8Qo0pwSYQEoZ8yYOOPXTCZLQQunvRc= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= @@ -785,8 +792,6 @@ github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukw github.com/ory/fosite v0.30.4/go.mod h1:Lq9qQ9Sl6mcea2Tt8J7PU+wUeFYPZ+vg7N3zPVKGbN8= github.com/ory/go-convenience v0.1.0/go.mod h1:uEY/a60PL5c12nYz4V5cHY03IBmwIAEm8TWB0yn9KNs= github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= -github.com/owncloud/ocis-accounts v0.1.2-0.20200617152311-02e759f95e82 h1:UgNhC6sxbwd3T4stBbRNRB2mLV8Gs/rD51O0zbXdJNs= -github.com/owncloud/ocis-accounts v0.1.2-0.20200617152311-02e759f95e82/go.mod h1:VuO6j5kWjRtgPk7i/ooWJyzrl8jG5OUjvkbBPr7ihWo= github.com/owncloud/ocis-accounts v0.1.2-0.20200710152724-fa35a81beb2f h1:+3jNK8EXm4qvPOZPdJgrwtbdQxi3VU9k0QxHdUlFXH8= github.com/owncloud/ocis-accounts v0.1.2-0.20200710152724-fa35a81beb2f/go.mod h1:wxo2B5EoTQlf3ryDeOTR/RAs3z6IHkllu1CvBxrLf1A= github.com/owncloud/ocis-hello v0.1.0-alpha1/go.mod h1:tU2bOB7DjuXZ+ju+5A+7pUHmTfPIYUk3tMflqHTBTpE= @@ -794,8 +799,6 @@ github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596 h1:3aMNmuDCIdK github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= github.com/owncloud/ocis-pkg/v2 v2.0.1 h1:3ISEtfjAz4pDFczTggIJwKuft3bVsAp1C7dFY9BBPEs= github.com/owncloud/ocis-pkg/v2 v2.0.1/go.mod h1:7bVnn3VUaqdmvpMkXF0QVEF1fRugs35hSkuVTAq9yjk= -github.com/owncloud/ocis-pkg/v2 v2.2.1 h1:LK7WxHYugEFQ9NHTOz0EP8DRjbt51wXhyqruV03z6zI= -github.com/owncloud/ocis-pkg/v2 v2.2.1/go.mod h1:MXv7QzsYsu4YWuyJxhq1kLLmJa/r5gbqHe1FXulMHaw= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 h1:MYfyffPyTZbTofJjAz3LSQUIaKKcjjBBBIJGaEAkP8g= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= @@ -900,11 +903,13 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -1080,6 +1085,7 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -1228,6 +1234,7 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 h1:xQwXv67TxFo9nC1GJFyab5eq/5B590r6RlnL/G8Sz7w= golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1300,6 +1307,7 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -1417,10 +1425,9 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.0.20200427215036-cd1ad299aeab h1:33/51YKJC1SC6WAomp3Feij834LXL1uK1Jmt45mkghE= -honnef.co/go/tools v0.0.1-2020.1.0.20200427215036-cd1ad299aeab/go.mod h1:NELv708mC2Q9lQf29l+sO/v7NIOAQzEXu7jcugNzwvM= honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20191109101513-0171b7c15da1/go.mod h1:VJq7+38rpM4TSUbRiZX4P5UVAKK2UQpNQLZClkFQkpE= k8s.io/apimachinery v0.0.0-20191109100837-dffb012825f2/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s= diff --git a/glauth/pkg/command/health.go b/glauth/pkg/command/health.go index f3241fd4e..1821e87c0 100644 --- a/glauth/pkg/command/health.go +++ b/glauth/pkg/command/health.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-glauth/pkg/config" - "github.com/owncloud/ocis-glauth/pkg/flagset" + "github.com/owncloud/ocis/glauth/pkg/config" + "github.com/owncloud/ocis/glauth/pkg/flagset" ) // Health is the entrypoint for the health command. diff --git a/glauth/pkg/command/root.go b/glauth/pkg/command/root.go index f52cf784e..5ac1cde16 100644 --- a/glauth/pkg/command/root.go +++ b/glauth/pkg/command/root.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-glauth/pkg/config" - "github.com/owncloud/ocis-glauth/pkg/flagset" - "github.com/owncloud/ocis-glauth/pkg/version" + "github.com/owncloud/ocis/glauth/pkg/config" + "github.com/owncloud/ocis/glauth/pkg/flagset" + "github.com/owncloud/ocis/glauth/pkg/version" "github.com/owncloud/ocis-pkg/v2/log" "github.com/spf13/viper" ) diff --git a/glauth/pkg/command/server.go b/glauth/pkg/command/server.go index 96129c955..35d333b69 100644 --- a/glauth/pkg/command/server.go +++ b/glauth/pkg/command/server.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/owncloud/ocis-glauth/pkg/crypto" + "github.com/owncloud/ocis/glauth/pkg/crypto" "contrib.go.opencensus.io/exporter/jaeger" "contrib.go.opencensus.io/exporter/ocagent" @@ -21,10 +21,10 @@ import ( openzipkin "github.com/openzipkin/zipkin-go" zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0" - "github.com/owncloud/ocis-glauth/pkg/config" - "github.com/owncloud/ocis-glauth/pkg/flagset" - "github.com/owncloud/ocis-glauth/pkg/server/debug" - "github.com/owncloud/ocis-glauth/pkg/server/glauth" + "github.com/owncloud/ocis/glauth/pkg/config" + "github.com/owncloud/ocis/glauth/pkg/flagset" + "github.com/owncloud/ocis/glauth/pkg/server/debug" + "github.com/owncloud/ocis/glauth/pkg/server/glauth" "go.opencensus.io/stats/view" "go.opencensus.io/trace" ) diff --git a/glauth/pkg/flagset/flagset.go b/glauth/pkg/flagset/flagset.go index 97f476be1..591501fb7 100644 --- a/glauth/pkg/flagset/flagset.go +++ b/glauth/pkg/flagset/flagset.go @@ -2,7 +2,7 @@ package flagset import ( "github.com/micro/cli/v2" - "github.com/owncloud/ocis-glauth/pkg/config" + "github.com/owncloud/ocis/glauth/pkg/config" ) // RootWithConfig applies cfg to the root flagset diff --git a/glauth/pkg/server/debug/option.go b/glauth/pkg/server/debug/option.go index 471938abc..818118809 100644 --- a/glauth/pkg/server/debug/option.go +++ b/glauth/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/owncloud/ocis-glauth/pkg/config" + "github.com/owncloud/ocis/glauth/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/glauth/pkg/server/debug/server.go b/glauth/pkg/server/debug/server.go index a2ff56335..a8b403e7c 100644 --- a/glauth/pkg/server/debug/server.go +++ b/glauth/pkg/server/debug/server.go @@ -4,8 +4,8 @@ import ( "io" "net/http" - "github.com/owncloud/ocis-glauth/pkg/config" - "github.com/owncloud/ocis-glauth/pkg/version" + "github.com/owncloud/ocis/glauth/pkg/config" + "github.com/owncloud/ocis/glauth/pkg/version" "github.com/owncloud/ocis-pkg/v2/service/debug" ) diff --git a/glauth/pkg/server/glauth/server.go b/glauth/pkg/server/glauth/server.go index 51e508157..eaa2f1c59 100644 --- a/glauth/pkg/server/glauth/server.go +++ b/glauth/pkg/server/glauth/server.go @@ -7,7 +7,7 @@ import ( "github.com/glauth/glauth/pkg/config" "github.com/go-logr/logr" "github.com/nmcclain/ldap" - "github.com/owncloud/ocis-glauth/pkg/mlogr" + "github.com/owncloud/ocis/glauth/pkg/mlogr" ) // LdapSvc holds the ldap server struct