diff --git a/Dockerfile b/Dockerfile index 8b9463799..14225b4a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN wget -O /usr/local/bin/dep \ https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 \ && chmod a+x /usr/local/bin/dep -WORKDIR $GOPATH/src/github.com/ploxiln/oauth2_proxy/ +WORKDIR $GOPATH/src/github.com/bitly/oauth2_proxy/ COPY . . RUN dep ensure -v RUN CGO_ENABLED=0 go build -ldflags="-s -w" -o /usr/local/bin/oauth2_proxy diff --git a/Gopkg.lock b/Gopkg.lock index 76f755fae..a7aa7302f 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -14,7 +14,7 @@ version = "v0.3.0" [[projects]] - name = "github.com/ploxiln/go-simplejson" + name = "github.com/bitly/go-simplejson" packages = ["."] revision = "aabad6e819789e569bd6aabf444c935aa9ba1e44" version = "v0.5.0" diff --git a/README.md b/README.md index 18e529884..88b136928 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ to validate accounts by email, domain or group. ## This Fork This repo [ploxiln/oauth2_proxy](https://github.com/ploxiln/oauth2_proxy) -is a fork of [ploxiln/oauth2_proxy](https://github.com/ploxiln/oauth2_proxy) +is a fork of [bitly/oauth2_proxy](https://github.com/bitly/oauth2_proxy) which is [no longer maintained](https://github.com/bitly/oauth2_proxy/issues/628#issuecomment-417121636). When your organization finds itself with a few instances of `oauth2_proxy` controlling access @@ -48,11 +48,12 @@ docker run ... -p 4180:4180 -e OAUTH2_PROXY_CLIENT_SECRET ploxiln/oauth2_proxy o ### Build from source -Dependencies are managed with [dep](https://github.com/golang/dep/). +The source needs to be checked-out into GOPATH under the old "bitly/" import path because internal +package imports have not been changed over yet. Dependencies are managed with [dep](https://github.com/golang/dep/). ```sh -git clone git@github.com:ploxiln/oauth2_proxy.git $GOPATH/src/github.com/ploxiln/oauth2_proxy -cd $GOPATH/src/github.com/ploxiln/oauth2_proxy +git clone git@github.com:ploxiln/oauth2_proxy.git $GOPATH/src/github.com/bitly/oauth2_proxy +cd $GOPATH/src/github.com/bitly/oauth2_proxy dep ensure go build ``` @@ -201,7 +202,7 @@ OpenID Connect is a spec for OAUTH 2.0 + identity that is implemented by many ma -email-domain example.com If you enable cookie-refresh, it should be set to the same duration as token lifetime -(due to a limitation in `oauth2_proxy` - see [ploxiln/oauth2_proxy#620](https://github.com/ploxiln/oauth2_proxy/pull/620)). +(due to a limitation in `oauth2_proxy` - see [bitly/oauth2_proxy#620](https://github.com/bitly/oauth2_proxy/pull/620)). ### Discord Auth Provider diff --git a/oauthproxy.go b/oauthproxy.go index 966836415..94a25cbed 100644 --- a/oauthproxy.go +++ b/oauthproxy.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/ploxiln/oauth2_proxy/cookie" - "github.com/ploxiln/oauth2_proxy/providers" + "github.com/bitly/oauth2_proxy/cookie" + "github.com/bitly/oauth2_proxy/providers" "github.com/mbland/hmacauth" ) diff --git a/oauthproxy_test.go b/oauthproxy_test.go index 02c377bb3..875c39c78 100644 --- a/oauthproxy_test.go +++ b/oauthproxy_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/ploxiln/oauth2_proxy/providers" + "github.com/bitly/oauth2_proxy/providers" "github.com/mbland/hmacauth" "github.com/stretchr/testify/assert" ) diff --git a/options.go b/options.go index 4db5e3c96..5709b5707 100644 --- a/options.go +++ b/options.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/ploxiln/oauth2_proxy/providers" + "github.com/bitly/oauth2_proxy/providers" oidc "github.com/coreos/go-oidc" "github.com/mbland/hmacauth" ) diff --git a/providers/azure.go b/providers/azure.go index 3c9e1762a..1ba8a7972 100644 --- a/providers/azure.go +++ b/providers/azure.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" "github.com/bitly/go-simplejson" - "github.com/ploxiln/oauth2_proxy/api" + "github.com/bitly/oauth2_proxy/api" "log" "net/http" "net/url" diff --git a/providers/discord.go b/providers/discord.go index 3fda915bc..2ae7fd41d 100644 --- a/providers/discord.go +++ b/providers/discord.go @@ -6,7 +6,7 @@ import ( "net/http" "net/url" - "github.com/ploxiln/oauth2_proxy/api" + "github.com/bitly/oauth2_proxy/api" ) type DiscordProvider struct { diff --git a/providers/facebook.go b/providers/facebook.go index cd662b72d..7abb9fe59 100644 --- a/providers/facebook.go +++ b/providers/facebook.go @@ -6,7 +6,7 @@ import ( "net/http" "net/url" - "github.com/ploxiln/oauth2_proxy/api" + "github.com/bitly/oauth2_proxy/api" ) type FacebookProvider struct { diff --git a/providers/gitlab.go b/providers/gitlab.go index e31c7afff..27abf29c3 100644 --- a/providers/gitlab.go +++ b/providers/gitlab.go @@ -7,7 +7,7 @@ import ( "path" "strconv" - "github.com/ploxiln/oauth2_proxy/api" + "github.com/bitly/oauth2_proxy/api" ) type GitLabProvider struct { diff --git a/providers/internal_util.go b/providers/internal_util.go index 6981744e2..924d41197 100644 --- a/providers/internal_util.go +++ b/providers/internal_util.go @@ -6,7 +6,7 @@ import ( "net/http" "net/url" - "github.com/ploxiln/oauth2_proxy/api" + "github.com/bitly/oauth2_proxy/api" ) // stripToken is a helper function to obfuscate "access_token" diff --git a/providers/linkedin.go b/providers/linkedin.go index 8a6084a26..971734c44 100644 --- a/providers/linkedin.go +++ b/providers/linkedin.go @@ -6,7 +6,7 @@ import ( "net/http" "net/url" - "github.com/ploxiln/oauth2_proxy/api" + "github.com/bitly/oauth2_proxy/api" ) type LinkedInProvider struct { diff --git a/providers/provider_default.go b/providers/provider_default.go index 769925c59..355e6c37e 100644 --- a/providers/provider_default.go +++ b/providers/provider_default.go @@ -9,7 +9,7 @@ import ( "net/http" "net/url" - "github.com/ploxiln/oauth2_proxy/cookie" + "github.com/bitly/oauth2_proxy/cookie" ) func (p *ProviderData) Redeem(redirectURL, code string) (s *SessionState, err error) { diff --git a/providers/providers.go b/providers/providers.go index 24c11ea2c..cd4c5768f 100644 --- a/providers/providers.go +++ b/providers/providers.go @@ -1,7 +1,7 @@ package providers import ( - "github.com/ploxiln/oauth2_proxy/cookie" + "github.com/bitly/oauth2_proxy/cookie" ) type Provider interface { diff --git a/providers/session_state.go b/providers/session_state.go index bf98e631d..9279c8ebb 100644 --- a/providers/session_state.go +++ b/providers/session_state.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/ploxiln/oauth2_proxy/cookie" + "github.com/bitly/oauth2_proxy/cookie" ) type SessionState struct { diff --git a/providers/session_state_test.go b/providers/session_state_test.go index 955dbd7e3..d3cc8f881 100644 --- a/providers/session_state_test.go +++ b/providers/session_state_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/ploxiln/oauth2_proxy/cookie" + "github.com/bitly/oauth2_proxy/cookie" "github.com/stretchr/testify/assert" )