From 91bd83938b7e36a22bcfe9b2dcc218d798522633 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Fri, 18 Sep 2020 12:48:35 +0200 Subject: [PATCH] update proxy import paths and module name --- proxy/.github/config.yml | 2 +- proxy/CHANGELOG.md | 274 +++++++++--------- .../changelog/0.1.0_2020-03-18/inital-release | 2 +- .../0.1.0_2020-03-18/runtime-policies.md | 4 +- .../advanced-route-matching.md | 2 +- .../changelog/0.2.0_2020-03-25/client-urls.md | 2 +- .../0.2.0_2020-03-25/tls-cert-configurable.md | 2 +- .../fix-set-tls-cert-correctly.md | 2 +- proxy/changelog/0.3.0_2020-03-30/add-oidc.md | 2 +- .../0.3.0_2020-03-30/policy_selectors.md | 2 +- .../0.3.0_2020-03-30/redirect_to_https.md | 2 +- proxy/changelog/0.3.1_2020-03-31/update-pkg | 2 +- proxy/changelog/0.4.0_2020-06-25/account-uuid | 2 +- .../auto_provision_accounts.md | 4 +- .../changelog/0.4.0_2020-06-25/cache-miss-fix | 2 +- .../0.4.0_2020-06-25/disable-oidc-keep-alive | 2 +- .../0.4.0_2020-06-25/jwt-secret-config | 2 +- .../point-data-to-reva-frontend | 2 +- .../respect_account_enabled_flag.md | 2 +- .../0.4.0_2020-06-25/send-autocreate-home | 2 +- .../0.4.0_2020-06-25/token-header-fix | 4 +- .../update-to-new-accounts-api | 2 +- .../add-accounts-ui-routes.md | 2 +- .../0.5.0_2020-07-23/add-disable-tls.md | 4 +- .../0.5.0_2020-07-23/add-oidc-config-flags.md | 2 +- .../create-home-if-migrated.md | 4 +- .../fix-createhome-middleware.md | 2 +- .../fix-createhome-segfault.md | 2 +- .../0.5.0_2020-07-23/root-tracing.md | 2 +- .../0.5.0_2020-07-23/support-signed-urls.md | 4 +- .../user-and-group-name-mapping.md | 2 +- .../0.6.0_2020-08-17/enable-new-accounts.md | 2 +- .../presigned-url-lookup-fix.md | 2 +- .../0.6.0_2020-08-17/settings-and-ocs | 2 +- .../0.6.0_2020-08-17/use-alpine-latest.md | 2 +- .../0.6.0_2020-08-17/user-provisioning-api.md | 2 +- .../0.7.0_2020-08-21/mint-uid-and-gid.md | 2 +- .../pre-signed-url-configuration.md | 4 +- proxy/changelog/CHANGELOG.tmpl | 6 +- proxy/changelog/TEMPLATE | 4 +- .../unreleased/fix-director-selection.md | 2 +- .../unreleased/hello-in-example-config.md | 2 +- proxy/changelog/unreleased/mint-roles.md | 2 +- .../unreleased/remove-account-caching.md | 2 +- .../unreleased/settings-in-example-config.md | 2 +- proxy/cmd/ocis-proxy/main.go | 2 +- proxy/go.mod | 2 +- proxy/go.sum | 6 - proxy/pkg/command/health.go | 4 +- proxy/pkg/command/root.go | 6 +- proxy/pkg/command/server.go | 18 +- proxy/pkg/flagset/flagset.go | 2 +- proxy/pkg/middleware/account_uuid_test.go | 2 +- proxy/pkg/middleware/openidconnect.go | 2 +- proxy/pkg/middleware/options.go | 2 +- proxy/pkg/middleware/presigned_url.go | 2 +- proxy/pkg/proxy/option.go | 2 +- proxy/pkg/proxy/policy/selector.go | 2 +- proxy/pkg/proxy/policy/selector_test.go | 2 +- proxy/pkg/proxy/proxy.go | 4 +- proxy/pkg/proxy/proxy_integration_test.go | 2 +- proxy/pkg/proxy/proxy_test.go | 2 +- proxy/pkg/server/debug/option.go | 2 +- proxy/pkg/server/debug/server.go | 4 +- proxy/pkg/server/http/option.go | 4 +- proxy/pkg/server/http/server.go | 4 +- 66 files changed, 226 insertions(+), 232 deletions(-) diff --git a/proxy/.github/config.yml b/proxy/.github/config.yml index e418e6bdd5..85e051ee0f 100644 --- a/proxy/.github/config.yml +++ b/proxy/.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-proxy/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/proxy/blob/master/changelog/README.md) item based on your changes. updateDocsWhiteList: - Tests-only - tests-only diff --git a/proxy/CHANGELOG.md b/proxy/CHANGELOG.md index b70f3a7d73..ab595b4603 100644 --- a/proxy/CHANGELOG.md +++ b/proxy/CHANGELOG.md @@ -2,175 +2,175 @@ The following sections list the changes for ocis-proxy unreleased. -[unreleased]: https://github.com/owncloud/ocis-proxy/compare/v0.7.0...master +[unreleased]: https://github.com/owncloud/ocis/proxy/compare/v0.7.0...master ## Summary -* Bugfix - Fix director selection: [#99](https://github.com/owncloud/ocis-proxy/pull/99) -* Bugfix - Add settings API and app endpoints to example config: [#93](https://github.com/owncloud/ocis-proxy/pull/93) -* Change - Remove accounts caching: [#100](https://github.com/owncloud/ocis-proxy/pull/100) -* Enhancement - Add hello API and app endpoints to example config and builtin config: [#96](https://github.com/owncloud/ocis-proxy/pull/96) -* Enhancement - Add roleIDs to the access token: [#95](https://github.com/owncloud/ocis-proxy/pull/95) +* Bugfix - Fix director selection: [#99](https://github.com/owncloud/ocis/proxy/pull/99) +* Bugfix - Add settings API and app endpoints to example config: [#93](https://github.com/owncloud/ocis/proxy/pull/93) +* Change - Remove accounts caching: [#100](https://github.com/owncloud/ocis/proxy/pull/100) +* Enhancement - Add hello API and app endpoints to example config and builtin config: [#96](https://github.com/owncloud/ocis/proxy/pull/96) +* Enhancement - Add roleIDs to the access token: [#95](https://github.com/owncloud/ocis/proxy/pull/95) ## Details -* Bugfix - Fix director selection: [#99](https://github.com/owncloud/ocis-proxy/pull/99) +* Bugfix - Fix director selection: [#99](https://github.com/owncloud/ocis/proxy/pull/99) We fixed a bug where simultaneous requests could be executed on the wrong backend. - https://github.com/owncloud/ocis-proxy/pull/99 + https://github.com/owncloud/ocis/proxy/pull/99 -* Bugfix - Add settings API and app endpoints to example config: [#93](https://github.com/owncloud/ocis-proxy/pull/93) +* Bugfix - Add settings API and app endpoints to example config: [#93](https://github.com/owncloud/ocis/proxy/pull/93) We had the ocis-settings API and app endpoints in the builtin config already, but they were missing in the example config. Added them for consistency. - https://github.com/owncloud/ocis-proxy/pull/93 + https://github.com/owncloud/ocis/proxy/pull/93 -* Change - Remove accounts caching: [#100](https://github.com/owncloud/ocis-proxy/pull/100) +* Change - Remove accounts caching: [#100](https://github.com/owncloud/ocis/proxy/pull/100) We removed the accounts cache in order to avoid problems with accounts that have been updated in the accounts service. - https://github.com/owncloud/ocis-proxy/pull/100 + https://github.com/owncloud/ocis/proxy/pull/100 -* Enhancement - Add hello API and app endpoints to example config and builtin config: [#96](https://github.com/owncloud/ocis-proxy/pull/96) +* Enhancement - Add hello API and app endpoints to example config and builtin config: [#96](https://github.com/owncloud/ocis/proxy/pull/96) We added the ocis-hello API and app endpoints to both the example config and the builtin config. - https://github.com/owncloud/ocis-proxy/pull/96 + https://github.com/owncloud/ocis/proxy/pull/96 -* Enhancement - Add roleIDs to the access token: [#95](https://github.com/owncloud/ocis-proxy/pull/95) +* Enhancement - Add roleIDs to the access token: [#95](https://github.com/owncloud/ocis/proxy/pull/95) We are using the roleIDs of the authenticated user for permission checks against ocis-settings. We added the roleIDs to the access token to have them available quickly. - https://github.com/owncloud/ocis-proxy/pull/95 + https://github.com/owncloud/ocis/proxy/pull/95 # Changelog for [0.7.0] (2020-08-21) The following sections list the changes for ocis-proxy 0.7.0. -[0.7.0]: https://github.com/owncloud/ocis-proxy/compare/v0.6.0...v0.7.0 +[0.7.0]: https://github.com/owncloud/ocis/proxy/compare/v0.6.0...v0.7.0 ## Summary -* Enhancement - Add numeric uid and gid to the access token: [#89](https://github.com/owncloud/ocis-proxy/pull/89) -* Enhancement - Add configuration options for the pre-signed url middleware: [#91](https://github.com/owncloud/ocis-proxy/issues/91) +* Enhancement - Add numeric uid and gid to the access token: [#89](https://github.com/owncloud/ocis/proxy/pull/89) +* Enhancement - Add configuration options for the pre-signed url middleware: [#91](https://github.com/owncloud/ocis/proxy/issues/91) ## Details -* Enhancement - Add numeric uid and gid to the access token: [#89](https://github.com/owncloud/ocis-proxy/pull/89) +* Enhancement - Add numeric uid and gid to the access token: [#89](https://github.com/owncloud/ocis/proxy/pull/89) The eos storage driver is fetching the uid and gid of a user from the access token. This PR is using the response of the accounts service to mint them in the token. - https://github.com/owncloud/ocis-proxy/pull/89 + https://github.com/owncloud/ocis/proxy/pull/89 -* Enhancement - Add configuration options for the pre-signed url middleware: [#91](https://github.com/owncloud/ocis-proxy/issues/91) +* Enhancement - Add configuration options for the pre-signed url middleware: [#91](https://github.com/owncloud/ocis/proxy/issues/91) Added an option to define allowed http methods for pre-signed url requests. This is useful since we only want clients to GET resources and don't upload anything with presigned requests. - https://github.com/owncloud/ocis-proxy/issues/91 + https://github.com/owncloud/ocis/proxy/issues/91 https://github.com/owncloud/product/issues/150 # Changelog for [0.6.0] (2020-08-17) The following sections list the changes for ocis-proxy 0.6.0. -[0.6.0]: https://github.com/owncloud/ocis-proxy/compare/v0.5.0...v0.6.0 +[0.6.0]: https://github.com/owncloud/ocis/proxy/compare/v0.5.0...v0.6.0 ## Summary -* Bugfix - Enable new accounts by default: [#79](https://github.com/owncloud/ocis-proxy/pull/79) -* Bugfix - Lookup user by id for presigned URLs: [#85](https://github.com/owncloud/ocis-proxy/pull/85) -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#78](https://github.com/owncloud/ocis-proxy/pull/78) -* Change - Add settings and ocs group routes: [#81](https://github.com/owncloud/ocis-proxy/pull/81) -* Change - Add route for user provisioning API in ocis-ocs: [#80](https://github.com/owncloud/ocis-proxy/pull/80) +* Bugfix - Enable new accounts by default: [#79](https://github.com/owncloud/ocis/proxy/pull/79) +* Bugfix - Lookup user by id for presigned URLs: [#85](https://github.com/owncloud/ocis/proxy/pull/85) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#78](https://github.com/owncloud/ocis/proxy/pull/78) +* Change - Add settings and ocs group routes: [#81](https://github.com/owncloud/ocis/proxy/pull/81) +* Change - Add route for user provisioning API in ocis-ocs: [#80](https://github.com/owncloud/ocis/proxy/pull/80) ## Details -* Bugfix - Enable new accounts by default: [#79](https://github.com/owncloud/ocis-proxy/pull/79) +* Bugfix - Enable new accounts by default: [#79](https://github.com/owncloud/ocis/proxy/pull/79) When new accounts are created, they also need to be enabled to be useable. - https://github.com/owncloud/ocis-proxy/pull/79 + https://github.com/owncloud/ocis/proxy/pull/79 -* Bugfix - Lookup user by id for presigned URLs: [#85](https://github.com/owncloud/ocis-proxy/pull/85) +* Bugfix - Lookup user by id for presigned URLs: [#85](https://github.com/owncloud/ocis/proxy/pull/85) Phoenix will send the `userid`, not the `username` as the `OC-Credential` for presigned URLs. This PR uses the new `ocisid` claim in the OIDC userinfo to pass the userid to the account middleware. https://github.com/owncloud/ocis/issues/436 - https://github.com/owncloud/ocis-proxy/pull/85 + https://github.com/owncloud/ocis/proxy/pull/85 https://github.com/owncloud/ocis-pkg/pull/50 -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#78](https://github.com/owncloud/ocis-proxy/pull/78) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#78](https://github.com/owncloud/ocis/proxy/pull/78) ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. - https://github.com/owncloud/ocis-proxy/pull/78 + https://github.com/owncloud/ocis/proxy/pull/78 -* Change - Add settings and ocs group routes: [#81](https://github.com/owncloud/ocis-proxy/pull/81) +* Change - Add settings and ocs group routes: [#81](https://github.com/owncloud/ocis/proxy/pull/81) Route settings requests and ocs group related requests to new services - https://github.com/owncloud/ocis-proxy/pull/81 + https://github.com/owncloud/ocis/proxy/pull/81 -* Change - Add route for user provisioning API in ocis-ocs: [#80](https://github.com/owncloud/ocis-proxy/pull/80) +* Change - Add route for user provisioning API in ocis-ocs: [#80](https://github.com/owncloud/ocis/proxy/pull/80) We added a route to send requests on the user provisioning API endpoints to ocis-ocs. - https://github.com/owncloud/ocis-proxy/pull/80 + https://github.com/owncloud/ocis/proxy/pull/80 # Changelog for [0.5.0] (2020-07-23) The following sections list the changes for ocis-proxy 0.5.0. -[0.5.0]: https://github.com/owncloud/ocis-proxy/compare/v0.4.0...v0.5.0 +[0.5.0]: https://github.com/owncloud/ocis/proxy/compare/v0.4.0...v0.5.0 ## Summary -* Bugfix - Provide token configuration from config: [#69](https://github.com/owncloud/ocis-proxy/pull/69) -* Bugfix - Provide token configuration from config: [#76](https://github.com/owncloud/ocis-proxy/pull/76) -* Change - Add OIDC config flags: [#66](https://github.com/owncloud/ocis-proxy/pull/66) -* Change - Mint new username property in the reva token: [#62](https://github.com/owncloud/ocis-proxy/pull/62) -* Enhancement - Add Accounts UI routes: [#65](https://github.com/owncloud/ocis-proxy/pull/65) -* Enhancement - Add option to disable TLS: [#71](https://github.com/owncloud/ocis-proxy/issues/71) -* Enhancement - Only send create home request if an account has been migrated: [#52](https://github.com/owncloud/ocis-proxy/issues/52) -* Enhancement - Create a root span on proxy that propagates down to consumers: [#64](https://github.com/owncloud/ocis-proxy/pull/64) -* Enhancement - Support signed URLs: [#73](https://github.com/owncloud/ocis-proxy/issues/73) +* Bugfix - Provide token configuration from config: [#69](https://github.com/owncloud/ocis/proxy/pull/69) +* Bugfix - Provide token configuration from config: [#76](https://github.com/owncloud/ocis/proxy/pull/76) +* Change - Add OIDC config flags: [#66](https://github.com/owncloud/ocis/proxy/pull/66) +* Change - Mint new username property in the reva token: [#62](https://github.com/owncloud/ocis/proxy/pull/62) +* Enhancement - Add Accounts UI routes: [#65](https://github.com/owncloud/ocis/proxy/pull/65) +* Enhancement - Add option to disable TLS: [#71](https://github.com/owncloud/ocis/proxy/issues/71) +* Enhancement - Only send create home request if an account has been migrated: [#52](https://github.com/owncloud/ocis/proxy/issues/52) +* Enhancement - Create a root span on proxy that propagates down to consumers: [#64](https://github.com/owncloud/ocis/proxy/pull/64) +* Enhancement - Support signed URLs: [#73](https://github.com/owncloud/ocis/proxy/issues/73) ## Details -* Bugfix - Provide token configuration from config: [#69](https://github.com/owncloud/ocis-proxy/pull/69) +* Bugfix - Provide token configuration from config: [#69](https://github.com/owncloud/ocis/proxy/pull/69) Fixed a bug that causes the createHome middleware to crash if no configuration for the TokenManager is propagated. - https://github.com/owncloud/ocis-proxy/pull/69 + https://github.com/owncloud/ocis/proxy/pull/69 -* Bugfix - Provide token configuration from config: [#76](https://github.com/owncloud/ocis-proxy/pull/76) +* Bugfix - Provide token configuration from config: [#76](https://github.com/owncloud/ocis/proxy/pull/76) Fixed a bug that causes the createHome middleware to crash if the createHome response has no Status set - https://github.com/owncloud/ocis-proxy/pull/76 + https://github.com/owncloud/ocis/proxy/pull/76 -* Change - Add OIDC config flags: [#66](https://github.com/owncloud/ocis-proxy/pull/66) +* Change - Add OIDC config flags: [#66](https://github.com/owncloud/ocis/proxy/pull/66) To authenticate requests with an oidc provider we added two environment variables: - `PROXY_OIDC_ISSUER="https://localhost:9200"` and - `PROXY_OIDC_INSECURE=true` @@ -180,62 +180,62 @@ The following sections list the changes for ocis-proxy 0.5.0. Setting `PROXY_OIDC_ISSUER=""` will disable the OIDC middleware. - https://github.com/owncloud/ocis-proxy/pull/66 + https://github.com/owncloud/ocis/proxy/pull/66 -* Change - Mint new username property in the reva token: [#62](https://github.com/owncloud/ocis-proxy/pull/62) +* Change - Mint new username property in the reva token: [#62](https://github.com/owncloud/ocis/proxy/pull/62) An accounts username is now taken from the on_premises_sam_account_name property instead of the preferred_name. Furthermore the group name (also from on_premises_sam_account_name property) is now minted into the token as well. - https://github.com/owncloud/ocis-proxy/pull/62 + https://github.com/owncloud/ocis/proxy/pull/62 -* Enhancement - Add Accounts UI routes: [#65](https://github.com/owncloud/ocis-proxy/pull/65) +* Enhancement - Add Accounts UI routes: [#65](https://github.com/owncloud/ocis/proxy/pull/65) The accounts service has a ui that requires routing - `/api/v0/accounts` and - `/accounts.js` To http://localhost:9181 - https://github.com/owncloud/ocis-proxy/pull/65 + https://github.com/owncloud/ocis/proxy/pull/65 -* Enhancement - Add option to disable TLS: [#71](https://github.com/owncloud/ocis-proxy/issues/71) +* Enhancement - Add option to disable TLS: [#71](https://github.com/owncloud/ocis/proxy/issues/71) Can be used to disable TLS when the ocis-proxy is behind an TLS-Terminating reverse proxy. Env PROXY_TLS=false or --tls=false - https://github.com/owncloud/ocis-proxy/issues/71 - https://github.com/owncloud/ocis-proxy/pull/72 + https://github.com/owncloud/ocis/proxy/issues/71 + https://github.com/owncloud/ocis/proxy/pull/72 -* Enhancement - Only send create home request if an account has been migrated: [#52](https://github.com/owncloud/ocis-proxy/issues/52) +* Enhancement - Only send create home request if an account has been migrated: [#52](https://github.com/owncloud/ocis/proxy/issues/52) This change adds a check if an account has been migrated by getting it from the ocis-accounts service. If no account is returned it means it hasn't been migrated. - https://github.com/owncloud/ocis-proxy/issues/52 - https://github.com/owncloud/ocis-proxy/pull/63 + https://github.com/owncloud/ocis/proxy/issues/52 + https://github.com/owncloud/ocis/proxy/pull/63 -* Enhancement - Create a root span on proxy that propagates down to consumers: [#64](https://github.com/owncloud/ocis-proxy/pull/64) +* Enhancement - Create a root span on proxy that propagates down to consumers: [#64](https://github.com/owncloud/ocis/proxy/pull/64) In order to propagate and correctly associate a span with a request we need a root span that gets sent to other services. - https://github.com/owncloud/ocis-proxy/pull/64 + https://github.com/owncloud/ocis/proxy/pull/64 -* Enhancement - Support signed URLs: [#73](https://github.com/owncloud/ocis-proxy/issues/73) +* Enhancement - Support signed URLs: [#73](https://github.com/owncloud/ocis/proxy/issues/73) We added a middleware that verifies signed urls as generated by the owncloud-sdk. This allows directly downloading large files with browsers instead of using `blob://` urls, which eats memory ... - https://github.com/owncloud/ocis-proxy/issues/73 - https://github.com/owncloud/ocis-proxy/pull/75 + https://github.com/owncloud/ocis/proxy/issues/73 + https://github.com/owncloud/ocis/proxy/pull/75 https://github.com/owncloud/ocis-ocs/pull/18 https://github.com/owncloud/owncloud-sdk/pull/504 @@ -243,77 +243,77 @@ The following sections list the changes for ocis-proxy 0.5.0. The following sections list the changes for ocis-proxy 0.4.0. -[0.4.0]: https://github.com/owncloud/ocis-proxy/compare/v0.3.1...v0.4.0 +[0.4.0]: https://github.com/owncloud/ocis/proxy/compare/v0.3.1...v0.4.0 ## Summary -* Bugfix - Accounts service response was ignored: [#43](https://github.com/owncloud/ocis-proxy/pull/43) -* Bugfix - Fix x-access-token in header: [#41](https://github.com/owncloud/ocis-proxy/pull/41) -* Change - Point /data endpoint to reva frontend: [#45](https://github.com/owncloud/ocis-proxy/pull/45) -* Change - Send autocreate home request to reva gateway: [#51](https://github.com/owncloud/ocis-proxy/pull/51) -* Change - Update to new accounts API: [#39](https://github.com/owncloud/ocis-proxy/issues/39) -* Enhancement - Retrieve Account UUID From User Claims: [#36](https://github.com/owncloud/ocis-proxy/pull/36) -* Enhancement - Create account if it doesn't exist in ocis-accounts: [#55](https://github.com/owncloud/ocis-proxy/issues/55) +* Bugfix - Accounts service response was ignored: [#43](https://github.com/owncloud/ocis/proxy/pull/43) +* Bugfix - Fix x-access-token in header: [#41](https://github.com/owncloud/ocis/proxy/pull/41) +* Change - Point /data endpoint to reva frontend: [#45](https://github.com/owncloud/ocis/proxy/pull/45) +* Change - Send autocreate home request to reva gateway: [#51](https://github.com/owncloud/ocis/proxy/pull/51) +* Change - Update to new accounts API: [#39](https://github.com/owncloud/ocis/proxy/issues/39) +* Enhancement - Retrieve Account UUID From User Claims: [#36](https://github.com/owncloud/ocis/proxy/pull/36) +* Enhancement - Create account if it doesn't exist in ocis-accounts: [#55](https://github.com/owncloud/ocis/proxy/issues/55) * Enhancement - Disable keep-alive on server-side OIDC requests: [#268](https://github.com/owncloud/ocis/issues/268) -* Enhancement - Make jwt secret configurable: [#41](https://github.com/owncloud/ocis-proxy/pull/41) -* Enhancement - Respect account_enabled flag: [#53](https://github.com/owncloud/ocis-proxy/issues/53) +* Enhancement - Make jwt secret configurable: [#41](https://github.com/owncloud/ocis/proxy/pull/41) +* Enhancement - Respect account_enabled flag: [#53](https://github.com/owncloud/ocis/proxy/issues/53) ## Details -* Bugfix - Accounts service response was ignored: [#43](https://github.com/owncloud/ocis-proxy/pull/43) +* Bugfix - Accounts service response was ignored: [#43](https://github.com/owncloud/ocis/proxy/pull/43) We fixed an error in the AccountUUID middleware that was responsible for ignoring an account uuid provided by the accounts service. - https://github.com/owncloud/ocis-proxy/pull/43 + https://github.com/owncloud/ocis/proxy/pull/43 -* Bugfix - Fix x-access-token in header: [#41](https://github.com/owncloud/ocis-proxy/pull/41) +* Bugfix - Fix x-access-token in header: [#41](https://github.com/owncloud/ocis/proxy/pull/41) We fixed setting the x-access-token in the request header, which was broken before. - https://github.com/owncloud/ocis-proxy/pull/41 - https://github.com/owncloud/ocis-proxy/pull/46 + https://github.com/owncloud/ocis/proxy/pull/41 + https://github.com/owncloud/ocis/proxy/pull/46 -* Change - Point /data endpoint to reva frontend: [#45](https://github.com/owncloud/ocis-proxy/pull/45) +* Change - Point /data endpoint to reva frontend: [#45](https://github.com/owncloud/ocis/proxy/pull/45) Adjusted example config files to point /data to the reva frontend. - https://github.com/owncloud/ocis-proxy/pull/45 + https://github.com/owncloud/ocis/proxy/pull/45 -* Change - Send autocreate home request to reva gateway: [#51](https://github.com/owncloud/ocis-proxy/pull/51) +* Change - Send autocreate home request to reva gateway: [#51](https://github.com/owncloud/ocis/proxy/pull/51) Send autocreate home request to reva gateway - https://github.com/owncloud/ocis-proxy/pull/51 + https://github.com/owncloud/ocis/proxy/pull/51 -* Change - Update to new accounts API: [#39](https://github.com/owncloud/ocis-proxy/issues/39) +* Change - Update to new accounts API: [#39](https://github.com/owncloud/ocis/proxy/issues/39) Update to new accounts API - https://github.com/owncloud/ocis-proxy/issues/39 + https://github.com/owncloud/ocis/proxy/issues/39 -* Enhancement - Retrieve Account UUID From User Claims: [#36](https://github.com/owncloud/ocis-proxy/pull/36) +* Enhancement - Retrieve Account UUID From User Claims: [#36](https://github.com/owncloud/ocis/proxy/pull/36) OIDC Middleware can make use of uuidFromClaims to trade claims.Email for an account's UUID. For this, a general purpose cache was added that caches on a per-request basis, meaning whenever the request parameters match a set of keys, the cached value is returned, saving a round trip to the accounts service that otherwise would happen in every single request. - https://github.com/owncloud/ocis-proxy/pull/36 + https://github.com/owncloud/ocis/proxy/pull/36 -* Enhancement - Create account if it doesn't exist in ocis-accounts: [#55](https://github.com/owncloud/ocis-proxy/issues/55) +* Enhancement - Create account if it doesn't exist in ocis-accounts: [#55](https://github.com/owncloud/ocis/proxy/issues/55) The accounts_uuid middleware tries to get the account from ocis-accounts. If it doens't exist there yet the proxy creates the account using the ocis-account api. - https://github.com/owncloud/ocis-proxy/issues/55 - https://github.com/owncloud/ocis-proxy/issues/58 + https://github.com/owncloud/ocis/proxy/issues/55 + https://github.com/owncloud/ocis/proxy/issues/58 * Enhancement - Disable keep-alive on server-side OIDC requests: [#268](https://github.com/owncloud/ocis/issues/268) @@ -321,72 +321,72 @@ The following sections list the changes for ocis-proxy 0.4.0. This should reduce file-descriptor counts https://github.com/owncloud/ocis/issues/268 - https://github.com/owncloud/ocis-proxy/pull/42 + https://github.com/owncloud/ocis/proxy/pull/42 https://github.com/cs3org/reva/pull/787 -* Enhancement - Make jwt secret configurable: [#41](https://github.com/owncloud/ocis-proxy/pull/41) +* Enhancement - Make jwt secret configurable: [#41](https://github.com/owncloud/ocis/proxy/pull/41) We added a config option for the reva token manager JWTSecret. It was hardcoded before and is now configurable. - https://github.com/owncloud/ocis-proxy/pull/41 + https://github.com/owncloud/ocis/proxy/pull/41 -* Enhancement - Respect account_enabled flag: [#53](https://github.com/owncloud/ocis-proxy/issues/53) +* Enhancement - Respect account_enabled flag: [#53](https://github.com/owncloud/ocis/proxy/issues/53) If the account returned by the accounts service has the account_enabled flag set to false, the proxy will return immediately with the status code unauthorized. - https://github.com/owncloud/ocis-proxy/issues/53 + https://github.com/owncloud/ocis/proxy/issues/53 # Changelog for [0.3.1] (2020-03-31) The following sections list the changes for ocis-proxy 0.3.1. -[0.3.1]: https://github.com/owncloud/ocis-proxy/compare/v0.3.0...v0.3.1 +[0.3.1]: https://github.com/owncloud/ocis/proxy/compare/v0.3.0...v0.3.1 ## Summary -* Change - Update ocis-pkg: [#30](https://github.com/owncloud/ocis-proxy/pull/30) +* Change - Update ocis-pkg: [#30](https://github.com/owncloud/ocis/proxy/pull/30) ## Details -* Change - Update ocis-pkg: [#30](https://github.com/owncloud/ocis-proxy/pull/30) +* Change - Update ocis-pkg: [#30](https://github.com/owncloud/ocis/proxy/pull/30) We updated ocis-pkg from 2.0.2 to 2.2.0. - https://github.com/owncloud/ocis-proxy/pull/30 + https://github.com/owncloud/ocis/proxy/pull/30 # Changelog for [0.3.0] (2020-03-30) The following sections list the changes for ocis-proxy 0.3.0. -[0.3.0]: https://github.com/owncloud/ocis-proxy/compare/v0.2.1...v0.3.0 +[0.3.0]: https://github.com/owncloud/ocis/proxy/compare/v0.2.1...v0.3.0 ## Summary -* Change - Insecure http-requests are now redirected to https: [#29](https://github.com/owncloud/ocis-proxy/pull/29) -* Enhancement - Configurable OpenID Connect client: [#27](https://github.com/owncloud/ocis-proxy/pull/27) -* Enhancement - Add policy selectors: [#4](https://github.com/owncloud/ocis-proxy/issues/4) +* Change - Insecure http-requests are now redirected to https: [#29](https://github.com/owncloud/ocis/proxy/pull/29) +* Enhancement - Configurable OpenID Connect client: [#27](https://github.com/owncloud/ocis/proxy/pull/27) +* Enhancement - Add policy selectors: [#4](https://github.com/owncloud/ocis/proxy/issues/4) ## Details -* Change - Insecure http-requests are now redirected to https: [#29](https://github.com/owncloud/ocis-proxy/pull/29) +* Change - Insecure http-requests are now redirected to https: [#29](https://github.com/owncloud/ocis/proxy/pull/29) - https://github.com/owncloud/ocis-proxy/pull/29 + https://github.com/owncloud/ocis/proxy/pull/29 -* Enhancement - Configurable OpenID Connect client: [#27](https://github.com/owncloud/ocis-proxy/pull/27) +* Enhancement - Configurable OpenID Connect client: [#27](https://github.com/owncloud/ocis/proxy/pull/27) The proxy will try to authenticate every request with the configured OIDC provider. See configs/proxy-example.oidc.json for an example-configuration. - https://github.com/owncloud/ocis-proxy/pull/27 + https://github.com/owncloud/ocis/proxy/pull/27 -* Enhancement - Add policy selectors: [#4](https://github.com/owncloud/ocis-proxy/issues/4) +* Enhancement - Add policy selectors: [#4](https://github.com/owncloud/ocis/proxy/issues/4) "Static-Policy" can be configured to always select a specific policy. See: config/proxy-example.json. @@ -394,85 +394,85 @@ The following sections list the changes for ocis-proxy 0.3.0. "Migration-Policy" selects policy depending on existence of the uid in the ocis-accounts service. See: config/proxy-example-migration.json - https://github.com/owncloud/ocis-proxy/issues/4 + https://github.com/owncloud/ocis/proxy/issues/4 # Changelog for [0.2.1] (2020-03-25) The following sections list the changes for ocis-proxy 0.2.1. -[0.2.1]: https://github.com/owncloud/ocis-proxy/compare/v0.2.0...v0.2.1 +[0.2.1]: https://github.com/owncloud/ocis/proxy/compare/v0.2.0...v0.2.1 ## Summary -* Bugfix - Set TLS-Certificate correctly: [#25](https://github.com/owncloud/ocis-proxy/pull/25) +* Bugfix - Set TLS-Certificate correctly: [#25](https://github.com/owncloud/ocis/proxy/pull/25) ## Details -* Bugfix - Set TLS-Certificate correctly: [#25](https://github.com/owncloud/ocis-proxy/pull/25) +* Bugfix - Set TLS-Certificate correctly: [#25](https://github.com/owncloud/ocis/proxy/pull/25) - https://github.com/owncloud/ocis-proxy/pull/25 + https://github.com/owncloud/ocis/proxy/pull/25 # Changelog for [0.2.0] (2020-03-25) The following sections list the changes for ocis-proxy 0.2.0. -[0.2.0]: https://github.com/owncloud/ocis-proxy/compare/v0.1.0...v0.2.0 +[0.2.0]: https://github.com/owncloud/ocis/proxy/compare/v0.1.0...v0.2.0 ## Summary -* Change - Route requests based on regex or query parameters: [#21](https://github.com/owncloud/ocis-proxy/issues/21) -* Enhancement - Proxy client urls in default configuration: [#19](https://github.com/owncloud/ocis-proxy/issues/19) -* Enhancement - Make TLS-Cert configurable: [#14](https://github.com/owncloud/ocis-proxy/pull/14) +* Change - Route requests based on regex or query parameters: [#21](https://github.com/owncloud/ocis/proxy/issues/21) +* Enhancement - Proxy client urls in default configuration: [#19](https://github.com/owncloud/ocis/proxy/issues/19) +* Enhancement - Make TLS-Cert configurable: [#14](https://github.com/owncloud/ocis/proxy/pull/14) ## Details -* Change - Route requests based on regex or query parameters: [#21](https://github.com/owncloud/ocis-proxy/issues/21) +* Change - Route requests based on regex or query parameters: [#21](https://github.com/owncloud/ocis/proxy/issues/21) Some requests needed to be distinguished based on a pattern or a query parameter. We've implemented the functionality to route requests based on different conditions. - https://github.com/owncloud/ocis-proxy/issues/21 + https://github.com/owncloud/ocis/proxy/issues/21 -* Enhancement - Proxy client urls in default configuration: [#19](https://github.com/owncloud/ocis-proxy/issues/19) +* Enhancement - Proxy client urls in default configuration: [#19](https://github.com/owncloud/ocis/proxy/issues/19) Proxy /status.php and index.php/* - https://github.com/owncloud/ocis-proxy/issues/19 + https://github.com/owncloud/ocis/proxy/issues/19 -* Enhancement - Make TLS-Cert configurable: [#14](https://github.com/owncloud/ocis-proxy/pull/14) +* Enhancement - Make TLS-Cert configurable: [#14](https://github.com/owncloud/ocis/proxy/pull/14) Before a generates certificates on every start was used for dev purposes. - https://github.com/owncloud/ocis-proxy/pull/14 + https://github.com/owncloud/ocis/proxy/pull/14 # Changelog for [0.1.0] (2020-03-18) The following sections list the changes for ocis-proxy 0.1.0. -[0.1.0]: https://github.com/owncloud/ocis-proxy/compare/500e303cb544ed93d84153f01219d77eeee44929...v0.1.0 +[0.1.0]: https://github.com/owncloud/ocis/proxy/compare/500e303cb544ed93d84153f01219d77eeee44929...v0.1.0 ## Summary -* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis-proxy/issues/1) -* Enhancement - Load Proxy Policies at Runtime: [#17](https://github.com/owncloud/ocis-proxy/issues/17) +* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis/proxy/issues/1) +* Enhancement - Load Proxy Policies at Runtime: [#17](https://github.com/owncloud/ocis/proxy/issues/17) ## Details -* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis-proxy/issues/1) +* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis/proxy/issues/1) Just prepared an initial basic version. - https://github.com/owncloud/ocis-proxy/issues/1 + https://github.com/owncloud/ocis/proxy/issues/1 -* Enhancement - Load Proxy Policies at Runtime: [#17](https://github.com/owncloud/ocis-proxy/issues/17) +* Enhancement - Load Proxy Policies at Runtime: [#17](https://github.com/owncloud/ocis/proxy/issues/17) While a proxy without policies is of no use, the current state of ocis-proxy expects a config file either at an expected Viper location or specified via -- config-file flag. To ease deployments and ensure a working set of policies out of the box we need a series of defaults. - https://github.com/owncloud/ocis-proxy/issues/17 - https://github.com/owncloud/ocis-proxy/pull/16 + https://github.com/owncloud/ocis/proxy/issues/17 + https://github.com/owncloud/ocis/proxy/pull/16 diff --git a/proxy/changelog/0.1.0_2020-03-18/inital-release b/proxy/changelog/0.1.0_2020-03-18/inital-release index 40235f36e7..bfde0d83e9 100644 --- a/proxy/changelog/0.1.0_2020-03-18/inital-release +++ b/proxy/changelog/0.1.0_2020-03-18/inital-release @@ -2,4 +2,4 @@ Change: Initial release of basic version Just prepared an initial basic version. -https://github.com/owncloud/ocis-proxy/issues/1 \ No newline at end of file +https://github.com/owncloud/ocis/proxy/issues/1 diff --git a/proxy/changelog/0.1.0_2020-03-18/runtime-policies.md b/proxy/changelog/0.1.0_2020-03-18/runtime-policies.md index 8eaaa0135b..592e742408 100644 --- a/proxy/changelog/0.1.0_2020-03-18/runtime-policies.md +++ b/proxy/changelog/0.1.0_2020-03-18/runtime-policies.md @@ -3,5 +3,5 @@ Enhancement: Load Proxy Policies at Runtime While a proxy without policies is of no use, the current state of ocis-proxy expects a config file either at an expected Viper location or specified via -- config-file flag. To ease deployments and ensure a working set of policies out of the box we need a series of defaults. -https://github.com/owncloud/ocis-proxy/issues/17 -https://github.com/owncloud/ocis-proxy/pull/16 +https://github.com/owncloud/ocis/proxy/issues/17 +https://github.com/owncloud/ocis/proxy/pull/16 diff --git a/proxy/changelog/0.2.0_2020-03-25/advanced-route-matching.md b/proxy/changelog/0.2.0_2020-03-25/advanced-route-matching.md index 815add61f6..3b7080c3fe 100644 --- a/proxy/changelog/0.2.0_2020-03-25/advanced-route-matching.md +++ b/proxy/changelog/0.2.0_2020-03-25/advanced-route-matching.md @@ -3,4 +3,4 @@ Change: Route requests based on regex or query parameters Some requests needed to be distinguished based on a pattern or a query parameter. We've implemented the functionality to route requests based on different conditions. -https://github.com/owncloud/ocis-proxy/issues/21 +https://github.com/owncloud/ocis/proxy/issues/21 diff --git a/proxy/changelog/0.2.0_2020-03-25/client-urls.md b/proxy/changelog/0.2.0_2020-03-25/client-urls.md index 47e74ce8a7..922002adef 100644 --- a/proxy/changelog/0.2.0_2020-03-25/client-urls.md +++ b/proxy/changelog/0.2.0_2020-03-25/client-urls.md @@ -2,4 +2,4 @@ Enhancement: Proxy client urls in default configuration Proxy /status.php and index.php/* -https://github.com/owncloud/ocis-proxy/issues/19 +https://github.com/owncloud/ocis/proxy/issues/19 diff --git a/proxy/changelog/0.2.0_2020-03-25/tls-cert-configurable.md b/proxy/changelog/0.2.0_2020-03-25/tls-cert-configurable.md index 4a419af713..070bbbb0da 100644 --- a/proxy/changelog/0.2.0_2020-03-25/tls-cert-configurable.md +++ b/proxy/changelog/0.2.0_2020-03-25/tls-cert-configurable.md @@ -2,4 +2,4 @@ Enhancement: Make TLS-Cert configurable Before a generates certificates on every start was used for dev purposes. -https://github.com/owncloud/ocis-proxy/pull/14 +https://github.com/owncloud/ocis/proxy/pull/14 diff --git a/proxy/changelog/0.2.1_2020-03-25/fix-set-tls-cert-correctly.md b/proxy/changelog/0.2.1_2020-03-25/fix-set-tls-cert-correctly.md index b3e48e1ed6..e6734910b9 100644 --- a/proxy/changelog/0.2.1_2020-03-25/fix-set-tls-cert-correctly.md +++ b/proxy/changelog/0.2.1_2020-03-25/fix-set-tls-cert-correctly.md @@ -1,3 +1,3 @@ Bugfix: Set TLS-Certificate correctly -https://github.com/owncloud/ocis-proxy/pull/25 +https://github.com/owncloud/ocis/proxy/pull/25 diff --git a/proxy/changelog/0.3.0_2020-03-30/add-oidc.md b/proxy/changelog/0.3.0_2020-03-30/add-oidc.md index d1a9684f6c..adcbf1671b 100644 --- a/proxy/changelog/0.3.0_2020-03-30/add-oidc.md +++ b/proxy/changelog/0.3.0_2020-03-30/add-oidc.md @@ -4,5 +4,5 @@ The proxy will try to authenticate every request with the configured OIDC provid See configs/proxy-example.oidc.json for an example-configuration. -https://github.com/owncloud/ocis-proxy/pull/27 +https://github.com/owncloud/ocis/proxy/pull/27 diff --git a/proxy/changelog/0.3.0_2020-03-30/policy_selectors.md b/proxy/changelog/0.3.0_2020-03-30/policy_selectors.md index 31b78946f7..09255fc2d8 100644 --- a/proxy/changelog/0.3.0_2020-03-30/policy_selectors.md +++ b/proxy/changelog/0.3.0_2020-03-30/policy_selectors.md @@ -6,5 +6,5 @@ See: config/proxy-example.json. "Migration-Policy" selects policy depending on existence of the uid in the ocis-accounts service. See: config/proxy-example-migration.json -https://github.com/owncloud/ocis-proxy/issues/4 +https://github.com/owncloud/ocis/proxy/issues/4 diff --git a/proxy/changelog/0.3.0_2020-03-30/redirect_to_https.md b/proxy/changelog/0.3.0_2020-03-30/redirect_to_https.md index d8a139fbeb..1558d3eaf1 100644 --- a/proxy/changelog/0.3.0_2020-03-30/redirect_to_https.md +++ b/proxy/changelog/0.3.0_2020-03-30/redirect_to_https.md @@ -1,4 +1,4 @@ Change: Insecure http-requests are now redirected to https -https://github.com/owncloud/ocis-proxy/pull/29 +https://github.com/owncloud/ocis/proxy/pull/29 diff --git a/proxy/changelog/0.3.1_2020-03-31/update-pkg b/proxy/changelog/0.3.1_2020-03-31/update-pkg index b06327d291..c2ad6b4fc8 100644 --- a/proxy/changelog/0.3.1_2020-03-31/update-pkg +++ b/proxy/changelog/0.3.1_2020-03-31/update-pkg @@ -2,4 +2,4 @@ Change: Update ocis-pkg We updated ocis-pkg from 2.0.2 to 2.2.0. -https://github.com/owncloud/ocis-proxy/pull/30 \ No newline at end of file +https://github.com/owncloud/ocis/proxy/pull/30 diff --git a/proxy/changelog/0.4.0_2020-06-25/account-uuid b/proxy/changelog/0.4.0_2020-06-25/account-uuid index db2955f2ac..4f225d14ce 100644 --- a/proxy/changelog/0.4.0_2020-06-25/account-uuid +++ b/proxy/changelog/0.4.0_2020-06-25/account-uuid @@ -2,4 +2,4 @@ Enhancement: Retrieve Account UUID From User Claims OIDC Middleware can make use of uuidFromClaims to trade claims.Email for an account's UUID. For this, a general purpose cache was added that caches on a per-request basis, meaning whenever the request parameters match a set of keys, the cached value is returned, saving a round trip to the accounts service that otherwise would happen in every single request. -https://github.com/owncloud/ocis-proxy/pull/36 +https://github.com/owncloud/ocis/proxy/pull/36 diff --git a/proxy/changelog/0.4.0_2020-06-25/auto_provision_accounts.md b/proxy/changelog/0.4.0_2020-06-25/auto_provision_accounts.md index dc36a0573b..eb53f7ba5b 100644 --- a/proxy/changelog/0.4.0_2020-06-25/auto_provision_accounts.md +++ b/proxy/changelog/0.4.0_2020-06-25/auto_provision_accounts.md @@ -3,5 +3,5 @@ Enhancement: create account if it doesn't exist in ocis-accounts The accounts_uuid middleware tries to get the account from ocis-accounts. If it doens't exist there yet the proxy creates the account using the ocis-account api. -https://github.com/owncloud/ocis-proxy/issues/55 -https://github.com/owncloud/ocis-proxy/issues/58 +https://github.com/owncloud/ocis/proxy/issues/55 +https://github.com/owncloud/ocis/proxy/issues/58 diff --git a/proxy/changelog/0.4.0_2020-06-25/cache-miss-fix b/proxy/changelog/0.4.0_2020-06-25/cache-miss-fix index a45b18e9b6..c8789b99ed 100644 --- a/proxy/changelog/0.4.0_2020-06-25/cache-miss-fix +++ b/proxy/changelog/0.4.0_2020-06-25/cache-miss-fix @@ -3,4 +3,4 @@ Bugfix: Accounts service response was ignored We fixed an error in the AccountUUID middleware that was responsible for ignoring an account uuid provided by the accounts service. -https://github.com/owncloud/ocis-proxy/pull/43 +https://github.com/owncloud/ocis/proxy/pull/43 diff --git a/proxy/changelog/0.4.0_2020-06-25/disable-oidc-keep-alive b/proxy/changelog/0.4.0_2020-06-25/disable-oidc-keep-alive index 13098bd427..9d150a8fda 100644 --- a/proxy/changelog/0.4.0_2020-06-25/disable-oidc-keep-alive +++ b/proxy/changelog/0.4.0_2020-06-25/disable-oidc-keep-alive @@ -3,5 +3,5 @@ Enhancement: Disable keep-alive on server-side OIDC requests This should reduce file-descriptor counts https://github.com/owncloud/ocis/issues/268 -https://github.com/owncloud/ocis-proxy/pull/42 +https://github.com/owncloud/ocis/proxy/pull/42 https://github.com/cs3org/reva/pull/787 diff --git a/proxy/changelog/0.4.0_2020-06-25/jwt-secret-config b/proxy/changelog/0.4.0_2020-06-25/jwt-secret-config index d3bdb8f6ed..e830df9298 100644 --- a/proxy/changelog/0.4.0_2020-06-25/jwt-secret-config +++ b/proxy/changelog/0.4.0_2020-06-25/jwt-secret-config @@ -2,4 +2,4 @@ Enhancement: Make jwt secret configurable We added a config option for the reva token manager JWTSecret. It was hardcoded before and is now configurable. -https://github.com/owncloud/ocis-proxy/pull/41 +https://github.com/owncloud/ocis/proxy/pull/41 diff --git a/proxy/changelog/0.4.0_2020-06-25/point-data-to-reva-frontend b/proxy/changelog/0.4.0_2020-06-25/point-data-to-reva-frontend index 053b8148d8..8b4c7325c7 100644 --- a/proxy/changelog/0.4.0_2020-06-25/point-data-to-reva-frontend +++ b/proxy/changelog/0.4.0_2020-06-25/point-data-to-reva-frontend @@ -2,4 +2,4 @@ Change: Point /data endpoint to reva frontend Adjusted example config files to point /data to the reva frontend. -https://github.com/owncloud/ocis-proxy/pull/45 +https://github.com/owncloud/ocis/proxy/pull/45 diff --git a/proxy/changelog/0.4.0_2020-06-25/respect_account_enabled_flag.md b/proxy/changelog/0.4.0_2020-06-25/respect_account_enabled_flag.md index 80a635a269..1fc5eb3115 100644 --- a/proxy/changelog/0.4.0_2020-06-25/respect_account_enabled_flag.md +++ b/proxy/changelog/0.4.0_2020-06-25/respect_account_enabled_flag.md @@ -3,4 +3,4 @@ Enhancement: respect account_enabled flag If the account returned by the accounts service has the account_enabled flag set to false, the proxy will return immediately with the status code unauthorized. -https://github.com/owncloud/ocis-proxy/issues/53 +https://github.com/owncloud/ocis/proxy/issues/53 diff --git a/proxy/changelog/0.4.0_2020-06-25/send-autocreate-home b/proxy/changelog/0.4.0_2020-06-25/send-autocreate-home index 4f6f18b12b..497e6823dd 100644 --- a/proxy/changelog/0.4.0_2020-06-25/send-autocreate-home +++ b/proxy/changelog/0.4.0_2020-06-25/send-autocreate-home @@ -2,4 +2,4 @@ Change: Send autocreate home request to reva gateway Send autocreate home request to reva gateway -https://github.com/owncloud/ocis-proxy/pull/51 +https://github.com/owncloud/ocis/proxy/pull/51 diff --git a/proxy/changelog/0.4.0_2020-06-25/token-header-fix b/proxy/changelog/0.4.0_2020-06-25/token-header-fix index 36907fb395..0ff0f23b97 100644 --- a/proxy/changelog/0.4.0_2020-06-25/token-header-fix +++ b/proxy/changelog/0.4.0_2020-06-25/token-header-fix @@ -2,5 +2,5 @@ Bugfix: Fix x-access-token in header We fixed setting the x-access-token in the request header, which was broken before. -https://github.com/owncloud/ocis-proxy/pull/41 -https://github.com/owncloud/ocis-proxy/pull/46 +https://github.com/owncloud/ocis/proxy/pull/41 +https://github.com/owncloud/ocis/proxy/pull/46 diff --git a/proxy/changelog/0.4.0_2020-06-25/update-to-new-accounts-api b/proxy/changelog/0.4.0_2020-06-25/update-to-new-accounts-api index b364a02b4b..41c538f35e 100644 --- a/proxy/changelog/0.4.0_2020-06-25/update-to-new-accounts-api +++ b/proxy/changelog/0.4.0_2020-06-25/update-to-new-accounts-api @@ -2,4 +2,4 @@ Change: Update to new accounts API Update to new accounts API -https://github.com/owncloud/ocis-proxy/issues/39 +https://github.com/owncloud/ocis/proxy/issues/39 diff --git a/proxy/changelog/0.5.0_2020-07-23/add-accounts-ui-routes.md b/proxy/changelog/0.5.0_2020-07-23/add-accounts-ui-routes.md index 07ac9f9d59..76ea571345 100644 --- a/proxy/changelog/0.5.0_2020-07-23/add-accounts-ui-routes.md +++ b/proxy/changelog/0.5.0_2020-07-23/add-accounts-ui-routes.md @@ -6,4 +6,4 @@ The accounts service has a ui that requires routing to http://localhost:9181 -https://github.com/owncloud/ocis-proxy/pull/65 +https://github.com/owncloud/ocis/proxy/pull/65 diff --git a/proxy/changelog/0.5.0_2020-07-23/add-disable-tls.md b/proxy/changelog/0.5.0_2020-07-23/add-disable-tls.md index 0767078275..417549bd81 100644 --- a/proxy/changelog/0.5.0_2020-07-23/add-disable-tls.md +++ b/proxy/changelog/0.5.0_2020-07-23/add-disable-tls.md @@ -5,5 +5,5 @@ TLS-Terminating reverse proxy. env PROXY_TLS=false or --tls=false -https://github.com/owncloud/ocis-proxy/issues/71 -https://github.com/owncloud/ocis-proxy/pull/72 +https://github.com/owncloud/ocis/proxy/issues/71 +https://github.com/owncloud/ocis/proxy/pull/72 diff --git a/proxy/changelog/0.5.0_2020-07-23/add-oidc-config-flags.md b/proxy/changelog/0.5.0_2020-07-23/add-oidc-config-flags.md index ba8d3eaca3..5bf308eb34 100644 --- a/proxy/changelog/0.5.0_2020-07-23/add-oidc-config-flags.md +++ b/proxy/changelog/0.5.0_2020-07-23/add-oidc-config-flags.md @@ -8,4 +8,4 @@ This changes ocis-proxy to now load the oidc-middleware by default, requiring a Setting `PROXY_OIDC_ISSUER=""` will disable the OIDC middleware. -https://github.com/owncloud/ocis-proxy/pull/66 +https://github.com/owncloud/ocis/proxy/pull/66 diff --git a/proxy/changelog/0.5.0_2020-07-23/create-home-if-migrated.md b/proxy/changelog/0.5.0_2020-07-23/create-home-if-migrated.md index 0d8f54842d..b8434f9a38 100644 --- a/proxy/changelog/0.5.0_2020-07-23/create-home-if-migrated.md +++ b/proxy/changelog/0.5.0_2020-07-23/create-home-if-migrated.md @@ -3,5 +3,5 @@ Enhancement: only send create home request if an account has been migrated This change adds a check if an account has been migrated by getting it from the ocis-accounts service. If no account is returned it means it hasn't been migrated. -https://github.com/owncloud/ocis-proxy/issues/52 -https://github.com/owncloud/ocis-proxy/pull/63 +https://github.com/owncloud/ocis/proxy/issues/52 +https://github.com/owncloud/ocis/proxy/pull/63 diff --git a/proxy/changelog/0.5.0_2020-07-23/fix-createhome-middleware.md b/proxy/changelog/0.5.0_2020-07-23/fix-createhome-middleware.md index 5fd39993e1..0eb2b82e5e 100644 --- a/proxy/changelog/0.5.0_2020-07-23/fix-createhome-middleware.md +++ b/proxy/changelog/0.5.0_2020-07-23/fix-createhome-middleware.md @@ -2,4 +2,4 @@ Bugfix: Provide token configuration from config Fixed a bug that causes the createHome middleware to crash if no configuration for the TokenManager is propagated. -https://github.com/owncloud/ocis-proxy/pull/69 +https://github.com/owncloud/ocis/proxy/pull/69 diff --git a/proxy/changelog/0.5.0_2020-07-23/fix-createhome-segfault.md b/proxy/changelog/0.5.0_2020-07-23/fix-createhome-segfault.md index 46623fe757..3cf8fb0d5d 100644 --- a/proxy/changelog/0.5.0_2020-07-23/fix-createhome-segfault.md +++ b/proxy/changelog/0.5.0_2020-07-23/fix-createhome-segfault.md @@ -2,4 +2,4 @@ Bugfix: Provide token configuration from config Fixed a bug that causes the createHome middleware to crash if the createHome response has no Status set -https://github.com/owncloud/ocis-proxy/pull/76 +https://github.com/owncloud/ocis/proxy/pull/76 diff --git a/proxy/changelog/0.5.0_2020-07-23/root-tracing.md b/proxy/changelog/0.5.0_2020-07-23/root-tracing.md index 56f556bb7d..eb2755a580 100644 --- a/proxy/changelog/0.5.0_2020-07-23/root-tracing.md +++ b/proxy/changelog/0.5.0_2020-07-23/root-tracing.md @@ -2,4 +2,4 @@ Enhancement: Create a root span on proxy that propagates down to consumers In order to propagate and correctly associate a span with a request we need a root span that gets sent to other services. -https://github.com/owncloud/ocis-proxy/pull/64 +https://github.com/owncloud/ocis/proxy/pull/64 diff --git a/proxy/changelog/0.5.0_2020-07-23/support-signed-urls.md b/proxy/changelog/0.5.0_2020-07-23/support-signed-urls.md index 567a82c9e0..06cf43a90c 100644 --- a/proxy/changelog/0.5.0_2020-07-23/support-signed-urls.md +++ b/proxy/changelog/0.5.0_2020-07-23/support-signed-urls.md @@ -2,7 +2,7 @@ Enhancement: Support signed URLs We added a middleware that verifies signed urls as generated by the owncloud-sdk. This allows directly downloading large files with browsers instead of using `blob://` urls, which eats memory ... -https://github.com/owncloud/ocis-proxy/issues/73 -https://github.com/owncloud/ocis-proxy/pull/75 +https://github.com/owncloud/ocis/proxy/issues/73 +https://github.com/owncloud/ocis/proxy/pull/75 https://github.com/owncloud/ocis-ocs/pull/18 https://github.com/owncloud/owncloud-sdk/pull/504 diff --git a/proxy/changelog/0.5.0_2020-07-23/user-and-group-name-mapping.md b/proxy/changelog/0.5.0_2020-07-23/user-and-group-name-mapping.md index 95dedabd5d..a930064f23 100644 --- a/proxy/changelog/0.5.0_2020-07-23/user-and-group-name-mapping.md +++ b/proxy/changelog/0.5.0_2020-07-23/user-and-group-name-mapping.md @@ -3,4 +3,4 @@ Change: mint new username property in the reva token An accounts username is now taken from the on_premises_sam_account_name property instead of the preferred_name. Furthermore the group name (also from on_premises_sam_account_name property) is now minted into the token as well. -https://github.com/owncloud/ocis-proxy/pull/62 +https://github.com/owncloud/ocis/proxy/pull/62 diff --git a/proxy/changelog/0.6.0_2020-08-17/enable-new-accounts.md b/proxy/changelog/0.6.0_2020-08-17/enable-new-accounts.md index 98e52fd631..0178bad6be 100644 --- a/proxy/changelog/0.6.0_2020-08-17/enable-new-accounts.md +++ b/proxy/changelog/0.6.0_2020-08-17/enable-new-accounts.md @@ -2,4 +2,4 @@ Bugfix: enable new accounts by default When new accounts are created, they also need to be enabled to be useable. -https://github.com/owncloud/ocis-proxy/pull/79 +https://github.com/owncloud/ocis/proxy/pull/79 diff --git a/proxy/changelog/0.6.0_2020-08-17/presigned-url-lookup-fix.md b/proxy/changelog/0.6.0_2020-08-17/presigned-url-lookup-fix.md index 01b24ed398..027da00853 100644 --- a/proxy/changelog/0.6.0_2020-08-17/presigned-url-lookup-fix.md +++ b/proxy/changelog/0.6.0_2020-08-17/presigned-url-lookup-fix.md @@ -2,6 +2,6 @@ Bugfix: Lookup user by id for presigned URLs Phoenix will send the `userid`, not the `username` as the `OC-Credential` for presigned URLs. This PR uses the new `ocisid` claim in the OIDC userinfo to pass the userid to the account middleware. -https://github.com/owncloud/ocis-proxy/pull/85 +https://github.com/owncloud/ocis/proxy/pull/85 https://github.com/owncloud/ocis-pkg/pull/50 https://github.com/owncloud/ocis/issues/436 diff --git a/proxy/changelog/0.6.0_2020-08-17/settings-and-ocs b/proxy/changelog/0.6.0_2020-08-17/settings-and-ocs index 1fdb67e05f..7c1f6bbc88 100644 --- a/proxy/changelog/0.6.0_2020-08-17/settings-and-ocs +++ b/proxy/changelog/0.6.0_2020-08-17/settings-and-ocs @@ -2,4 +2,4 @@ Change: add settings and ocs group routes Route settings requests and ocs group related requests to new services -https://github.com/owncloud/ocis-proxy/pull/81 +https://github.com/owncloud/ocis/proxy/pull/81 diff --git a/proxy/changelog/0.6.0_2020-08-17/use-alpine-latest.md b/proxy/changelog/0.6.0_2020-08-17/use-alpine-latest.md index 7e53337586..f5a2b0a734 100644 --- a/proxy/changelog/0.6.0_2020-08-17/use-alpine-latest.md +++ b/proxy/changelog/0.6.0_2020-08-17/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-proxy/pull/78 +https://github.com/owncloud/ocis/proxy/pull/78 diff --git a/proxy/changelog/0.6.0_2020-08-17/user-provisioning-api.md b/proxy/changelog/0.6.0_2020-08-17/user-provisioning-api.md index 72f3262f60..4b611b9007 100644 --- a/proxy/changelog/0.6.0_2020-08-17/user-provisioning-api.md +++ b/proxy/changelog/0.6.0_2020-08-17/user-provisioning-api.md @@ -2,4 +2,4 @@ Change: Add route for user provisioning API in ocis-ocs We added a route to send requests on the user provisioning API endpoints to ocis-ocs. -https://github.com/owncloud/ocis-proxy/pull/80 +https://github.com/owncloud/ocis/proxy/pull/80 diff --git a/proxy/changelog/0.7.0_2020-08-21/mint-uid-and-gid.md b/proxy/changelog/0.7.0_2020-08-21/mint-uid-and-gid.md index 95c059b83f..122f181a70 100644 --- a/proxy/changelog/0.7.0_2020-08-21/mint-uid-and-gid.md +++ b/proxy/changelog/0.7.0_2020-08-21/mint-uid-and-gid.md @@ -2,4 +2,4 @@ Enhancement: Add numeric uid and gid to the access token The eos storage driver is fetching the uid and gid of a user from the access token. This PR is using the response of the accounts service to mint them in the token. -https://github.com/owncloud/ocis-proxy/pull/89 +https://github.com/owncloud/ocis/proxy/pull/89 diff --git a/proxy/changelog/0.7.0_2020-08-21/pre-signed-url-configuration.md b/proxy/changelog/0.7.0_2020-08-21/pre-signed-url-configuration.md index c52fdb9756..96f439608e 100644 --- a/proxy/changelog/0.7.0_2020-08-21/pre-signed-url-configuration.md +++ b/proxy/changelog/0.7.0_2020-08-21/pre-signed-url-configuration.md @@ -1,7 +1,7 @@ -Enhancement: add configuration options for the pre-signed url middleware +Enhancement: add configuration options for the pre-signed url middleware Added an option to define allowed http methods for pre-signed url requests. This is useful since we only want clients to GET resources and don't upload anything with presigned requests. -https://github.com/owncloud/ocis-proxy/issues/91 +https://github.com/owncloud/ocis/proxy/issues/91 https://github.com/owncloud/product/issues/150 diff --git a/proxy/changelog/CHANGELOG.tmpl b/proxy/changelog/CHANGELOG.tmpl index 1bdc3ace8b..3259660982 100644 --- a/proxy/changelog/CHANGELOG.tmpl +++ b/proxy/changelog/CHANGELOG.tmpl @@ -10,17 +10,17 @@ The following sections list the changes for ocis-proxy {{ .Version }}. {{ if ne (len $allVersions) $next -}} {{ $previousVersion := (index $allVersions $next).Version -}} {{ if eq .Version "unreleased" -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-proxy/compare/v{{ $previousVersion }}...master +[{{ .Version }}]: https://github.com/owncloud/ocis/proxy/compare/v{{ $previousVersion }}...master {{ else -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-proxy/compare/v{{ $previousVersion }}...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/proxy/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-proxy/compare/500e303cb544ed93d84153f01219d77eeee44929...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/proxy/compare/500e303cb544ed93d84153f01219d77eeee44929...v{{ .Version }} {{ end -}} {{ else -}} diff --git a/proxy/changelog/TEMPLATE b/proxy/changelog/TEMPLATE index 224e662117..94aee4c5f3 100644 --- a/proxy/changelog/TEMPLATE +++ b/proxy/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-proxy/issues/1234 -https://github.com/owncloud/ocis-proxy/pull/55555 +https://github.com/owncloud/ocis/proxy/issues/1234 +https://github.com/owncloud/ocis/proxy/pull/55555 diff --git a/proxy/changelog/unreleased/fix-director-selection.md b/proxy/changelog/unreleased/fix-director-selection.md index 7dc94742d9..585d44e6d3 100644 --- a/proxy/changelog/unreleased/fix-director-selection.md +++ b/proxy/changelog/unreleased/fix-director-selection.md @@ -2,4 +2,4 @@ Bugfix: Fix director selection We fixed a bug where simultaneous requests could be executed on the wrong backend. -https://github.com/owncloud/ocis-proxy/pull/99 +https://github.com/owncloud/ocis/proxy/pull/99 diff --git a/proxy/changelog/unreleased/hello-in-example-config.md b/proxy/changelog/unreleased/hello-in-example-config.md index e57f7227e5..84bffe122a 100644 --- a/proxy/changelog/unreleased/hello-in-example-config.md +++ b/proxy/changelog/unreleased/hello-in-example-config.md @@ -2,4 +2,4 @@ Enhancement: Add hello API and app endpoints to example config and builtin confi We added the ocis-hello API and app endpoints to both the example config and the builtin config. -https://github.com/owncloud/ocis-proxy/pull/96 +https://github.com/owncloud/ocis/proxy/pull/96 diff --git a/proxy/changelog/unreleased/mint-roles.md b/proxy/changelog/unreleased/mint-roles.md index 947663163f..2216272d39 100644 --- a/proxy/changelog/unreleased/mint-roles.md +++ b/proxy/changelog/unreleased/mint-roles.md @@ -2,4 +2,4 @@ Enhancement: Add roleIDs to the access token We are using the roleIDs of the authenticated user for permission checks against ocis-settings. We added the roleIDs to the access token to have them available quickly. -https://github.com/owncloud/ocis-proxy/pull/95 +https://github.com/owncloud/ocis/proxy/pull/95 diff --git a/proxy/changelog/unreleased/remove-account-caching.md b/proxy/changelog/unreleased/remove-account-caching.md index 378117d625..c4605a8896 100644 --- a/proxy/changelog/unreleased/remove-account-caching.md +++ b/proxy/changelog/unreleased/remove-account-caching.md @@ -2,4 +2,4 @@ Change: Remove accounts caching We removed the accounts cache in order to avoid problems with accounts that have been updated in the accounts service. -https://github.com/owncloud/ocis-proxy/pull/100 +https://github.com/owncloud/ocis/proxy/pull/100 diff --git a/proxy/changelog/unreleased/settings-in-example-config.md b/proxy/changelog/unreleased/settings-in-example-config.md index 1828e18e37..54d8136101 100644 --- a/proxy/changelog/unreleased/settings-in-example-config.md +++ b/proxy/changelog/unreleased/settings-in-example-config.md @@ -3,4 +3,4 @@ Bugfix: Add settings API and app endpoints to example config We had the ocis-settings API and app endpoints in the builtin config already, but they were missing in the example config. Added them for consistency. -https://github.com/owncloud/ocis-proxy/pull/93 +https://github.com/owncloud/ocis/proxy/pull/93 diff --git a/proxy/cmd/ocis-proxy/main.go b/proxy/cmd/ocis-proxy/main.go index b5d6282fd9..115f1b00f6 100644 --- a/proxy/cmd/ocis-proxy/main.go +++ b/proxy/cmd/ocis-proxy/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/ocis-proxy/pkg/command" + "github.com/owncloud/ocis/proxy/pkg/command" ) func main() { diff --git a/proxy/go.mod b/proxy/go.mod index f1a8865a8b..39877d4b05 100644 --- a/proxy/go.mod +++ b/proxy/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis-proxy +module github.com/owncloud/ocis/proxy go 1.13 diff --git a/proxy/go.sum b/proxy/go.sum index b1aedda8d2..ab5481686c 100644 --- a/proxy/go.sum +++ b/proxy/go.sum @@ -1071,12 +1071,6 @@ github.com/owncloud/ocis-pkg/v2 v2.4.0 h1:/3ZOd4txtwjiNKJA9iLT9BjrJw5YgHSX13fQR4 github.com/owncloud/ocis-pkg/v2 v2.4.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43/go.mod h1:AeXZVHKEU+9Xt4+/lkHE5rx+sJH2if9dIrUGLhe+JOY= -github.com/owncloud/ocis-settings v0.3.0 h1:w1wdqJiMtRNJ5B7sQemvtFQQod31G6dR468GxAV0Y2g= -github.com/owncloud/ocis-settings v0.3.0/go.mod h1:vRge9QDkOsc6j76gPBmZs1Z5uOPrV4DIkZCgZCEFwBA= -github.com/owncloud/ocis-settings v0.3.2-0.20200827134219-0f9e141699e5 h1:nkgYnHBFmh7EJn1U21K0/t3gnnDlXcPnOj6Jw8jL1gE= -github.com/owncloud/ocis-settings v0.3.2-0.20200827134219-0f9e141699e5/go.mod h1:vRge9QDkOsc6j76gPBmZs1Z5uOPrV4DIkZCgZCEFwBA= -github.com/owncloud/ocis-settings v0.3.2-0.20200827192608-ad983f1e85c1 h1:mI8zZni05KYJqsdsbhVtswWt5q+kbLJ9gtlPoGE0jSY= -github.com/owncloud/ocis-settings v0.3.2-0.20200827192608-ad983f1e85c1/go.mod h1:vRge9QDkOsc6j76gPBmZs1Z5uOPrV4DIkZCgZCEFwBA= github.com/owncloud/ocis-settings v0.3.2-0.20200828130413-0cc0f5bf26fe h1:kiU5lz12R0LNJE1/zI2vxesZPWm6BvSO7hvZC8yOoAc= github.com/owncloud/ocis-settings v0.3.2-0.20200828130413-0cc0f5bf26fe/go.mod h1:vRge9QDkOsc6j76gPBmZs1Z5uOPrV4DIkZCgZCEFwBA= github.com/owncloud/ocis-store v0.0.0-20200716140351-f9670592fb7b h1:tjfH02oEawuMdMt3pJdCjFyuWgNRUjV7rdjoTF56Mrw= diff --git a/proxy/pkg/command/health.go b/proxy/pkg/command/health.go index 39210e4d8a..2c91138643 100644 --- a/proxy/pkg/command/health.go +++ b/proxy/pkg/command/health.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-proxy/pkg/config" - "github.com/owncloud/ocis-proxy/pkg/flagset" + "github.com/owncloud/ocis/proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/flagset" ) // Health is the entrypoint for the health command. diff --git a/proxy/pkg/command/root.go b/proxy/pkg/command/root.go index 13f0d9d175..005a41b54e 100644 --- a/proxy/pkg/command/root.go +++ b/proxy/pkg/command/root.go @@ -6,9 +6,9 @@ import ( "github.com/micro/cli/v2" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-proxy/pkg/config" - "github.com/owncloud/ocis-proxy/pkg/flagset" - "github.com/owncloud/ocis-proxy/pkg/version" + "github.com/owncloud/ocis/proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/flagset" + "github.com/owncloud/ocis/proxy/pkg/version" "github.com/spf13/viper" ) diff --git a/proxy/pkg/command/server.go b/proxy/pkg/command/server.go index d782e294d0..e3ab9cb3c5 100644 --- a/proxy/pkg/command/server.go +++ b/proxy/pkg/command/server.go @@ -23,14 +23,14 @@ import ( zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" acc "github.com/owncloud/ocis-accounts/pkg/proto/v0" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-proxy/pkg/config" - "github.com/owncloud/ocis-proxy/pkg/cs3" - "github.com/owncloud/ocis-proxy/pkg/flagset" - "github.com/owncloud/ocis-proxy/pkg/metrics" - "github.com/owncloud/ocis-proxy/pkg/middleware" - "github.com/owncloud/ocis-proxy/pkg/proxy" - "github.com/owncloud/ocis-proxy/pkg/server/debug" - proxyHTTP "github.com/owncloud/ocis-proxy/pkg/server/http" + "github.com/owncloud/ocis/proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/cs3" + "github.com/owncloud/ocis/proxy/pkg/flagset" + "github.com/owncloud/ocis/proxy/pkg/metrics" + "github.com/owncloud/ocis/proxy/pkg/middleware" + "github.com/owncloud/ocis/proxy/pkg/proxy" + "github.com/owncloud/ocis/proxy/pkg/server/debug" + proxyHTTP "github.com/owncloud/ocis/proxy/pkg/server/http" settings "github.com/owncloud/ocis-settings/pkg/proto/v0" storepb "github.com/owncloud/ocis-store/pkg/proto/v0" "go.opencensus.io/stats/view" @@ -256,7 +256,7 @@ func loadMiddlewares(ctx context.Context, l log.Logger, cfg *config.Config) alic ) // TODO this won't work with a registry other than mdns. Look into Micro's client initialization. - // https://github.com/owncloud/ocis-proxy/issues/38 + // https://github.com/owncloud/ocis/proxy/issues/38 accounts := acc.NewAccountsService("com.owncloud.api.accounts", mclient.DefaultClient) roles := settings.NewRoleService("com.owncloud.api.settings", mclient.DefaultClient) diff --git a/proxy/pkg/flagset/flagset.go b/proxy/pkg/flagset/flagset.go index b4ba5f556c..f585fb3614 100644 --- a/proxy/pkg/flagset/flagset.go +++ b/proxy/pkg/flagset/flagset.go @@ -2,7 +2,7 @@ package flagset import ( "github.com/micro/cli/v2" - "github.com/owncloud/ocis-proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/config" ) // RootWithConfig applies cfg to the root flagset diff --git a/proxy/pkg/middleware/account_uuid_test.go b/proxy/pkg/middleware/account_uuid_test.go index 0debfb7d58..6fcd545533 100644 --- a/proxy/pkg/middleware/account_uuid_test.go +++ b/proxy/pkg/middleware/account_uuid_test.go @@ -11,7 +11,7 @@ import ( "github.com/owncloud/ocis-accounts/pkg/proto/v0" "github.com/owncloud/ocis-pkg/v2/log" "github.com/owncloud/ocis-pkg/v2/oidc" - "github.com/owncloud/ocis-proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/config" settings "github.com/owncloud/ocis-settings/pkg/proto/v0" ) diff --git a/proxy/pkg/middleware/openidconnect.go b/proxy/pkg/middleware/openidconnect.go index a4eb51471b..d6c358cbde 100644 --- a/proxy/pkg/middleware/openidconnect.go +++ b/proxy/pkg/middleware/openidconnect.go @@ -8,7 +8,7 @@ import ( "github.com/coreos/go-oidc" ocisoidc "github.com/owncloud/ocis-pkg/v2/oidc" - "github.com/owncloud/ocis-proxy/pkg/cache" + "github.com/owncloud/ocis/proxy/pkg/cache" "golang.org/x/oauth2" ) diff --git a/proxy/pkg/middleware/options.go b/proxy/pkg/middleware/options.go index a67ba5e28a..6edb3f6947 100644 --- a/proxy/pkg/middleware/options.go +++ b/proxy/pkg/middleware/options.go @@ -7,7 +7,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" acc "github.com/owncloud/ocis-accounts/pkg/proto/v0" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/config" storepb "github.com/owncloud/ocis-store/pkg/proto/v0" ) diff --git a/proxy/pkg/middleware/presigned_url.go b/proxy/pkg/middleware/presigned_url.go index 8993864e6f..d267ae5717 100644 --- a/proxy/pkg/middleware/presigned_url.go +++ b/proxy/pkg/middleware/presigned_url.go @@ -10,7 +10,7 @@ import ( "github.com/owncloud/ocis-pkg/v2/log" ocisoidc "github.com/owncloud/ocis-pkg/v2/oidc" - "github.com/owncloud/ocis-proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/config" storepb "github.com/owncloud/ocis-store/pkg/proto/v0" "golang.org/x/crypto/pbkdf2" ) diff --git a/proxy/pkg/proxy/option.go b/proxy/pkg/proxy/option.go index b2de9124dd..204fd41dcd 100644 --- a/proxy/pkg/proxy/option.go +++ b/proxy/pkg/proxy/option.go @@ -2,7 +2,7 @@ package proxy import ( "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/config" ) // Option defines a single option function. diff --git a/proxy/pkg/proxy/policy/selector.go b/proxy/pkg/proxy/policy/selector.go index 872f8e3402..2f838f6128 100644 --- a/proxy/pkg/proxy/policy/selector.go +++ b/proxy/pkg/proxy/policy/selector.go @@ -8,7 +8,7 @@ import ( "github.com/micro/go-micro/v2/client/grpc" accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0" "github.com/owncloud/ocis-pkg/v2/oidc" - "github.com/owncloud/ocis-proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/config" ) var ( diff --git a/proxy/pkg/proxy/policy/selector_test.go b/proxy/pkg/proxy/policy/selector_test.go index bcb76fa961..b2cabc3509 100644 --- a/proxy/pkg/proxy/policy/selector_test.go +++ b/proxy/pkg/proxy/policy/selector_test.go @@ -9,7 +9,7 @@ import ( "github.com/micro/go-micro/v2/client" "github.com/owncloud/ocis-accounts/pkg/proto/v0" "github.com/owncloud/ocis-pkg/v2/oidc" - "github.com/owncloud/ocis-proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/config" ) func TestStaticSelector(t *testing.T) { diff --git a/proxy/pkg/proxy/proxy.go b/proxy/pkg/proxy/proxy.go index 1c750a305b..62eb9b734d 100644 --- a/proxy/pkg/proxy/proxy.go +++ b/proxy/pkg/proxy/proxy.go @@ -8,12 +8,12 @@ import ( "regexp" "strings" - "github.com/owncloud/ocis-proxy/pkg/proxy/policy" + "github.com/owncloud/ocis/proxy/pkg/proxy/policy" "go.opencensus.io/plugin/ochttp/propagation/tracecontext" "go.opencensus.io/trace" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/config" ) // MultiHostReverseProxy extends httputil to support multiple hosts with diffent policies diff --git a/proxy/pkg/proxy/proxy_integration_test.go b/proxy/pkg/proxy/proxy_integration_test.go index 3485c81cb0..a23c55ef34 100644 --- a/proxy/pkg/proxy/proxy_integration_test.go +++ b/proxy/pkg/proxy/proxy_integration_test.go @@ -10,7 +10,7 @@ import ( "net/url" "testing" - "github.com/owncloud/ocis-proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/config" ) func TestProxyIntegration(t *testing.T) { diff --git a/proxy/pkg/proxy/proxy_test.go b/proxy/pkg/proxy/proxy_test.go index 7a5d3d64bb..2e5e973407 100644 --- a/proxy/pkg/proxy/proxy_test.go +++ b/proxy/pkg/proxy/proxy_test.go @@ -4,7 +4,7 @@ import ( "net/url" "testing" - "github.com/owncloud/ocis-proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/config" ) func TestPrefixRouteMatcher(t *testing.T) { diff --git a/proxy/pkg/server/debug/option.go b/proxy/pkg/server/debug/option.go index 14032e6a27..a449fbeab2 100644 --- a/proxy/pkg/server/debug/option.go +++ b/proxy/pkg/server/debug/option.go @@ -4,7 +4,7 @@ import ( "context" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/config" ) // Option defines a single option function. diff --git a/proxy/pkg/server/debug/server.go b/proxy/pkg/server/debug/server.go index 6e88455bc6..6b17e8dd65 100644 --- a/proxy/pkg/server/debug/server.go +++ b/proxy/pkg/server/debug/server.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/owncloud/ocis-pkg/v2/service/debug" - "github.com/owncloud/ocis-proxy/pkg/config" - "github.com/owncloud/ocis-proxy/pkg/version" + "github.com/owncloud/ocis/proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/version" ) // Server initializes the debug service and server. diff --git a/proxy/pkg/server/http/option.go b/proxy/pkg/server/http/option.go index 0a93bab2e9..cc6d80b9f1 100644 --- a/proxy/pkg/server/http/option.go +++ b/proxy/pkg/server/http/option.go @@ -7,8 +7,8 @@ import ( "github.com/justinas/alice" "github.com/micro/cli/v2" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-proxy/pkg/config" - "github.com/owncloud/ocis-proxy/pkg/metrics" + "github.com/owncloud/ocis/proxy/pkg/config" + "github.com/owncloud/ocis/proxy/pkg/metrics" ) // Option defines a single option function. diff --git a/proxy/pkg/server/http/server.go b/proxy/pkg/server/http/server.go index 292ac0e9da..1195ba0b95 100644 --- a/proxy/pkg/server/http/server.go +++ b/proxy/pkg/server/http/server.go @@ -5,8 +5,8 @@ import ( "os" svc "github.com/owncloud/ocis-pkg/v2/service/http" - "github.com/owncloud/ocis-proxy/pkg/crypto" - "github.com/owncloud/ocis-proxy/pkg/version" + "github.com/owncloud/ocis/proxy/pkg/crypto" + "github.com/owncloud/ocis/proxy/pkg/version" ) // Server initializes the http service and server.