diff --git a/.travis.yml b/.travis.yml index c5d28cd4..ea5017c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ go: - 1.9 - '1.10' -go_import_path: github.com/coreos/dex +go_import_path: github.com/dexidp/dex services: - postgresql diff --git a/Dockerfile b/Dockerfile index 76fb37da..1c5321d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ FROM golang:1.10.2-alpine RUN apk add --no-cache --update alpine-sdk -COPY . /go/src/github.com/coreos/dex -RUN cd /go/src/github.com/coreos/dex && make release-binary +COPY . /go/src/github.com/dexidp/dex +RUN cd /go/src/github.com/dexidp/dex && make release-binary FROM alpine:3.4 # Dex connectors, such as GitHub and Google logins require root certificates. diff --git a/Documentation/api.md b/Documentation/api.md index c0dadbd7..45c2bd4e 100644 --- a/Documentation/api.md +++ b/Documentation/api.md @@ -31,7 +31,7 @@ $ go get -u github.com/golang/protobuf/{proto,protoc-gen-go} # Download api.proto for a given version. $ DEX_VERSION=v2.0.0-alpha.5 -$ wget https://raw.githubusercontent.com/coreos/dex/${DEX_VERSION}/api/api.proto +$ wget https://raw.githubusercontent.com/dexidp/dex/${DEX_VERSION}/api/api.proto # Generate the Go client bindings. $ protoc --go_out=import_path=dexapi:. api.proto @@ -39,7 +39,7 @@ $ protoc --go_out=import_path=dexapi:. api.proto Client programs can then be written using the generated code. A Go client which uses dex's internally generated code might look like the following: -__NOTE:__ Because dex has the `google.golang.org/grpc` package in its `vendor` directory, gRPC code in `github.com/coreos/dex/api` refers to the vendored copy, not copies in a developers GOPATH. Clients must either regenerate the gRPC Go code or vendor dex and remove its `vendor` directory to run this program. +__NOTE:__ Because dex has the `google.golang.org/grpc` package in its `vendor` directory, gRPC code in `github.com/dexidp/dex/api` refers to the vendored copy, not copies in a developers GOPATH. Clients must either regenerate the gRPC Go code or vendor dex and remove its `vendor` directory to run this program. ``` package main @@ -49,7 +49,7 @@ import ( "fmt" "log" - "github.com/coreos/dex/api" + "github.com/dexidp/dex/api" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/Documentation/connectors/oidc.md b/Documentation/connectors/oidc.md index 56bedd90..bcfd36eb 100644 --- a/Documentation/connectors/oidc.md +++ b/Documentation/connectors/oidc.md @@ -50,6 +50,6 @@ connectors: ``` [oidc-doc]: openid-connect.md -[issue-863]: https://github.com/coreos/dex/issues/863 -[issue-1065]: https://github.com/coreos/dex/issues/1065 +[issue-863]: https://github.com/dexidp/dex/issues/863 +[issue-1065]: https://github.com/dexidp/dex/issues/1065 [azure-ad-v1]: https://github.com/coreos/go-oidc/issues/133 diff --git a/Documentation/dev-releases.md b/Documentation/dev-releases.md index 30adb4d6..1a356703 100644 --- a/Documentation/dev-releases.md +++ b/Documentation/dev-releases.md @@ -11,7 +11,7 @@ This requires the following tools. And the following permissions. -* Push access to the github.com/coreos/dex git repo. +* Push access to the github.com/dexidp/dex git repo. * Push access to the quay.io/coreos/dex Docker repo. ## Tagging the release @@ -37,13 +37,13 @@ git tag -s v2.0.0 ea4c04fde83bd6c48f4d43862c406deb4ea9dba2 Push that tag to the CoreOS repo. ``` -git push git@github.com:coreos/dex.git v2.0.0 +git push git@github.com:dexidp/dex.git v2.0.0 ``` Draft releases on GitHub and summarize the changes since the last release. See previous releases for the expected format. -https://github.com/coreos/dex/releases +https://github.com/dexidp/dex/releases ## Minor releases - create a branch @@ -51,7 +51,7 @@ If the release is a minor release (2.1.0, 2.2.0, etc.) create a branch for futur ```bash git checkout -b v2.1.x tags/v2.1.0 -git push git@github.com:coreos/dex.git v2.1.x +git push git@github.com:dexidp/dex.git v2.1.x ``` ## Patch releases - cherry pick required commits diff --git a/Documentation/getting-started.md b/Documentation/getting-started.md index da54f835..9f724dd8 100644 --- a/Documentation/getting-started.md +++ b/Documentation/getting-started.md @@ -5,8 +5,8 @@ Dex requires a Go installation and a GOPATH configured. For setting up a Go workspace, refer to the [official documentation][go-setup]. Clone it down the correct place, and simply type `make` to compile the dex binary. ``` -$ go get github.com/coreos/dex -$ cd $GOPATH/src/github.com/coreos/dex +$ go get github.com/dexidp/dex +$ cd $GOPATH/src/github.com/dexidp/dex $ make ``` diff --git a/Documentation/integrations.md b/Documentation/integrations.md index 071dc0a7..3a9aa8d0 100644 --- a/Documentation/integrations.md +++ b/Documentation/integrations.md @@ -1,5 +1,5 @@ # Integrations -This document tracks the libraries and tools that are compatible with dex. [Join the community](https://github.com/coreos/dex/), and help us keep the list up-to-date. +This document tracks the libraries and tools that are compatible with dex. [Join the community](https://github.com/dexidp/dex/), and help us keep the list up-to-date. ## Tools diff --git a/Documentation/kubernetes.md b/Documentation/kubernetes.md index 3e364d3c..20693c15 100644 --- a/Documentation/kubernetes.md +++ b/Documentation/kubernetes.md @@ -117,10 +117,10 @@ $ curl -H "Authorization: Bearer $token" -k https://( API server host ):443/api/ [k8s-authz]: http://kubernetes.io/docs/admin/authorization/ [k8s-oidc]: http://kubernetes.io/docs/admin/authentication/#openid-connect-tokens -[trusted-peers]: https://godoc.org/github.com/coreos/dex/storage#Client +[trusted-peers]: https://godoc.org/github.com/dexidp/dex/storage#Client [coreos-kubernetes]: https://github.com/coreos/coreos-kubernetes/ [coreos-baremetal]: https://github.com/coreos/coreos-baremetal/ -[dex-healthz]: https://github.com/coreos/dex/issues/682 +[dex-healthz]: https://github.com/dexidp/dex/issues/682 [github-oauth2]: https://github.com/settings/applications/new [node-port]: http://kubernetes.io/docs/user-guide/services/#type-nodeport [coreos-kubernetes]: https://github.com/coreos/coreos-kubernetes diff --git a/Documentation/oidc-certification-setup.md b/Documentation/oidc-certification-setup.md index 1fb1959e..f54e17b3 100644 --- a/Documentation/oidc-certification-setup.md +++ b/Documentation/oidc-certification-setup.md @@ -13,8 +13,8 @@ Issue number | Relates to [\#376][dex-issue-376] | userinfo_endpoint [\#1052][dex-issue-1052] | auth_time -[dex-issue-376]: https://github.com/coreos/dex/issues/376 -[dex-issue-1052]: https://github.com/coreos/dex/issues/1052 +[dex-issue-376]: https://github.com/dexidp/dex/issues/376 +[dex-issue-1052]: https://github.com/dexidp/dex/issues/1052 ### Setup @@ -159,7 +159,7 @@ OP-OAuth-2nd-Revokes | Incomplete | Unsupported | userinfo_endpoint Once all test cases pass, submit your results by following instructions listed [on the website][oidc-result-submission]. -[dex-install]: https://github.com/coreos/dex/blob/master/Documentation/getting-started.md#building-the-dex-binary +[dex-install]: https://github.com/dexidp/dex/blob/master/Documentation/getting-started.md#building-the-dex-binary [aws-ec2-instance]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/concepts.htmlSSH [aws-ec2-ssh]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AccessingInstancesLinux.html [aws-ec2-quick-start]: http://docs.aws.amazon.com/quickstarts/latest/vmlaunch/step-1-launch-instance.html diff --git a/Documentation/production-users.md b/Documentation/production-users.md index 55a74c9a..8b42713c 100644 --- a/Documentation/production-users.md +++ b/Documentation/production-users.md @@ -1,3 +1,3 @@ # Production users -This document tracks people and use cases for dex in production. [Join the community](https://github.com/coreos/dex/), and help us keep the list up-to-date. \ No newline at end of file +This document tracks people and use cases for dex in production. [Join the community](https://github.com/dexidp/dex/), and help us keep the list up-to-date. \ No newline at end of file diff --git a/Documentation/proposals/user-object.md b/Documentation/proposals/user-object.md index 7ebb8870..e9203d18 100644 --- a/Documentation/proposals/user-object.md +++ b/Documentation/proposals/user-object.md @@ -73,7 +73,7 @@ type RemoteIdentity struct { `UserID` fields will be added to the `AuthRequest`, `AuthCode` and `RefreshToken` structs. When a user logs in successfully through a connector -[here](https://github.com/coreos/dex/blob/95a61454b522edd6643ced36b9d4b9baa8059556/server/handlers.go#L227), +[here](https://github.com/dexidp/dex/blob/95a61454b522edd6643ced36b9d4b9baa8059556/server/handlers.go#L227), the server will attempt to either get the user, or create one if none exists with the remote identity. diff --git a/Documentation/storage.md b/Documentation/storage.md index 91ae7eca..a1457c82 100644 --- a/Documentation/storage.md +++ b/Documentation/storage.md @@ -302,8 +302,8 @@ Each storage implementation bears a large ongoing maintenance cost and needs to Those who still want to construct a proposal for a new storage should review the following packages: -* `github.com/coreos/dex/storage`: Interface definitions which the storage must implement. __NOTE:__ This package is not stable. -* `github.com/coreos/dex/storage/conformance`: Conformance tests which storage implementations must pass. +* `github.com/dexidp/dex/storage`: Interface definitions which the storage must implement. __NOTE:__ This package is not stable. +* `github.com/dexidp/dex/storage/conformance`: Conformance tests which storage implementations must pass. ### New storage option requirements @@ -313,7 +313,7 @@ Any proposal to add a new implementation must address the following: * Transactional requirements: atomic deletes, updates, etc. * Is there an established and reasonable Go client? -[issues-transaction-tests]: https://github.com/coreos/dex/issues/600 +[issues-transaction-tests]: https://github.com/dexidp/dex/issues/600 [k8s-api]: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/api-conventions.md#concurrency-control-and-consistency [psql-conn-options]: https://godoc.org/github.com/lib/pq#hdr-Connection_String_Parameters [crd]: https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/ diff --git a/Documentation/v2.md b/Documentation/v2.md index 5eeea124..6b0c4523 100644 --- a/Documentation/v2.md +++ b/Documentation/v2.md @@ -40,7 +40,7 @@ Notable missing features include: ## Support for dex v1 -Dex v1 will continue to live under the `github.com/coreos/dex` repo on a branch. Bug fixes and minor changes will continue to be accepted, but development of new features by the dex team will largely cease. +Dex v1 will continue to live under the `github.com/dexidp/dex` repo on a branch. Bug fixes and minor changes will continue to be accepted, but development of new features by the dex team will largely cease. [k8s-api-docs]: http://kubernetes.io/docs/api/ [storage-docs]: ./storage.md diff --git a/Makefile b/Makefile index f2bd42a7..1d7db02d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PROJ=dex -ORG_PATH=github.com/coreos +ORG_PATH=github.com/dexidp REPO_PATH=$(ORG_PATH)/$(PROJ) export PATH := $(PWD)/bin:$(PATH) diff --git a/README.md b/README.md index 0b3a5950..33a941ff 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # dex - A federated OpenID Connect provider -[![Travis](https://api.travis-ci.org/coreos/dex.svg)](https://travis-ci.org/coreos/dex) -[![GoDoc](https://godoc.org/github.com/coreos/dex?status.svg)](https://godoc.org/github.com/coreos/dex) -[![Go Report Card](https://goreportcard.com/badge/github.com/coreos/dex)](https://goreportcard.com/report/github.com/coreos/dex) +[![Travis](https://api.travis-ci.org/dexidp/dex.svg)](https://travis-ci.org/dexidp/dex) +[![GoDoc](https://godoc.org/github.com/dexidp/dex?status.svg)](https://godoc.org/github.com/dexidp/dex) +[![Go Report Card](https://goreportcard.com/badge/github.com/dexidp/dex)](https://goreportcard.com/report/github.com/dexidp/dex) ![logo](Documentation/logos/dex-horizontal-color.png) @@ -114,8 +114,8 @@ Due to their public nature, GitHub and mailing lists are NOT appropriate places [tectonic]: https://tectonic.com/ [tectonic-console]: https://tectonic.com/enterprise/docs/latest/usage/index.html#tectonic-console [go-oidc]: https://github.com/coreos/go-oidc -[issue-1065]: https://github.com/coreos/dex/issues/1065 -[release-notes]: https://github.com/coreos/dex/releases -[issues]: https://github.com/coreos/dex/issues +[issue-1065]: https://github.com/dexidp/dex/issues/1065 +[release-notes]: https://github.com/dexidp/dex/releases +[issues]: https://github.com/dexidp/dex/issues [dex-dev]: https://groups.google.com/forum/#!forum/dex-dev [disclosure]: https://coreos.com/security/disclosure/ diff --git a/cmd/dex/config.go b/cmd/dex/config.go index 416991ab..dde36978 100644 --- a/cmd/dex/config.go +++ b/cmd/dex/config.go @@ -9,12 +9,12 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/crypto/bcrypt" - "github.com/coreos/dex/server" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/etcd" - "github.com/coreos/dex/storage/kubernetes" - "github.com/coreos/dex/storage/memory" - "github.com/coreos/dex/storage/sql" + "github.com/dexidp/dex/server" + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/storage/etcd" + "github.com/dexidp/dex/storage/kubernetes" + "github.com/dexidp/dex/storage/memory" + "github.com/dexidp/dex/storage/sql" ) // Config is the config format for the main application. diff --git a/cmd/dex/config_test.go b/cmd/dex/config_test.go index f5913cde..974e9c41 100644 --- a/cmd/dex/config_test.go +++ b/cmd/dex/config_test.go @@ -3,12 +3,13 @@ package main import ( "testing" - "github.com/coreos/dex/connector/mock" - "github.com/coreos/dex/connector/oidc" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/sql" "github.com/ghodss/yaml" "github.com/kylelemons/godebug/pretty" + + "github.com/dexidp/dex/connector/mock" + "github.com/dexidp/dex/connector/oidc" + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/storage/sql" ) var _ = yaml.YAMLToJSON diff --git a/cmd/dex/serve.go b/cmd/dex/serve.go index 3b0a0d7f..dcc0c352 100644 --- a/cmd/dex/serve.go +++ b/cmd/dex/serve.go @@ -22,9 +22,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/coreos/dex/api" - "github.com/coreos/dex/server" - "github.com/coreos/dex/storage" + "github.com/dexidp/dex/api" + "github.com/dexidp/dex/server" + "github.com/dexidp/dex/storage" ) func commandServe() *cobra.Command { diff --git a/cmd/dex/version.go b/cmd/dex/version.go index 1e92c4dc..b74cb016 100644 --- a/cmd/dex/version.go +++ b/cmd/dex/version.go @@ -4,8 +4,9 @@ import ( "fmt" "runtime" - "github.com/coreos/dex/version" "github.com/spf13/cobra" + + "github.com/dexidp/dex/version" ) func commandVersion() *cobra.Command { diff --git a/connector/authproxy/authproxy.go b/connector/authproxy/authproxy.go index e367c4f9..b4f3958d 100644 --- a/connector/authproxy/authproxy.go +++ b/connector/authproxy/authproxy.go @@ -8,8 +8,9 @@ import ( "net/http" "net/url" - "github.com/coreos/dex/connector" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/connector" ) // Config holds the configuration parameters for a connector which returns an diff --git a/connector/github/github.go b/connector/github/github.go index 3ab15282..642f4121 100644 --- a/connector/github/github.go +++ b/connector/github/github.go @@ -19,8 +19,9 @@ import ( "golang.org/x/oauth2" "golang.org/x/oauth2/github" - "github.com/coreos/dex/connector" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/connector" ) const ( diff --git a/connector/gitlab/gitlab.go b/connector/gitlab/gitlab.go index 66b17495..5d1fc156 100644 --- a/connector/gitlab/gitlab.go +++ b/connector/gitlab/gitlab.go @@ -11,9 +11,10 @@ import ( "regexp" "strconv" - "github.com/coreos/dex/connector" "github.com/sirupsen/logrus" "golang.org/x/oauth2" + + "github.com/dexidp/dex/connector" ) const ( diff --git a/connector/ldap/ldap.go b/connector/ldap/ldap.go index a92bd87f..6098c8dd 100644 --- a/connector/ldap/ldap.go +++ b/connector/ldap/ldap.go @@ -12,8 +12,9 @@ import ( "gopkg.in/ldap.v2" - "github.com/coreos/dex/connector" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/connector" ) // Config holds the configuration parameters for the LDAP connector. The LDAP diff --git a/connector/ldap/ldap_test.go b/connector/ldap/ldap_test.go index 23ad593b..95c2e0b3 100644 --- a/connector/ldap/ldap_test.go +++ b/connector/ldap/ldap_test.go @@ -16,7 +16,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/sirupsen/logrus" - "github.com/coreos/dex/connector" + "github.com/dexidp/dex/connector" ) const envVar = "DEX_LDAP_TESTS" diff --git a/connector/linkedin/linkedin.go b/connector/linkedin/linkedin.go index ba85eefc..9ab67e57 100644 --- a/connector/linkedin/linkedin.go +++ b/connector/linkedin/linkedin.go @@ -11,8 +11,9 @@ import ( "golang.org/x/oauth2" - "github.com/coreos/dex/connector" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/connector" ) const ( diff --git a/connector/microsoft/microsoft.go b/connector/microsoft/microsoft.go index 7ea672fa..ad6b3e73 100644 --- a/connector/microsoft/microsoft.go +++ b/connector/microsoft/microsoft.go @@ -14,8 +14,9 @@ import ( "golang.org/x/oauth2" - "github.com/coreos/dex/connector" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/connector" ) const ( diff --git a/connector/mock/connectortest.go b/connector/mock/connectortest.go index 4a8b1257..e6eb5f01 100644 --- a/connector/mock/connectortest.go +++ b/connector/mock/connectortest.go @@ -8,8 +8,9 @@ import ( "net/http" "net/url" - "github.com/coreos/dex/connector" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/connector" ) // NewCallbackConnector returns a mock connector which requires no user interaction. It always returns diff --git a/connector/oidc/oidc.go b/connector/oidc/oidc.go index f0d8daf7..4468edc4 100644 --- a/connector/oidc/oidc.go +++ b/connector/oidc/oidc.go @@ -14,7 +14,7 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/oauth2" - "github.com/coreos/dex/connector" + "github.com/dexidp/dex/connector" ) // Config holds configuration options for OpenID Connect logins. @@ -41,7 +41,7 @@ type Config struct { // Domains that don't support basic auth. golang.org/x/oauth2 has an internal // list, but it only matches specific URLs, not top level domains. var brokenAuthHeaderDomains = []string{ - // See: https://github.com/coreos/dex/issues/859 + // See: https://github.com/dexidp/dex/issues/859 "okta.com", "oktapreview.com", } diff --git a/connector/saml/saml.go b/connector/saml/saml.go index 02b3fad7..8210a641 100644 --- a/connector/saml/saml.go +++ b/connector/saml/saml.go @@ -17,7 +17,7 @@ import ( "github.com/russellhaering/goxmldsig/etreeutils" "github.com/sirupsen/logrus" - "github.com/coreos/dex/connector" + "github.com/dexidp/dex/connector" ) const ( diff --git a/connector/saml/saml_test.go b/connector/saml/saml_test.go index a162eedf..2f319473 100644 --- a/connector/saml/saml_test.go +++ b/connector/saml/saml_test.go @@ -14,7 +14,7 @@ import ( dsig "github.com/russellhaering/goxmldsig" "github.com/sirupsen/logrus" - "github.com/coreos/dex/connector" + "github.com/dexidp/dex/connector" ) // responseTest maps a SAML 2.0 response object to a set of expected values. diff --git a/examples/grpc-client/client.go b/examples/grpc-client/client.go index 31100b3c..41bc4c85 100644 --- a/examples/grpc-client/client.go +++ b/examples/grpc-client/client.go @@ -9,9 +9,10 @@ import ( "io/ioutil" "log" - "github.com/coreos/dex/api" "google.golang.org/grpc" "google.golang.org/grpc/credentials" + + "github.com/dexidp/dex/api" ) func newDexClient(hostAndPort, caPath, clientCrt, clientKey string) (api.DexClient, error) { diff --git a/glide.yaml b/glide.yaml index b3145b54..48769331 100644 --- a/glide.yaml +++ b/glide.yaml @@ -7,7 +7,7 @@ # * Create a separate block for each dependency group. # * Keep updates to "vendor/" in a separate commit from actual changes. -package: github.com/coreos/dex +package: github.com/dexidp/dex import: - package: github.com/spf13/cobra diff --git a/server/api.go b/server/api.go index 6aecef59..3367ac80 100644 --- a/server/api.go +++ b/server/api.go @@ -10,11 +10,12 @@ import ( // https://github.com/grpc/grpc-go/issues/711 "golang.org/x/net/context" - "github.com/coreos/dex/api" - "github.com/coreos/dex/server/internal" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/version" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/api" + "github.com/dexidp/dex/server/internal" + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/version" ) // apiVersion increases every time a new call is added to the API. Clients should use this info diff --git a/server/api_test.go b/server/api_test.go index 697d8d76..aabfde8b 100644 --- a/server/api_test.go +++ b/server/api_test.go @@ -7,12 +7,13 @@ import ( "testing" "time" - "github.com/coreos/dex/api" - "github.com/coreos/dex/server/internal" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/memory" "github.com/sirupsen/logrus" "google.golang.org/grpc" + + "github.com/dexidp/dex/api" + "github.com/dexidp/dex/server/internal" + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/storage/memory" ) // apiClient is a test gRPC client. When constructed, it runs a server in @@ -276,7 +277,7 @@ func TestRefreshToken(t *testing.T) { // Try to delete again. // - // See https://github.com/coreos/dex/issues/1055 + // See https://github.com/dexidp/dex/issues/1055 resp, err = client.RevokeRefresh(ctx, &revokeReq) if err != nil { t.Fatalf("Unable to revoke refresh tokens for user: %v", err) diff --git a/server/handlers.go b/server/handlers.go index 430253c3..1e02998d 100644 --- a/server/handlers.go +++ b/server/handlers.go @@ -15,9 +15,9 @@ import ( "github.com/gorilla/mux" jose "gopkg.in/square/go-jose.v2" - "github.com/coreos/dex/connector" - "github.com/coreos/dex/server/internal" - "github.com/coreos/dex/storage" + "github.com/dexidp/dex/connector" + "github.com/dexidp/dex/server/internal" + "github.com/dexidp/dex/storage" ) func (s *Server) handleHealth(w http.ResponseWriter, r *http.Request) { @@ -159,7 +159,7 @@ func (s *Server) handleAuthorization(w http.ResponseWriter, r *http.Request) { // so users don't hit "not found" database errors if they wait at the login // screen too long. // - // See: https://github.com/coreos/dex/issues/646 + // See: https://github.com/dexidp/dex/issues/646 authReq.Expiry = s.now().Add(24 * time.Hour) // Totally arbitrary value. if err := s.storage.CreateAuthRequest(authReq); err != nil { s.logger.Errorf("Failed to create authorization request: %v", err) diff --git a/server/oauth2.go b/server/oauth2.go index 7967b1bc..b5d992ca 100644 --- a/server/oauth2.go +++ b/server/oauth2.go @@ -21,9 +21,9 @@ import ( jose "gopkg.in/square/go-jose.v2" - "github.com/coreos/dex/connector" - "github.com/coreos/dex/server/internal" - "github.com/coreos/dex/storage" + "github.com/dexidp/dex/connector" + "github.com/dexidp/dex/server/internal" + "github.com/dexidp/dex/storage" ) // TODO(ericchiang): clean this file up and figure out more idiomatic error handling. @@ -150,7 +150,7 @@ func signatureAlgorithm(jwk *jose.JSONWebKey) (alg jose.SignatureAlgorithm, err // value. In the future, we might want to make this configurable on a // per client basis. For example allowing PS256 or ECDSA variants. // - // See https://github.com/coreos/dex/issues/692 + // See https://github.com/dexidp/dex/issues/692 return jose.RS256, nil case *ecdsa.PrivateKey: // We don't actually support ECDSA keys yet, but they're tested for diff --git a/server/oauth2_test.go b/server/oauth2_test.go index dcf4947b..8cad77a8 100644 --- a/server/oauth2_test.go +++ b/server/oauth2_test.go @@ -10,7 +10,7 @@ import ( jose "gopkg.in/square/go-jose.v2" - "github.com/coreos/dex/storage" + "github.com/dexidp/dex/storage" ) func TestParseAuthorizationRequest(t *testing.T) { diff --git a/server/rotation.go b/server/rotation.go index a628bfa7..bb857450 100644 --- a/server/rotation.go +++ b/server/rotation.go @@ -12,8 +12,9 @@ import ( "gopkg.in/square/go-jose.v2" - "github.com/coreos/dex/storage" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/storage" ) var errAlreadyRotated = errors.New("keys already rotated by another server instance") diff --git a/server/rotation_test.go b/server/rotation_test.go index 9d236b70..66c269ce 100644 --- a/server/rotation_test.go +++ b/server/rotation_test.go @@ -6,9 +6,10 @@ import ( "testing" "time" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/memory" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/storage/memory" ) func signingKeyID(t *testing.T, s storage.Storage) string { diff --git a/server/server.go b/server/server.go index 3b586d8e..d96f562d 100644 --- a/server/server.go +++ b/server/server.go @@ -22,17 +22,17 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "github.com/coreos/dex/connector" - "github.com/coreos/dex/connector/authproxy" - "github.com/coreos/dex/connector/github" - "github.com/coreos/dex/connector/gitlab" - "github.com/coreos/dex/connector/ldap" - "github.com/coreos/dex/connector/linkedin" - "github.com/coreos/dex/connector/microsoft" - "github.com/coreos/dex/connector/mock" - "github.com/coreos/dex/connector/oidc" - "github.com/coreos/dex/connector/saml" - "github.com/coreos/dex/storage" + "github.com/dexidp/dex/connector" + "github.com/dexidp/dex/connector/authproxy" + "github.com/dexidp/dex/connector/github" + "github.com/dexidp/dex/connector/gitlab" + "github.com/dexidp/dex/connector/ldap" + "github.com/dexidp/dex/connector/linkedin" + "github.com/dexidp/dex/connector/microsoft" + "github.com/dexidp/dex/connector/mock" + "github.com/dexidp/dex/connector/oidc" + "github.com/dexidp/dex/connector/saml" + "github.com/dexidp/dex/storage" ) // LocalConnector is the local passwordDB connector which is an internal diff --git a/server/server_test.go b/server/server_test.go index c1046afe..536387c4 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -13,7 +13,6 @@ import ( "net/http/httputil" "net/url" "os" - "path/filepath" "reflect" "sort" "strings" @@ -29,10 +28,10 @@ import ( "golang.org/x/oauth2" jose "gopkg.in/square/go-jose.v2" - "github.com/coreos/dex/connector" - "github.com/coreos/dex/connector/mock" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/memory" + "github.com/dexidp/dex/connector" + "github.com/dexidp/dex/connector/mock" + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/storage/memory" ) func mustLoad(s string) *rsa.PrivateKey { @@ -91,7 +90,7 @@ func newTestServer(ctx context.Context, t *testing.T, updateConfig func(c *Confi Issuer: s.URL, Storage: memory.New(logger), Web: WebConfig{ - Dir: filepath.Join(os.Getenv("GOPATH"), "src/github.com/coreos/dex/web"), + Dir: "../web", }, Logger: logger, PrometheusRegistry: prometheus.NewRegistry(), diff --git a/storage/conformance/conformance.go b/storage/conformance/conformance.go index eb038b14..5606def8 100644 --- a/storage/conformance/conformance.go +++ b/storage/conformance/conformance.go @@ -13,7 +13,7 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/coreos/dex/storage" + "github.com/dexidp/dex/storage" "github.com/kylelemons/godebug/pretty" ) diff --git a/storage/conformance/transactions.go b/storage/conformance/transactions.go index 3478460d..4b268e0f 100644 --- a/storage/conformance/transactions.go +++ b/storage/conformance/transactions.go @@ -8,7 +8,7 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/coreos/dex/storage" + "github.com/dexidp/dex/storage" ) // RunTransactionTests runs a test suite aimed a verifying the transaction diff --git a/storage/etcd/config.go b/storage/etcd/config.go index ad273968..66cb04c6 100644 --- a/storage/etcd/config.go +++ b/storage/etcd/config.go @@ -3,11 +3,12 @@ package etcd import ( "time" - "github.com/coreos/dex/storage" "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/clientv3/namespace" "github.com/coreos/etcd/pkg/transport" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/storage" ) var ( diff --git a/storage/etcd/etcd.go b/storage/etcd/etcd.go index 7ad35ea5..e323f5ab 100644 --- a/storage/etcd/etcd.go +++ b/storage/etcd/etcd.go @@ -7,9 +7,10 @@ import ( "strings" "time" - "github.com/coreos/dex/storage" "github.com/coreos/etcd/clientv3" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/storage" ) const ( diff --git a/storage/etcd/etcd_test.go b/storage/etcd/etcd_test.go index 7029e4ca..bd412536 100644 --- a/storage/etcd/etcd_test.go +++ b/storage/etcd/etcd_test.go @@ -9,10 +9,11 @@ import ( "testing" "time" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/conformance" "github.com/coreos/etcd/clientv3" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/storage/conformance" ) func withTimeout(t time.Duration, f func()) { diff --git a/storage/etcd/types.go b/storage/etcd/types.go index acca7f37..8d34e0da 100644 --- a/storage/etcd/types.go +++ b/storage/etcd/types.go @@ -3,8 +3,9 @@ package etcd import ( "time" - "github.com/coreos/dex/storage" jose "gopkg.in/square/go-jose.v2" + + "github.com/dexidp/dex/storage" ) // AuthCode is a mirrored struct from storage with JSON struct tags diff --git a/storage/kubernetes/client.go b/storage/kubernetes/client.go index c17b6376..f95acaff 100644 --- a/storage/kubernetes/client.go +++ b/storage/kubernetes/client.go @@ -27,8 +27,8 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/net/http2" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/kubernetes/k8sapi" + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/storage/kubernetes/k8sapi" ) type client struct { diff --git a/storage/kubernetes/storage.go b/storage/kubernetes/storage.go index 0b99a8b1..fa72e717 100644 --- a/storage/kubernetes/storage.go +++ b/storage/kubernetes/storage.go @@ -7,9 +7,10 @@ import ( "strings" "time" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/kubernetes/k8sapi" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/storage/kubernetes/k8sapi" ) const ( diff --git a/storage/kubernetes/storage_test.go b/storage/kubernetes/storage_test.go index 58340f70..27d65416 100644 --- a/storage/kubernetes/storage_test.go +++ b/storage/kubernetes/storage_test.go @@ -5,9 +5,10 @@ import ( "os" "testing" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/conformance" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/storage/conformance" ) const testKubeConfigEnv = "DEX_KUBECONFIG" diff --git a/storage/kubernetes/types.go b/storage/kubernetes/types.go index aa296531..5324998e 100644 --- a/storage/kubernetes/types.go +++ b/storage/kubernetes/types.go @@ -6,8 +6,8 @@ import ( jose "gopkg.in/square/go-jose.v2" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/kubernetes/k8sapi" + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/storage/kubernetes/k8sapi" ) var tprMeta = k8sapi.TypeMeta{ diff --git a/storage/memory/memory.go b/storage/memory/memory.go index ed80778b..d8817fbd 100644 --- a/storage/memory/memory.go +++ b/storage/memory/memory.go @@ -6,8 +6,9 @@ import ( "sync" "time" - "github.com/coreos/dex/storage" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/storage" ) // New returns an in memory storage. diff --git a/storage/memory/memory_test.go b/storage/memory/memory_test.go index 6628e50c..84a8826e 100644 --- a/storage/memory/memory_test.go +++ b/storage/memory/memory_test.go @@ -4,9 +4,10 @@ import ( "os" "testing" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/conformance" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/storage/conformance" ) func TestStorage(t *testing.T) { diff --git a/storage/memory/static_test.go b/storage/memory/static_test.go index df990ebb..8513e0ee 100644 --- a/storage/memory/static_test.go +++ b/storage/memory/static_test.go @@ -6,8 +6,9 @@ import ( "strings" "testing" - "github.com/coreos/dex/storage" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/storage" ) func TestStaticClients(t *testing.T) { diff --git a/storage/sql/config.go b/storage/sql/config.go index 2a70234f..ec001b2c 100644 --- a/storage/sql/config.go +++ b/storage/sql/config.go @@ -6,10 +6,11 @@ import ( "net/url" "strconv" - "github.com/coreos/dex/storage" "github.com/lib/pq" sqlite3 "github.com/mattn/go-sqlite3" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/storage" ) const ( diff --git a/storage/sql/config_test.go b/storage/sql/config_test.go index 13b2508e..75b81b67 100644 --- a/storage/sql/config_test.go +++ b/storage/sql/config_test.go @@ -7,9 +7,10 @@ import ( "testing" "time" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/conformance" "github.com/sirupsen/logrus" + + "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/storage/conformance" ) func withTimeout(t time.Duration, f func()) { diff --git a/storage/sql/crud.go b/storage/sql/crud.go index 17886b91..d7c055ab 100644 --- a/storage/sql/crud.go +++ b/storage/sql/crud.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/coreos/dex/storage" + "github.com/dexidp/dex/storage" ) // TODO(ericchiang): The update, insert, and select methods queries are all