mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2025-12-31 01:10:20 -06:00
update konnectd import paths and module name
This commit is contained in:
A.Unger
2
konnectd/.github/config.yml
vendored
2
konnectd/.github/config.yml
vendored
@@ -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-konnectd/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/konnectd/blob/master/changelog/README.md) item based on your changes.
|
||||
updateDocsWhiteList:
|
||||
- Tests-only
|
||||
- tests-only
|
||||
|
||||
@@ -2,84 +2,84 @@
|
||||
|
||||
The following sections list the changes in ocis-konnectd 0.3.2.
|
||||
|
||||
[0.3.2]: https://github.com/owncloud/ocis-konnectd/compare/v0.3.1...v0.3.2
|
||||
[0.3.2]: https://github.com/owncloud/ocis/konnectd/compare/v0.3.1...v0.3.2
|
||||
|
||||
## Summary
|
||||
|
||||
* Bugfix - Add silent redirect url: [#69](https://github.com/owncloud/ocis-konnectd/issues/69)
|
||||
* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#71](https://github.com/owncloud/ocis-konnectd/pull/71)
|
||||
* Bugfix - Add silent redirect url: [#69](https://github.com/owncloud/ocis/konnectd/issues/69)
|
||||
* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#71](https://github.com/owncloud/ocis/konnectd/pull/71)
|
||||
|
||||
## Details
|
||||
|
||||
* Bugfix - Add silent redirect url: [#69](https://github.com/owncloud/ocis-konnectd/issues/69)
|
||||
* Bugfix - Add silent redirect url: [#69](https://github.com/owncloud/ocis/konnectd/issues/69)
|
||||
|
||||
Adds the oidc-silent-redirect.html phoenix uses to silently refresh access tokens to the
|
||||
default identifier-registration.yml
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/issues/69
|
||||
https://github.com/owncloud/ocis-konnectd/pull/70
|
||||
https://github.com/owncloud/ocis/konnectd/issues/69
|
||||
https://github.com/owncloud/ocis/konnectd/pull/70
|
||||
|
||||
|
||||
* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#71](https://github.com/owncloud/ocis-konnectd/pull/71)
|
||||
* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#71](https://github.com/owncloud/ocis/konnectd/pull/71)
|
||||
|
||||
ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead.
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/pull/71
|
||||
https://github.com/owncloud/ocis/konnectd/pull/71
|
||||
|
||||
# Changelog for [0.3.1] (2020-04-14)
|
||||
|
||||
The following sections list the changes in ocis-konnectd 0.3.1.
|
||||
|
||||
[0.3.1]: https://github.com/owncloud/ocis-konnectd/compare/v0.3.0...v0.3.1
|
||||
[0.3.1]: https://github.com/owncloud/ocis/konnectd/compare/v0.3.0...v0.3.1
|
||||
|
||||
## Summary
|
||||
|
||||
* Bugfix - Include the assets for #62: [#64](https://github.com/owncloud/ocis-konnectd/pull/64)
|
||||
* Bugfix - Include the assets for #62: [#64](https://github.com/owncloud/ocis/konnectd/pull/64)
|
||||
|
||||
## Details
|
||||
|
||||
* Bugfix - Include the assets for #62: [#64](https://github.com/owncloud/ocis-konnectd/pull/64)
|
||||
* Bugfix - Include the assets for #62: [#64](https://github.com/owncloud/ocis/konnectd/pull/64)
|
||||
|
||||
PR 62 introduced new client names. These assets needs to be generated in the embed.go file.
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/pull/64
|
||||
https://github.com/owncloud/ocis/konnectd/pull/64
|
||||
|
||||
# Changelog for [0.3.0] (2020-04-14)
|
||||
|
||||
The following sections list the changes in ocis-konnectd 0.3.0.
|
||||
|
||||
[0.3.0]: https://github.com/owncloud/ocis-konnectd/compare/v0.2.0...v0.3.0
|
||||
[0.3.0]: https://github.com/owncloud/ocis/konnectd/compare/v0.2.0...v0.3.0
|
||||
|
||||
## Summary
|
||||
|
||||
* Bugfix - Redirect to the provided uri: [#26](https://github.com/owncloud/ocis-konnectd/issues/26)
|
||||
* Change - Add a trailing slash to trusted redirect uris: [#26](https://github.com/owncloud/ocis-konnectd/issues/26)
|
||||
* Change - Improve client identifiers for end users: [#62](https://github.com/owncloud/ocis-konnectd/pull/62)
|
||||
* Bugfix - Redirect to the provided uri: [#26](https://github.com/owncloud/ocis/konnectd/issues/26)
|
||||
* Change - Add a trailing slash to trusted redirect uris: [#26](https://github.com/owncloud/ocis/konnectd/issues/26)
|
||||
* Change - Improve client identifiers for end users: [#62](https://github.com/owncloud/ocis/konnectd/pull/62)
|
||||
* Enhancement - Use upstream version of konnect library: [#14](https://github.com/owncloud/product/issues/14)
|
||||
|
||||
## Details
|
||||
|
||||
* Bugfix - Redirect to the provided uri: [#26](https://github.com/owncloud/ocis-konnectd/issues/26)
|
||||
* Bugfix - Redirect to the provided uri: [#26](https://github.com/owncloud/ocis/konnectd/issues/26)
|
||||
|
||||
The phoenix client was not set as trusted therefore when logging out the user was redirected to a
|
||||
default page instead of the provided url.
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/issues/26
|
||||
https://github.com/owncloud/ocis/konnectd/issues/26
|
||||
|
||||
|
||||
* Change - Add a trailing slash to trusted redirect uris: [#26](https://github.com/owncloud/ocis-konnectd/issues/26)
|
||||
* Change - Add a trailing slash to trusted redirect uris: [#26](https://github.com/owncloud/ocis/konnectd/issues/26)
|
||||
|
||||
Phoenix changed the redirect uri to `<baseUrl>#/login` that means it will contain a trailing
|
||||
slash after the base url.
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/issues/26
|
||||
https://github.com/owncloud/ocis/konnectd/issues/26
|
||||
|
||||
|
||||
* Change - Improve client identifiers for end users: [#62](https://github.com/owncloud/ocis-konnectd/pull/62)
|
||||
* Change - Improve client identifiers for end users: [#62](https://github.com/owncloud/ocis/konnectd/pull/62)
|
||||
|
||||
Improved end user facing client names in default identifier-registration.yaml
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/pull/62
|
||||
https://github.com/owncloud/ocis/konnectd/pull/62
|
||||
|
||||
|
||||
* Enhancement - Use upstream version of konnect library: [#14](https://github.com/owncloud/product/issues/14)
|
||||
@@ -90,56 +90,56 @@ The following sections list the changes in ocis-konnectd 0.3.0.
|
||||
|
||||
The following sections list the changes in ocis-konnectd 0.2.0.
|
||||
|
||||
[0.2.0]: https://github.com/owncloud/ocis-konnectd/compare/v0.1.0...v0.2.0
|
||||
[0.2.0]: https://github.com/owncloud/ocis/konnectd/compare/v0.1.0...v0.2.0
|
||||
|
||||
## Summary
|
||||
|
||||
* Enhancement - Change default config for single-binary: [#55](https://github.com/owncloud/ocis-konnectd/pull/55)
|
||||
* Enhancement - Change default config for single-binary: [#55](https://github.com/owncloud/ocis/konnectd/pull/55)
|
||||
|
||||
## Details
|
||||
|
||||
* Enhancement - Change default config for single-binary: [#55](https://github.com/owncloud/ocis-konnectd/pull/55)
|
||||
* Enhancement - Change default config for single-binary: [#55](https://github.com/owncloud/ocis/konnectd/pull/55)
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/pull/55
|
||||
https://github.com/owncloud/ocis/konnectd/pull/55
|
||||
|
||||
# Changelog for [0.1.0] (2020-03-18)
|
||||
|
||||
The following sections list the changes in ocis-konnectd 0.1.0.
|
||||
|
||||
[0.1.0]: https://github.com/owncloud/ocis-konnectd/compare/66337bb4dad4a3202880323adf7a51a1a3bb4085...v0.1.0
|
||||
[0.1.0]: https://github.com/owncloud/ocis/konnectd/compare/66337bb4dad4a3202880323adf7a51a1a3bb4085...v0.1.0
|
||||
|
||||
## Summary
|
||||
|
||||
* Bugfix - Generate a random CSP-Nonce in the webapp: [#17](https://github.com/owncloud/ocis-konnectd/issues/17)
|
||||
* Change - Dummy index.html is not required anymore by upstream: [#25](https://github.com/owncloud/ocis-konnectd/issues/25)
|
||||
* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis-konnectd/issues/1)
|
||||
* Change - Use glauth as ldap backend, default to running behind ocis-proxy: [#52](https://github.com/owncloud/ocis-konnectd/pull/52)
|
||||
* Bugfix - Generate a random CSP-Nonce in the webapp: [#17](https://github.com/owncloud/ocis/konnectd/issues/17)
|
||||
* Change - Dummy index.html is not required anymore by upstream: [#25](https://github.com/owncloud/ocis/konnectd/issues/25)
|
||||
* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis/konnectd/issues/1)
|
||||
* Change - Use glauth as ldap backend, default to running behind ocis-proxy: [#52](https://github.com/owncloud/ocis/konnectd/pull/52)
|
||||
|
||||
## Details
|
||||
|
||||
* Bugfix - Generate a random CSP-Nonce in the webapp: [#17](https://github.com/owncloud/ocis-konnectd/issues/17)
|
||||
* Bugfix - Generate a random CSP-Nonce in the webapp: [#17](https://github.com/owncloud/ocis/konnectd/issues/17)
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/issues/17
|
||||
https://github.com/owncloud/ocis-konnectd/pull/29
|
||||
https://github.com/owncloud/ocis/konnectd/issues/17
|
||||
https://github.com/owncloud/ocis/konnectd/pull/29
|
||||
|
||||
|
||||
* Change - Dummy index.html is not required anymore by upstream: [#25](https://github.com/owncloud/ocis-konnectd/issues/25)
|
||||
* Change - Dummy index.html is not required anymore by upstream: [#25](https://github.com/owncloud/ocis/konnectd/issues/25)
|
||||
|
||||
The workaround was required as identifier webapp was mandatory, but we serve it from memory.
|
||||
This also introduces --disable-identifier-webapp flag.
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/issues/25
|
||||
https://github.com/owncloud/ocis/konnectd/issues/25
|
||||
|
||||
|
||||
* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis-konnectd/issues/1)
|
||||
* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis/konnectd/issues/1)
|
||||
|
||||
Just prepare an initial basic version to serve konnectd embedded into our microservice
|
||||
infrastructure in the scope of the ownCloud Infinite Scale project.
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/issues/1
|
||||
https://github.com/owncloud/ocis/konnectd/issues/1
|
||||
|
||||
|
||||
* Change - Use glauth as ldap backend, default to running behind ocis-proxy: [#52](https://github.com/owncloud/ocis-konnectd/pull/52)
|
||||
* Change - Use glauth as ldap backend, default to running behind ocis-proxy: [#52](https://github.com/owncloud/ocis/konnectd/pull/52)
|
||||
|
||||
We changed the default configuration to integrate better with ocis.
|
||||
|
||||
@@ -147,5 +147,5 @@ The following sections list the changes in ocis-konnectd 0.1.0.
|
||||
the tls offloading. Clients are supposed to use the ocis-proxy endpoint
|
||||
`https://localhost:9200`
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/pull/52
|
||||
https://github.com/owncloud/ocis/konnectd/pull/52
|
||||
|
||||
|
||||
@@ -3,4 +3,4 @@ Change: Dummy index.html is not required anymore by upstream
|
||||
The workaround was required as identifier webapp was mandatory, but
|
||||
we serve it from memory. This also introduces --disable-identifier-webapp flag.
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/issues/25
|
||||
https://github.com/owncloud/ocis/konnectd/issues/25
|
||||
|
||||
@@ -4,4 +4,4 @@ Just prepare an initial basic version to serve konnectd embedded into our
|
||||
microservice infrastructure in the scope of the ownCloud Infinite Scale
|
||||
project.
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/issues/1
|
||||
https://github.com/owncloud/ocis/konnectd/issues/1
|
||||
|
||||
@@ -5,4 +5,4 @@ We changed the default configuration to integrate better with ocis.
|
||||
The default ldap port changes to 9125, which is used by ocis-glauth and we use ocis-proxy to do the tls offloading.
|
||||
Clients are supposed to use the ocis-proxy endpoint `https://localhost:9200`
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/pull/52
|
||||
https://github.com/owncloud/ocis/konnectd/pull/52
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Bugfix: Generate a random CSP-Nonce in the webapp
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/issues/17
|
||||
https://github.com/owncloud/ocis-konnectd/pull/29
|
||||
https://github.com/owncloud/ocis/konnectd/issues/17
|
||||
https://github.com/owncloud/ocis/konnectd/pull/29
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
Enhancement: Change default config for single-binary
|
||||
Enhancement: Change default config for single-binary
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/pull/55
|
||||
https://github.com/owncloud/ocis/konnectd/pull/55
|
||||
|
||||
@@ -2,4 +2,4 @@ Change: add a trailing slash to trusted redirect uris
|
||||
|
||||
Phoenix changed the redirect uri to `<baseUrl>#/login` that means it will contain a trailing slash after the base url.
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/issues/26
|
||||
https://github.com/owncloud/ocis/konnectd/issues/26
|
||||
|
||||
@@ -2,4 +2,4 @@ Change: improve client identifiers for end users
|
||||
|
||||
Improved end user facing client names in default identifier-registration.yaml
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/pull/62
|
||||
https://github.com/owncloud/ocis/konnectd/pull/62
|
||||
|
||||
@@ -2,4 +2,4 @@ Bugfix: redirect to the provided uri
|
||||
|
||||
The phoenix client was not set as trusted therefore when logging out the user was redirected to a default page instead of the provided url.
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/issues/26
|
||||
https://github.com/owncloud/ocis/konnectd/issues/26
|
||||
|
||||
@@ -2,4 +2,4 @@ Bugfix: Include the assets for #62
|
||||
|
||||
PR 62 introduced new client names. These assets needs to be generated in the embed.go file.
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/pull/64
|
||||
https://github.com/owncloud/ocis/konnectd/pull/64
|
||||
|
||||
@@ -2,5 +2,5 @@ Bugfix: add silent redirect url
|
||||
|
||||
Adds the oidc-silent-redirect.html phoenix uses to silently refresh access tokens to the default identifier-registration.yml
|
||||
|
||||
https://github.com/owncloud/ocis-konnectd/issues/69
|
||||
https://github.com/owncloud/ocis-konnectd/pull/70
|
||||
https://github.com/owncloud/ocis/konnectd/issues/69
|
||||
https://github.com/owncloud/ocis/konnectd/pull/70
|
||||
|
||||
@@ -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-konnectd/pull/71
|
||||
https://github.com/owncloud/ocis/konnectd/pull/71
|
||||
|
||||
@@ -10,17 +10,17 @@ The following sections list the changes in ocis-konnectd {{ .Version }}.
|
||||
{{ if ne (len $allVersions) $next -}}
|
||||
{{ $previousVersion := (index $allVersions $next).Version -}}
|
||||
{{ if eq .Version "unreleased" -}}
|
||||
[{{ .Version }}]: https://github.com/owncloud/ocis-konnectd/compare/v{{ $previousVersion }}...master
|
||||
[{{ .Version }}]: https://github.com/owncloud/ocis/konnectd/compare/v{{ $previousVersion }}...master
|
||||
|
||||
{{ else -}}
|
||||
[{{ .Version }}]: https://github.com/owncloud/ocis-konnectd/compare/v{{ $previousVersion }}...v{{ .Version }}
|
||||
[{{ .Version }}]: https://github.com/owncloud/ocis/konnectd/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-konnectd/compare/66337bb4dad4a3202880323adf7a51a1a3bb4085...v{{ .Version }}
|
||||
[{{ .Version }}]: https://github.com/owncloud/ocis/konnectd/compare/66337bb4dad4a3202880323adf7a51a1a3bb4085...v{{ .Version }}
|
||||
|
||||
{{ end -}}
|
||||
{{ else -}}
|
||||
|
||||
@@ -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-konnectd/issues/1234
|
||||
https://github.com/owncloud/ocis-konnectd/pull/55555
|
||||
https://github.com/owncloud/ocis/konnectd/issues/1234
|
||||
https://github.com/owncloud/ocis/konnectd/pull/55555
|
||||
|
||||
@@ -3,7 +3,7 @@ package main
|
||||
import (
|
||||
"os"
|
||||
|
||||
"github.com/owncloud/ocis-konnectd/pkg/command"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/command"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
||||
118
konnectd/config/identifier-registration.yaml
Normal file
118
konnectd/config/identifier-registration.yaml
Normal file
@@ -0,0 +1,118 @@
|
||||
---
|
||||
|
||||
# OpenID Connect client registry.
|
||||
clients:
|
||||
- id: phoenix
|
||||
name: ownCloud web app
|
||||
application_type: web
|
||||
insecure: yes
|
||||
trusted: yes
|
||||
redirect_uris:
|
||||
- https://localhost:9200/
|
||||
- https://localhost:9200/oidc-callback.html
|
||||
- https://localhost:9200/oidc-silent-redirect.html
|
||||
- http://localhost:9100/
|
||||
- http://localhost:9100/oidc-callback.html
|
||||
- http://localhost:9100/oidc-silent-redirect.html
|
||||
origins:
|
||||
- https://localhost:9200
|
||||
- http://localhost:9100
|
||||
|
||||
- id: ocis-explorer.js
|
||||
name: OCIS Graph Explorer
|
||||
trusted: yes
|
||||
application_type: web
|
||||
insecure: yes
|
||||
|
||||
- id: xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69
|
||||
secret: UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh
|
||||
name: ownCloud desktop app
|
||||
application_type: native
|
||||
insecure: true
|
||||
|
||||
- id: e4rAsNUSIUs0lF4nbv9FmCeUkTlV9GdgTLDH1b5uie7syb90SzEVrbN7HIpmWJeD
|
||||
secret: dInFYGV33xKzhbRmpqQltYNdfLdJIfJ9L5ISoKhNoT9qZftpdWSP71VrpGR9pmoD
|
||||
name: ownCloud Android app
|
||||
application_type: native
|
||||
redirect_uris:
|
||||
- oc://android.owncloud.com
|
||||
|
||||
- id: mxd5OQDk6es5LzOzRvidJNfXLUZS2oN3oUFeXPP8LpPrhx3UroJFduGEYIBOxkY1
|
||||
secret: KFeFWWEZO9TkisIQzR3fo7hfiMXlOpaqP8CFuTbSHzV1TUuGECglPxpiVKJfOXIx
|
||||
name: ownCloud iOS app
|
||||
application_type: native
|
||||
redirect_uris:
|
||||
- oc://ios.owncloud.com
|
||||
- oc.ios://ios.owncloud.com
|
||||
|
||||
|
||||
# - id: playground-trusted.js
|
||||
# name: Trusted OIDC Playground
|
||||
# trusted: yes
|
||||
# application_type: web
|
||||
# redirect_uris:
|
||||
# - https://my-host:8509/
|
||||
# origins:
|
||||
# - https://my-host:8509
|
||||
|
||||
# - id: playground-trusted.js
|
||||
# name: Trusted Insecure OIDC Playground
|
||||
# trusted: yes
|
||||
# application_type: web
|
||||
# insecure: yes
|
||||
|
||||
# - id: client-with-keys
|
||||
# secret: super
|
||||
# application_type: native
|
||||
# redirect_uris:
|
||||
# - http://localhost
|
||||
# trusted_scopes:
|
||||
# - konnect/guestok
|
||||
# - kopano/kwm
|
||||
# jwks:
|
||||
# keys:
|
||||
# - kty: EC
|
||||
# use: sig
|
||||
# kid: client-with-keys-key-1
|
||||
# crv: P-256
|
||||
# x: RTZpWoRbjwX1YavmSHVBj6Cy3Yzdkkp6QLvTGB22D0c
|
||||
# y: jeavjwcX0xlDSchFcBMzXSU7wGs2VPpNxWCwmxFvmF0
|
||||
# request_object_signing_alg: ES256
|
||||
|
||||
# - id: first
|
||||
# secret: lala
|
||||
# application_type: native
|
||||
# redirect_uris:
|
||||
# - my://app
|
||||
|
||||
# - id: second
|
||||
# secret: lulu
|
||||
# application_type: native
|
||||
# redirect_uris:
|
||||
# - http://localhost
|
||||
|
||||
# External authority registry.
|
||||
authorities:
|
||||
# - id: my-univention
|
||||
# name: Univention
|
||||
# client_id: kopano-konnect
|
||||
# authority_type: oidc
|
||||
# jwks:
|
||||
# keys:
|
||||
# - kty: EC
|
||||
# use: sig
|
||||
# kid: example-key-1
|
||||
# crv: P-256
|
||||
# x: RTZpWoRbjwX1YavmSHVBj6Cy3Yzdkkp6QLvTGB22D0c
|
||||
# y: jeavjwcX0xlDSchFcBMzXSU7wGs2VPpNxWCwmxFvmF0
|
||||
# default: yes
|
||||
# authorization_endpoint: https://my-univention/signin/v1/identifier/_/authorize
|
||||
# response_type: id_token
|
||||
# scopes:
|
||||
# - openid
|
||||
# - profile
|
||||
# identity_claim_name: preferred_username
|
||||
# identity_aliases:
|
||||
# external-user-a: local-user-a
|
||||
# external-user-b: local-user-b
|
||||
# identity_alias_required: true
|
||||
@@ -1,4 +1,4 @@
|
||||
module github.com/owncloud/ocis-konnectd
|
||||
module github.com/owncloud/ocis/konnectd
|
||||
|
||||
go 1.13
|
||||
|
||||
@@ -28,3 +28,5 @@ require (
|
||||
stash.kopano.io/kc/konnect v0.30.0
|
||||
stash.kopano.io/kgol/rndm v1.1.0
|
||||
)
|
||||
|
||||
replace google.golang.org/grpc => google.golang.org/grpc v1.26.0
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
|
||||
cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
|
||||
@@ -101,7 +100,6 @@ github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
|
||||
github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/cloudflare/cloudflare-go v0.10.2/go.mod h1:qhVI5MKwBGhdNU89ZRz2plgYutcJ5PCekLxXn56w6SY=
|
||||
github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
|
||||
github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
|
||||
@@ -167,8 +165,6 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m
|
||||
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
|
||||
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
|
||||
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
|
||||
github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
|
||||
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||
github.com/eternnoir/gncp v0.0.0-20170707042257-c70df2d0cd68 h1:DHBMBKJK69xBWnD/jNkTN0sOT7nT7I5If9VMsk9Jj5Y=
|
||||
@@ -215,7 +211,6 @@ github.com/go-test/deep v1.0.1 h1:UQhStjbkDClarlmv0am7OXXO4/GaPdCGiUiMTvi28sg=
|
||||
github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
|
||||
github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
|
||||
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
|
||||
github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
|
||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
|
||||
@@ -371,7 +366,6 @@ github.com/lucas-clemente/quic-go v0.13.1 h1:CxtJTXQIh2aboCPk0M6vf530XOov6DZjVBi
|
||||
github.com/lucas-clemente/quic-go v0.13.1/go.mod h1:Vn3/Fb0/77b02SGhQk36KzOUmXgVpFfizUfW5WMaqyU=
|
||||
github.com/lucas-clemente/quic-go v0.14.1 h1:c1aKoBZKOPA+49q96B1wGkibyPP0AxYh45WuAoq+87E=
|
||||
github.com/lucas-clemente/quic-go v0.14.1/go.mod h1:Vn3/Fb0/77b02SGhQk36KzOUmXgVpFfizUfW5WMaqyU=
|
||||
github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
|
||||
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
||||
github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
|
||||
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
||||
@@ -714,10 +708,8 @@ golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm0
|
||||
golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
|
||||
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
|
||||
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
||||
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
|
||||
@@ -773,7 +765,6 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
|
||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
|
||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181019160139-8e24a49d80f8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
@@ -820,10 +811,8 @@ golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxb
|
||||
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-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
||||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
@@ -831,7 +820,6 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
|
||||
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||
@@ -880,18 +868,6 @@ google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvx
|
||||
google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba h1:pRj9OXZbwNtbtZtOB4dLwfK4u+EVRMvP+e9zKkg2grM=
|
||||
google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
|
||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||
google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||
google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
|
||||
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
|
||||
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
|
||||
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
|
||||
google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||
google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=
|
||||
google.golang.org/grpc v1.25.1 h1:wdKvqQk7IttEw92GoRyKG2IDrUIpgpj6H6m81yfeMW0=
|
||||
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
|
||||
google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
|
||||
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
||||
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
|
||||
@@ -937,11 +913,9 @@ gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
|
||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
|
||||
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
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.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"os"
|
||||
"path"
|
||||
|
||||
"github.com/owncloud/ocis-konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package assets
|
||||
|
||||
import (
|
||||
"github.com/owncloud/ocis-konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
)
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"net/http"
|
||||
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/flagset"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/flagset"
|
||||
)
|
||||
|
||||
// Health is the entrypoint for the health command.
|
||||
|
||||
@@ -5,9 +5,9 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/flagset"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/version"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/flagset"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/version"
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/spf13/viper"
|
||||
)
|
||||
|
||||
@@ -14,11 +14,11 @@ import (
|
||||
"github.com/oklog/run"
|
||||
openzipkin "github.com/openzipkin/zipkin-go"
|
||||
zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/flagset"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/metrics"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/server/debug"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/server/http"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/flagset"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/metrics"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/server/debug"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/server/http"
|
||||
"go.opencensus.io/stats/view"
|
||||
"go.opencensus.io/trace"
|
||||
)
|
||||
|
||||
@@ -2,7 +2,7 @@ package flagset
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/config"
|
||||
)
|
||||
|
||||
// RootWithConfig applies cfg to the root flagset
|
||||
|
||||
@@ -3,7 +3,7 @@ package debug
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/owncloud/ocis-konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ import (
|
||||
"io"
|
||||
"net/http"
|
||||
|
||||
"github.com/owncloud/ocis-konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/version"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/version"
|
||||
"github.com/owncloud/ocis-pkg/v2/service/debug"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ import (
|
||||
"context"
|
||||
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/metrics"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/metrics"
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,9 +4,9 @@ import (
|
||||
"crypto/tls"
|
||||
"os"
|
||||
|
||||
"github.com/owncloud/ocis-konnectd/pkg/crypto"
|
||||
svc "github.com/owncloud/ocis-konnectd/pkg/service/v0"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/version"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/crypto"
|
||||
svc "github.com/owncloud/ocis/konnectd/pkg/service/v0"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/version"
|
||||
"github.com/owncloud/ocis-pkg/v2/middleware"
|
||||
"github.com/owncloud/ocis-pkg/v2/service/http"
|
||||
)
|
||||
|
||||
@@ -3,7 +3,7 @@ package svc
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/owncloud/ocis-konnectd/pkg/metrics"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/metrics"
|
||||
)
|
||||
|
||||
// NewInstrument returns a service that instruments metrics.
|
||||
|
||||
@@ -3,7 +3,7 @@ package svc
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/owncloud/ocis-konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/config"
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
)
|
||||
|
||||
|
||||
@@ -10,10 +10,10 @@ import (
|
||||
|
||||
"github.com/go-chi/chi"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/assets"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/config"
|
||||
logw "github.com/owncloud/ocis-konnectd/pkg/log"
|
||||
"github.com/owncloud/ocis-konnectd/pkg/middleware"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/assets"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/config"
|
||||
logw "github.com/owncloud/ocis/konnectd/pkg/log"
|
||||
"github.com/owncloud/ocis/konnectd/pkg/middleware"
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
"stash.kopano.io/kc/konnect/bootstrap"
|
||||
kcconfig "stash.kopano.io/kc/konnect/config"
|
||||
|
||||
Reference in New Issue
Block a user