Arsharth/dex
1
0
Fork 0
forked from mystiq/dex
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Stephan Renatus <srenatus@chef.io>
This commit is contained in:
Stephan Renatus 2018-09-03 08:44:44 +02:00
parent 3bbc2c0bde
commit b9f6594bf0
57 changed files with 146 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -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

4
Dockerfile
View file

@ -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.

6
Documentation/api.md
View file

@ -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"
)

4
Documentation/connectors/oidc.md
View file

@ -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

8
Documentation/dev-releases.md
View file

@ -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

4
Documentation/getting-started.md
View file

@ -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
```

2
Documentation/integrations.md
View file

@ -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

4
Documentation/kubernetes.md
View file

@ -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

6
Documentation/oidc-certification-setup.md
View file

@ -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

2
Documentation/production-users.md
View file

@ -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.
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.

2
Documentation/proposals/user-object.md
View file

@ -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.

6
Documentation/storage.md
View file

@ -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/

2
Documentation/v2.md
View file

@ -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

2
Makefile
View file

@ -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)

12
README.md
View file

@ -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/

12
cmd/dex/config.go
View file

@ -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.

9
cmd/dex/config_test.go
View file

@ -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

6
cmd/dex/serve.go
View file

@ -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 {

3
cmd/dex/version.go
View file

@ -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 {

3
connector/authproxy/authproxy.go
View file

@ -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

3
connector/github/github.go
View file

@ -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 (

3
connector/gitlab/gitlab.go
View file

@ -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 (

3
connector/ldap/ldap.go
View file

@ -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

2
connector/ldap/ldap_test.go
View file

@ -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"

3
connector/linkedin/linkedin.go
View file

@ -11,8 +11,9 @@ import (
"golang.org/x/oauth2"
"github.com/coreos/dex/connector"
"github.com/sirupsen/logrus"
"github.com/dexidp/dex/connector"
)
const (

3
connector/microsoft/microsoft.go
View file

@ -14,8 +14,9 @@ import (
"golang.org/x/oauth2"
"github.com/coreos/dex/connector"
"github.com/sirupsen/logrus"
"github.com/dexidp/dex/connector"
)
const (

3
connector/mock/connectortest.go
View file

@ -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

4
connector/oidc/oidc.go
View file

@ -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",
}

2
connector/saml/saml.go
View file

@ -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 (

2
connector/saml/saml_test.go
View file

@ -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.

3
examples/grpc-client/client.go
View file

@ -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) {

2
glide.yaml
View file

@ -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

9
server/api.go
View file

@ -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

11
server/api_test.go
View file

@ -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)

8
server/handlers.go
View file

@ -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)

8
server/oauth2.go
View file

@ -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

2
server/oauth2_test.go
View file

@ -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) {

3
server/rotation.go
View file

@ -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")

5
server/rotation_test.go
View file

@ -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 {

22
server/server.go
View file

@ -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

11
server/server_test.go
View file

@ -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(),

2
storage/conformance/conformance.go
View file

@ -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"
)

2
storage/conformance/transactions.go
View file

@ -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

3
storage/etcd/config.go
View file

@ -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 (

3
storage/etcd/etcd.go
View file

@ -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 (

5
storage/etcd/etcd_test.go
View file

@ -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()) {

3
storage/etcd/types.go
View file

@ -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

4
storage/kubernetes/client.go
View file

@ -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 {

5
storage/kubernetes/storage.go
View file

@ -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 (

5
storage/kubernetes/storage_test.go
View file

@ -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"

4
storage/kubernetes/types.go
View file

@ -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{

3
storage/memory/memory.go
View file

@ -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.

5
storage/memory/memory_test.go
View file

@ -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) {

3
storage/memory/static_test.go
View file

@ -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) {

3
storage/sql/config.go
View file

@ -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 (

5
storage/sql/config_test.go
View file

@ -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()) {

2
storage/sql/crud.go
View file

@ -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