Commit b9f6594b authored by Stephan Renatus's avatar Stephan Renatus

*: github.com/coreos/dex -> github.com/dexidp/dex

Signed-off-by: 's avatarStephan Renatus <srenatus@chef.io>
parent 3bbc2c0b
...@@ -7,7 +7,7 @@ go: ...@@ -7,7 +7,7 @@ go:
- 1.9 - 1.9
- '1.10' - '1.10'
go_import_path: github.com/coreos/dex go_import_path: github.com/dexidp/dex
services: services:
- postgresql - postgresql
......
...@@ -2,8 +2,8 @@ FROM golang:1.10.2-alpine ...@@ -2,8 +2,8 @@ FROM golang:1.10.2-alpine
RUN apk add --no-cache --update alpine-sdk RUN apk add --no-cache --update alpine-sdk
COPY . /go/src/github.com/coreos/dex COPY . /go/src/github.com/dexidp/dex
RUN cd /go/src/github.com/coreos/dex && make release-binary RUN cd /go/src/github.com/dexidp/dex && make release-binary
FROM alpine:3.4 FROM alpine:3.4
# Dex connectors, such as GitHub and Google logins require root certificates. # Dex connectors, such as GitHub and Google logins require root certificates.
......
...@@ -31,7 +31,7 @@ $ go get -u github.com/golang/protobuf/{proto,protoc-gen-go} ...@@ -31,7 +31,7 @@ $ go get -u github.com/golang/protobuf/{proto,protoc-gen-go}
# Download api.proto for a given version. # Download api.proto for a given version.
$ DEX_VERSION=v2.0.0-alpha.5 $ 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. # Generate the Go client bindings.
$ protoc --go_out=import_path=dexapi:. api.proto $ protoc --go_out=import_path=dexapi:. api.proto
...@@ -39,7 +39,7 @@ $ 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: 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 package main
...@@ -49,7 +49,7 @@ import ( ...@@ -49,7 +49,7 @@ import (
"fmt" "fmt"
"log" "log"
"github.com/coreos/dex/api" "github.com/dexidp/dex/api"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
) )
......
...@@ -50,6 +50,6 @@ connectors: ...@@ -50,6 +50,6 @@ connectors:
``` ```
[oidc-doc]: openid-connect.md [oidc-doc]: openid-connect.md
[issue-863]: https://github.com/coreos/dex/issues/863 [issue-863]: https://github.com/dexidp/dex/issues/863
[issue-1065]: https://github.com/coreos/dex/issues/1065 [issue-1065]: https://github.com/dexidp/dex/issues/1065
[azure-ad-v1]: https://github.com/coreos/go-oidc/issues/133 [azure-ad-v1]: https://github.com/coreos/go-oidc/issues/133
...@@ -11,7 +11,7 @@ This requires the following tools. ...@@ -11,7 +11,7 @@ This requires the following tools.
And the following permissions. 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. * Push access to the quay.io/coreos/dex Docker repo.
## Tagging the release ## Tagging the release
...@@ -37,13 +37,13 @@ git tag -s v2.0.0 ea4c04fde83bd6c48f4d43862c406deb4ea9dba2 ...@@ -37,13 +37,13 @@ git tag -s v2.0.0 ea4c04fde83bd6c48f4d43862c406deb4ea9dba2
Push that tag to the CoreOS repo. 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 Draft releases on GitHub and summarize the changes since the last release. See
previous releases for the expected format. previous releases for the expected format.
https://github.com/coreos/dex/releases https://github.com/dexidp/dex/releases
## Minor releases - create a branch ## 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 ...@@ -51,7 +51,7 @@ If the release is a minor release (2.1.0, 2.2.0, etc.) create a branch for futur
```bash ```bash
git checkout -b v2.1.x tags/v2.1.0 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 ## Patch releases - cherry pick required commits
......
...@@ -5,8 +5,8 @@ ...@@ -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. 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 $ go get github.com/dexidp/dex
$ cd $GOPATH/src/github.com/coreos/dex $ cd $GOPATH/src/github.com/dexidp/dex
$ make $ make
``` ```
......
# Integrations # 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 ## Tools
......
...@@ -117,10 +117,10 @@ $ curl -H "Authorization: Bearer $token" -k https://( API server host ):443/api/ ...@@ -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-authz]: http://kubernetes.io/docs/admin/authorization/
[k8s-oidc]: http://kubernetes.io/docs/admin/authentication/#openid-connect-tokens [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-kubernetes]: https://github.com/coreos/coreos-kubernetes/
[coreos-baremetal]: https://github.com/coreos/coreos-baremetal/ [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 [github-oauth2]: https://github.com/settings/applications/new
[node-port]: http://kubernetes.io/docs/user-guide/services/#type-nodeport [node-port]: http://kubernetes.io/docs/user-guide/services/#type-nodeport
[coreos-kubernetes]: https://github.com/coreos/coreos-kubernetes [coreos-kubernetes]: https://github.com/coreos/coreos-kubernetes
......
...@@ -13,8 +13,8 @@ Issue number | Relates to ...@@ -13,8 +13,8 @@ Issue number | Relates to
[\#376][dex-issue-376] | userinfo_endpoint [\#376][dex-issue-376] | userinfo_endpoint
[\#1052][dex-issue-1052] | auth_time [\#1052][dex-issue-1052] | auth_time
[dex-issue-376]: https://github.com/coreos/dex/issues/376 [dex-issue-376]: https://github.com/dexidp/dex/issues/376
[dex-issue-1052]: https://github.com/coreos/dex/issues/1052 [dex-issue-1052]: https://github.com/dexidp/dex/issues/1052
### Setup ### Setup
...@@ -159,7 +159,7 @@ OP-OAuth-2nd-Revokes | Incomplete | Unsupported | userinfo_endpoint ...@@ -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]. 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-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-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 [aws-ec2-quick-start]: http://docs.aws.amazon.com/quickstarts/latest/vmlaunch/step-1-launch-instance.html
......
# Production users # 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. 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 \ No newline at end of file
...@@ -73,7 +73,7 @@ type RemoteIdentity struct { ...@@ -73,7 +73,7 @@ type RemoteIdentity struct {
`UserID` fields will be added to the `AuthRequest`, `AuthCode` and `RefreshToken` `UserID` fields will be added to the `AuthRequest`, `AuthCode` and `RefreshToken`
structs. When a user logs in successfully through a connector 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 server will attempt to either get the user, or create one if none exists with
the remote identity. the remote identity.
......
...@@ -302,8 +302,8 @@ Each storage implementation bears a large ongoing maintenance cost and needs to ...@@ -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: 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/dexidp/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/conformance`: Conformance tests which storage implementations must pass.
### New storage option requirements ### New storage option requirements
...@@ -313,7 +313,7 @@ Any proposal to add a new implementation must address the following: ...@@ -313,7 +313,7 @@ Any proposal to add a new implementation must address the following:
* Transactional requirements: atomic deletes, updates, etc. * Transactional requirements: atomic deletes, updates, etc.
* Is there an established and reasonable Go client? * 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 [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 [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/ [crd]: https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/
...@@ -40,7 +40,7 @@ Notable missing features include: ...@@ -40,7 +40,7 @@ Notable missing features include:
## Support for dex v1 ## 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/ [k8s-api-docs]: http://kubernetes.io/docs/api/
[storage-docs]: ./storage.md [storage-docs]: ./storage.md
......
PROJ=dex PROJ=dex
ORG_PATH=github.com/coreos ORG_PATH=github.com/dexidp
REPO_PATH=$(ORG_PATH)/$(PROJ) REPO_PATH=$(ORG_PATH)/$(PROJ)
export PATH := $(PWD)/bin:$(PATH) export PATH := $(PWD)/bin:$(PATH)
......
# dex - A federated OpenID Connect provider # dex - A federated OpenID Connect provider
[![Travis](https://api.travis-ci.org/coreos/dex.svg)](https://travis-ci.org/coreos/dex) [![Travis](https://api.travis-ci.org/dexidp/dex.svg)](https://travis-ci.org/dexidp/dex)
[![GoDoc](https://godoc.org/github.com/coreos/dex?status.svg)](https://godoc.org/github.com/coreos/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/coreos/dex)](https://goreportcard.com/report/github.com/coreos/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) ![logo](Documentation/logos/dex-horizontal-color.png)
...@@ -114,8 +114,8 @@ Due to their public nature, GitHub and mailing lists are NOT appropriate places ...@@ -114,8 +114,8 @@ Due to their public nature, GitHub and mailing lists are NOT appropriate places
[tectonic]: https://tectonic.com/ [tectonic]: https://tectonic.com/
[tectonic-console]: https://tectonic.com/enterprise/docs/latest/usage/index.html#tectonic-console [tectonic-console]: https://tectonic.com/enterprise/docs/latest/usage/index.html#tectonic-console
[go-oidc]: https://github.com/coreos/go-oidc [go-oidc]: https://github.com/coreos/go-oidc
[issue-1065]: https://github.com/coreos/dex/issues/1065 [issue-1065]: https://github.com/dexidp/dex/issues/1065
[release-notes]: https://github.com/coreos/dex/releases [release-notes]: https://github.com/dexidp/dex/releases
[issues]: https://github.com/coreos/dex/issues [issues]: https://github.com/dexidp/dex/issues
[dex-dev]: https://groups.google.com/forum/#!forum/dex-dev [dex-dev]: https://groups.google.com/forum/#!forum/dex-dev
[disclosure]: https://coreos.com/security/disclosure/ [disclosure]: https://coreos.com/security/disclosure/
...@@ -9,12 +9,12 @@ import ( ...@@ -9,12 +9,12 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
"github.com/coreos/dex/server" "github.com/dexidp/dex/server"
"github.com/coreos/dex/storage" "github.com/dexidp/dex/storage"
"github.com/coreos/dex/storage/etcd" "github.com/dexidp/dex/storage/etcd"
"github.com/coreos/dex/storage/kubernetes" "github.com/dexidp/dex/storage/kubernetes"
"github.com/coreos/dex/storage/memory" "github.com/dexidp/dex/storage/memory"
"github.com/coreos/dex/storage/sql" "github.com/dexidp/dex/storage/sql"
) )
// Config is the config format for the main application. // Config is the config format for the main application.
......
...@@ -3,12 +3,13 @@ package main ...@@ -3,12 +3,13 @@ package main
import ( import (
"testing" "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/ghodss/yaml"
"github.com/kylelemons/godebug/pretty" "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 var _ = yaml.YAMLToJSON
......
...@@ -22,9 +22,9 @@ import ( ...@@ -22,9 +22,9 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"github.com/coreos/dex/api" "github.com/dexidp/dex/api"
"github.com/coreos/dex/server" "github.com/dexidp/dex/server"
"github.com/coreos/dex/storage" "github.com/dexidp/dex/storage"
) )
func commandServe() *cobra.Command { func commandServe() *cobra.Command {
......
...@@ -4,8 +4,9 @@ import ( ...@@ -4,8 +4,9 @@ import (
"fmt" "fmt"
"runtime" "runtime"
"github.com/coreos/dex/version"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/dexidp/dex/version"
) )
func commandVersion() *cobra.Command { func commandVersion() *cobra.Command {
......
...@@ -8,8 +8,9 @@ import ( ...@@ -8,8 +8,9 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"github.com/coreos/dex/connector"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/connector"
) )
// Config holds the configuration parameters for a connector which returns an // Config holds the configuration parameters for a connector which returns an
......
...@@ -19,8 +19,9 @@ import ( ...@@ -19,8 +19,9 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"golang.org/x/oauth2/github" "golang.org/x/oauth2/github"
"github.com/coreos/dex/connector"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/connector"
) )
const ( const (
......
...@@ -11,9 +11,10 @@ import ( ...@@ -11,9 +11,10 @@ import (
"regexp" "regexp"
"strconv" "strconv"
"github.com/coreos/dex/connector"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/dexidp/dex/connector"
) )
const ( const (
......
...@@ -12,8 +12,9 @@ import ( ...@@ -12,8 +12,9 @@ import (
"gopkg.in/ldap.v2" "gopkg.in/ldap.v2"
"github.com/coreos/dex/connector"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/connector"
) )
// Config holds the configuration parameters for the LDAP connector. The LDAP // Config holds the configuration parameters for the LDAP connector. The LDAP
......
...@@ -16,7 +16,7 @@ import ( ...@@ -16,7 +16,7 @@ import (
"github.com/kylelemons/godebug/pretty" "github.com/kylelemons/godebug/pretty"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/coreos/dex/connector" "github.com/dexidp/dex/connector"
) )
const envVar = "DEX_LDAP_TESTS" const envVar = "DEX_LDAP_TESTS"
......
...@@ -11,8 +11,9 @@ import ( ...@@ -11,8 +11,9 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/coreos/dex/connector"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/connector"
) )
const ( const (
......
...@@ -14,8 +14,9 @@ import ( ...@@ -14,8 +14,9 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/coreos/dex/connector"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/connector"
) )
const ( const (
......
...@@ -8,8 +8,9 @@ import ( ...@@ -8,8 +8,9 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"github.com/coreos/dex/connector"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/connector"
) )
// NewCallbackConnector returns a mock connector which requires no user interaction. It always returns // NewCallbackConnector returns a mock connector which requires no user interaction. It always returns
......
...@@ -14,7 +14,7 @@ import ( ...@@ -14,7 +14,7 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/coreos/dex/connector" "github.com/dexidp/dex/connector"
) )
// Config holds configuration options for OpenID Connect logins. // Config holds configuration options for OpenID Connect logins.
...@@ -41,7 +41,7 @@ type Config struct { ...@@ -41,7 +41,7 @@ type Config struct {
// Domains that don't support basic auth. golang.org/x/oauth2 has an internal // 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. // list, but it only matches specific URLs, not top level domains.
var brokenAuthHeaderDomains = []string{ var brokenAuthHeaderDomains = []string{
// See: https://github.com/coreos/dex/issues/859 // See: https://github.com/dexidp/dex/issues/859
"okta.com", "okta.com",
"oktapreview.com", "oktapreview.com",
} }
......
...@@ -17,7 +17,7 @@ import ( ...@@ -17,7 +17,7 @@ import (
"github.com/russellhaering/goxmldsig/etreeutils" "github.com/russellhaering/goxmldsig/etreeutils"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/coreos/dex/connector" "github.com/dexidp/dex/connector"
) )
const ( const (
......
...@@ -14,7 +14,7 @@ import ( ...@@ -14,7 +14,7 @@ import (
dsig "github.com/russellhaering/goxmldsig" dsig "github.com/russellhaering/goxmldsig"
"github.com/sirupsen/logrus" "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. // responseTest maps a SAML 2.0 response object to a set of expected values.
......
...@@ -9,9 +9,10 @@ import ( ...@@ -9,9 +9,10 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"github.com/coreos/dex/api"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"github.com/dexidp/dex/api"
) )
func newDexClient(hostAndPort, caPath, clientCrt, clientKey string) (api.DexClient, error) { func newDexClient(hostAndPort, caPath, clientCrt, clientKey string) (api.DexClient, error) {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# * Create a separate block for each dependency group. # * Create a separate block for each dependency group.
# * Keep updates to "vendor/" in a separate commit from actual changes. # * Keep updates to "vendor/" in a separate commit from actual changes.
package: github.com/coreos/dex package: github.com/dexidp/dex
import: import:
- package: github.com/spf13/cobra - package: github.com/spf13/cobra
......
...@@ -10,11 +10,12 @@ import ( ...@@ -10,11 +10,12 @@ import (
// https://github.com/grpc/grpc-go/issues/711 // https://github.com/grpc/grpc-go/issues/711
"golang.org/x/net/context" "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/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 // apiVersion increases every time a new call is added to the API. Clients should use this info
......
...@@ -7,12 +7,13 @@ import ( ...@@ -7,12 +7,13 @@ import (
"testing" "testing"
"time" "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" "github.com/sirupsen/logrus"
"google.golang.org/grpc" "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 // apiClient is a test gRPC client. When constructed, it runs a server in
...@@ -276,7 +277,7 @@ func TestRefreshToken(t *testing.T) { ...@@ -276,7 +277,7 @@ func TestRefreshToken(t *testing.T) {
// Try to delete again. // 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) resp, err = client.RevokeRefresh(ctx, &revokeReq)
if err != nil { if err != nil {
t.Fatalf("Unable to revoke refresh tokens for user: %v", err) t.Fatalf("Unable to revoke refresh tokens for user: %v", err)
......
...@@ -15,9 +15,9 @@ import ( ...@@ -15,9 +15,9 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
jose "gopkg.in/square/go-jose.v2" jose "gopkg.in/square/go-jose.v2"
"github.com/coreos/dex/connector" "github.com/dexidp/dex/connector"
"github.com/coreos/dex/server/internal" "github.com/dexidp/dex/server/internal"
"github.com/coreos/dex/storage" "github.com/dexidp/dex/storage"
) )
func (s *Server) handleHealth(w http.ResponseWriter, r *http.Request) { func (s *Server) handleHealth(w http.ResponseWriter, r *http.Request) {
...@@ -159,7 +159,7 @@ func (s *Server) handleAuthorization(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 // so users don't hit "not found" database errors if they wait at the login
// screen too long. // 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. authReq.Expiry = s.now().Add(24 * time.Hour) // Totally arbitrary value.
if err := s.storage.CreateAuthRequest(authReq); err != nil { if err := s.storage.CreateAuthRequest(authReq); err != nil {
s.logger.Errorf("Failed to create authorization request: %v", err) s.logger.Errorf("Failed to create authorization request: %v", err)
......
...@@ -21,9 +21,9 @@ import ( ...@@ -21,9 +21,9 @@ import (
jose "gopkg.in/square/go-jose.v2" jose "gopkg.in/square/go-jose.v2"
"github.com/coreos/dex/connector" "github.com/dexidp/dex/connector"
"github.com/coreos/dex/server/internal" "github.com/dexidp/dex/server/internal"
"github.com/coreos/dex/storage" "github.com/dexidp/dex/storage"
) )
// TODO(ericchiang): clean this file up and figure out more idiomatic error handling. // 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 ...@@ -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 // value. In the future, we might want to make this configurable on a
// per client basis. For example allowing PS256 or ECDSA variants. // 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 return jose.RS256, nil
case *ecdsa.PrivateKey: case *ecdsa.PrivateKey:
// We don't actually support ECDSA keys yet, but they're tested for // We don't actually support ECDSA keys yet, but they're tested for
......
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
jose "gopkg.in/square/go-jose.v2" jose "gopkg.in/square/go-jose.v2"
"github.com/coreos/dex/storage" "github.com/dexidp/dex/storage"
) )
func TestParseAuthorizationRequest(t *testing.T) { func TestParseAuthorizationRequest(t *testing.T) {
......
...@@ -12,8 +12,9 @@ import ( ...@@ -12,8 +12,9 @@ import (
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/coreos/dex/storage"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/storage"
) )
var errAlreadyRotated = errors.New("keys already rotated by another server instance") var errAlreadyRotated = errors.New("keys already rotated by another server instance")
......
...@@ -6,9 +6,10 @@ import ( ...@@ -6,9 +6,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/memory"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/memory"
) )
func signingKeyID(t *testing.T, s storage.Storage) string { func signingKeyID(t *testing.T, s storage.Storage) string {
......
...@@ -22,17 +22,17 @@ import ( ...@@ -22,17 +22,17 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/coreos/dex/connector" "github.com/dexidp/dex/connector"
"github.com/coreos/dex/connector/authproxy" "github.com/dexidp/dex/connector/authproxy"
"github.com/coreos/dex/connector/github" "github.com/dexidp/dex/connector/github"
"github.com/coreos/dex/connector/gitlab" "github.com/dexidp/dex/connector/gitlab"
"github.com/coreos/dex/connector/ldap" "github.com/dexidp/dex/connector/ldap"
"github.com/coreos/dex/connector/linkedin" "github.com/dexidp/dex/connector/linkedin"
"github.com/coreos/dex/connector/microsoft" "github.com/dexidp/dex/connector/microsoft"
"github.com/coreos/dex/connector/mock" "github.com/dexidp/dex/connector/mock"
"github.com/coreos/dex/connector/oidc" "github.com/dexidp/dex/connector/oidc"
"github.com/coreos/dex/connector/saml" "github.com/dexidp/dex/connector/saml"
"github.com/coreos/dex/storage" "github.com/dexidp/dex/storage"
) )
// LocalConnector is the local passwordDB connector which is an internal // LocalConnector is the local passwordDB connector which is an internal
......
...@@ -13,7 +13,6 @@ import ( ...@@ -13,7 +13,6 @@ import (
"net/http/httputil" "net/http/httputil"
"net/url" "net/url"
"os" "os"
"path/filepath"
"reflect" "reflect"
"sort" "sort"
"strings" "strings"
...@@ -29,10 +28,10 @@ import ( ...@@ -29,10 +28,10 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
jose "gopkg.in/square/go-jose.v2" jose "gopkg.in/square/go-jose.v2"
"github.com/coreos/dex/connector" "github.com/dexidp/dex/connector"
"github.com/coreos/dex/connector/mock" "github.com/dexidp/dex/connector/mock"
"github.com/coreos/dex/storage" "github.com/dexidp/dex/storage"
"github.com/coreos/dex/storage/memory" "github.com/dexidp/dex/storage/memory"
) )
func mustLoad(s string) *rsa.PrivateKey { func mustLoad(s string) *rsa.PrivateKey {
...@@ -91,7 +90,7 @@ func newTestServer(ctx context.Context, t *testing.T, updateConfig func(c *Confi ...@@ -91,7 +90,7 @@ func newTestServer(ctx context.Context, t *testing.T, updateConfig func(c *Confi
Issuer: s.URL, Issuer: s.URL,
Storage: memory.New(logger), Storage: memory.New(logger),
Web: WebConfig{ Web: WebConfig{
Dir: filepath.Join(os.Getenv("GOPATH"), "src/github.com/coreos/dex/web"), Dir: "../web",
}, },
Logger: logger, Logger: logger,
PrometheusRegistry: prometheus.NewRegistry(), PrometheusRegistry: prometheus.NewRegistry(),
......
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
"github.com/coreos/dex/storage" "github.com/dexidp/dex/storage"
"github.com/kylelemons/godebug/pretty" "github.com/kylelemons/godebug/pretty"
) )
......
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"golang.org/x/crypto/bcrypt" "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 // RunTransactionTests runs a test suite aimed a verifying the transaction
......
...@@ -3,11 +3,12 @@ package etcd ...@@ -3,11 +3,12 @@ package etcd
import ( import (
"time" "time"
"github.com/coreos/dex/storage"
"github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/clientv3/namespace" "github.com/coreos/etcd/clientv3/namespace"
"github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/transport"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/storage"
) )
var ( var (
......
...@@ -7,9 +7,10 @@ import ( ...@@ -7,9 +7,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/coreos/dex/storage"
"github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/clientv3"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/storage"
) )
const ( const (
......
...@@ -9,10 +9,11 @@ import ( ...@@ -9,10 +9,11 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/conformance"
"github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/clientv3"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/conformance"
) )
func withTimeout(t time.Duration, f func()) { func withTimeout(t time.Duration, f func()) {
......
...@@ -3,8 +3,9 @@ package etcd ...@@ -3,8 +3,9 @@ package etcd
import ( import (
"time" "time"
"github.com/coreos/dex/storage"
jose "gopkg.in/square/go-jose.v2" jose "gopkg.in/square/go-jose.v2"
"github.com/dexidp/dex/storage"
) )
// AuthCode is a mirrored struct from storage with JSON struct tags // AuthCode is a mirrored struct from storage with JSON struct tags
......
...@@ -27,8 +27,8 @@ import ( ...@@ -27,8 +27,8 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/net/http2" "golang.org/x/net/http2"
"github.com/coreos/dex/storage" "github.com/dexidp/dex/storage"
"github.com/coreos/dex/storage/kubernetes/k8sapi" "github.com/dexidp/dex/storage/kubernetes/k8sapi"
) )
type client struct { type client struct {
......
...@@ -7,9 +7,10 @@ import ( ...@@ -7,9 +7,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/kubernetes/k8sapi"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/kubernetes/k8sapi"
) )
const ( const (
......
...@@ -5,9 +5,10 @@ import ( ...@@ -5,9 +5,10 @@ import (
"os" "os"
"testing" "testing"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/conformance"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/conformance"
) )
const testKubeConfigEnv = "DEX_KUBECONFIG" const testKubeConfigEnv = "DEX_KUBECONFIG"
......
...@@ -6,8 +6,8 @@ import ( ...@@ -6,8 +6,8 @@ import (
jose "gopkg.in/square/go-jose.v2" jose "gopkg.in/square/go-jose.v2"
"github.com/coreos/dex/storage" "github.com/dexidp/dex/storage"
"github.com/coreos/dex/storage/kubernetes/k8sapi" "github.com/dexidp/dex/storage/kubernetes/k8sapi"
) )
var tprMeta = k8sapi.TypeMeta{ var tprMeta = k8sapi.TypeMeta{
......
...@@ -6,8 +6,9 @@ import ( ...@@ -6,8 +6,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/coreos/dex/storage"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/storage"
) )
// New returns an in memory storage. // New returns an in memory storage.
......
...@@ -4,9 +4,10 @@ import ( ...@@ -4,9 +4,10 @@ import (
"os" "os"
"testing" "testing"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/conformance"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/conformance"
) )
func TestStorage(t *testing.T) { func TestStorage(t *testing.T) {
......
...@@ -6,8 +6,9 @@ import ( ...@@ -6,8 +6,9 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/coreos/dex/storage"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/storage"
) )
func TestStaticClients(t *testing.T) { func TestStaticClients(t *testing.T) {
......
...@@ -6,10 +6,11 @@ import ( ...@@ -6,10 +6,11 @@ import (
"net/url" "net/url"
"strconv" "strconv"
"github.com/coreos/dex/storage"
"github.com/lib/pq" "github.com/lib/pq"
sqlite3 "github.com/mattn/go-sqlite3" sqlite3 "github.com/mattn/go-sqlite3"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/storage"
) )
const ( const (
......
...@@ -7,9 +7,10 @@ import ( ...@@ -7,9 +7,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/conformance"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/conformance"
) )
func withTimeout(t time.Duration, f func()) { func withTimeout(t time.Duration, f func()) {
......
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/coreos/dex/storage" "github.com/dexidp/dex/storage"
) )
// TODO(ericchiang): The update, insert, and select methods queries are all // TODO(ericchiang): The update, insert, and select methods queries are all
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment