git.iko.soy/typeable/oauth2-proxy
on master help sign in
Move imports from bitly to pusher
commit847cf25228ad0a830de87e6408e4c451a4168450 authorJoel Speed <Joel.speed@hotmail.co.uk> dateTue 27 Nov 2018, 11:45 (8 years ago) parentbfdccf6
15 files changed+72−22
compare with master
unifiedsplit
CHANGELOG.md+1 Gopkg.lock+57−8 oauthproxy.go+2−2 oauthproxy_test.go+1−1 options.go+1−1 providers/azure.go+1−1 providers/facebook.go+1−1 providers/gitlab.go+1−1 providers/internal_util.go+1−1 providers/linkedin.go+1−1 providers/provider_default.go+1−1 providers/providers.go+1−1 providers/session_state.go+1−1 providers/session_state_test.go+1−1 templates.go+1−1
CHANGELOG.md+1
@@ -2,6 +2,7 @@
22
33## Changes since v2.2:
44
5+- Move Go import path from `github.com/bitly/oauth2_proxy` to `github.com/pusher/oauth2_proxy`
56- Repository forked on 27/11/18
67 - README updated to include note that this repository is forked
78 - CHANGLOG created to track changes to repository from original fork
Gopkg.lock+57−8
@@ -2,118 +2,149 @@
22
33
44[[projects]]
5+ digest = "1:b24249f5a5e6fbe1eddc94b25973172339ccabeadef4779274f3ed0167c18812"
56 name = "cloud.google.com/go"
67 packages = ["compute/metadata"]
8+ pruneopts = ""
79 revision = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613"
810 version = "v0.16.0"
911
1012[[projects]]
13+ digest = "1:289dd4d7abfb3ad2b5f728fbe9b1d5c1bf7d265a3eb9ef92869af1f7baba4c7a"
1114 name = "github.com/BurntSushi/toml"
1215 packages = ["."]
16+ pruneopts = ""
1317 revision = "b26d9c308763d68093482582cea63d69be07a0f0"
1418 version = "v0.3.0"
1519
1620[[projects]]
21+ digest = "1:512883404c2a99156e410e9880e3bb35ecccc0c07c1159eb204b5f3ef3c431b3"
1722 name = "github.com/bitly/go-simplejson"
1823 packages = ["."]
24+ pruneopts = ""
1925 revision = "aabad6e819789e569bd6aabf444c935aa9ba1e44"
2026 version = "v0.5.0"
2127
2228[[projects]]
2329 branch = "v2"
30+ digest = "1:e5a238f8fa890e529d7e493849bbae8988c9e70344e4630cc4f9a11b00516afb"
2431 name = "github.com/coreos/go-oidc"
2532 packages = ["."]
33+ pruneopts = ""
2634 revision = "77e7f2010a464ade7338597afe650dfcffbe2ca8"
2735
2836[[projects]]
37+ digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b"
2938 name = "github.com/davecgh/go-spew"
3039 packages = ["spew"]
40+ pruneopts = ""
3141 revision = "346938d642f2ec3594ed81d874461961cd0faa76"
3242 version = "v1.1.0"
3343
3444[[projects]]
3545 branch = "master"
46+ digest = "1:3b760d3b93f994df8eb1d9ebfad17d3e9e37edcb7f7efaa15b427c0d7a64f4e4"
3647 name = "github.com/golang/protobuf"
3748 packages = ["proto"]
49+ pruneopts = ""
3850 revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845"
3951
4052[[projects]]
53+ digest = "1:af67386ca553c04c6222f7b5b2f17bc97a5dfb3b81b706882c7fd8c72c30cf8f"
4154 name = "github.com/mbland/hmacauth"
4255 packages = ["."]
56+ pruneopts = ""
4357 revision = "107c17adcc5eccc9935cd67d9bc2feaf5255d2cb"
4458 version = "1.0.2"
4559
4660[[projects]]
4761 branch = "master"
62+ digest = "1:9408fb9c637c103010e5147469c232ce6b68edc840879cc730a2a15918e6cae8"
4863 name = "github.com/mreiferson/go-options"
4964 packages = ["."]
65+ pruneopts = ""
5066 revision = "77551d20752b54535462404ad9d877ebdb26e53d"
5167
5268[[projects]]
69+ digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411"
5370 name = "github.com/pmezard/go-difflib"
5471 packages = ["difflib"]
72+ pruneopts = ""
5573 revision = "792786c7400a136282c1664665ae0a8db921c6c2"
5674 version = "v1.0.0"
5775
5876[[projects]]
5977 branch = "master"
78+ digest = "1:386e12afcfd8964907c92dffd106860c0dedd71dbefae14397b77b724a13343b"
6079 name = "github.com/pquerna/cachecontrol"
6180 packages = [
6281 ".",
63− "cacheobject"
82+ "cacheobject",
6483 ]
84+ pruneopts = ""
6585 revision = "0dec1b30a0215bb68605dfc568e8855066c9202d"
6686
6787[[projects]]
88+ digest = "1:3926a4ec9a4ff1a072458451aa2d9b98acd059a45b38f7335d31e06c3d6a0159"
6889 name = "github.com/stretchr/testify"
6990 packages = ["assert"]
91+ pruneopts = ""
7092 revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"
7193 version = "v1.1.4"
7294
7395[[projects]]
7496 branch = "master"
97+ digest = "1:f6a006d27619a4d93bf9b66fe1999b8c8d1fa62bdc63af14f10fbe6fcaa2aa1a"
7598 name = "golang.org/x/crypto"
7699 packages = [
77100 "bcrypt",
78101 "blowfish",
79102 "ed25519",
80− "ed25519/internal/edwards25519"
103+ "ed25519/internal/edwards25519",
81104 ]
105+ pruneopts = ""
82106 revision = "9f005a07e0d31d45e6656d241bb5c0f2efd4bc94"
83107
84108[[projects]]
85109 branch = "master"
110+ digest = "1:130b1bec86c62e121967ee0c69d9c263dc2d3ffe6c7c9a82aca4071c4d068861"
86111 name = "golang.org/x/net"
87112 packages = [
88113 "context",
89− "context/ctxhttp"
114+ "context/ctxhttp",
90115 ]
116+ pruneopts = ""
91117 revision = "9dfe39835686865bff950a07b394c12a98ddc811"
92118
93119[[projects]]
94120 branch = "master"
121+ digest = "1:4a61176e8386727e4847b21a5a2625ce56b9c518bc543a28226503e701265db0"
95122 name = "golang.org/x/oauth2"
96123 packages = [
97124 ".",
98125 "google",
99126 "internal",
100127 "jws",
101− "jwt"
128+ "jwt",
102129 ]
130+ pruneopts = ""
103131 revision = "9ff8ebcc8e241d46f52ecc5bff0e5a2f2dbef402"
104132
105133[[projects]]
106134 branch = "master"
135+ digest = "1:dc1fb726dbbe79c86369941eae1e3b431b8fc6f11dbd37f7899dc758a43cc3ed"
107136 name = "google.golang.org/api"
108137 packages = [
109138 "admin/directory/v1",
110139 "gensupport",
111140 "googleapi",
112− "googleapi/internal/uritemplates"
141+ "googleapi/internal/uritemplates",
113142 ]
143+ pruneopts = ""
114144 revision = "8791354e7ab150705ede13637a18c1fcc16b62e8"
115145
116146[[projects]]
147+ digest = "1:934fb8966f303ede63aa405e2c8d7f0a427a05ea8df335dfdc1833dd4d40756f"
117148 name = "google.golang.org/appengine"
118149 packages = [
119150 ".",
@@ -125,30 +156,48 @@
125156 "internal/modules",
126157 "internal/remote_api",
127158 "internal/urlfetch",
128− "urlfetch"
159+ "urlfetch",
129160 ]
161+ pruneopts = ""
130162 revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a"
131163 version = "v1.0.0"
132164
133165[[projects]]
166+ digest = "1:cb5b2a45a3dd41c01ff779c54ae4c8aab0271d6d3b3f734c8a8bd2c890299ef2"
134167 name = "gopkg.in/fsnotify.v1"
135168 packages = ["."]
169+ pruneopts = ""
136170 revision = "836bfd95fecc0f1511dd66bdbf2b5b61ab8b00b6"
137171 version = "v1.2.11"
138172
139173[[projects]]
174+ digest = "1:be4ed0a2b15944dd777a663681a39260ed05f9c4e213017ed2e2255622c8820c"
140175 name = "gopkg.in/square/go-jose.v2"
141176 packages = [
142177 ".",
143178 "cipher",
144− "json"
179+ "json",
145180 ]
181+ pruneopts = ""
146182 revision = "f8f38de21b4dcd69d0413faf231983f5fd6634b1"
147183 version = "v2.1.3"
148184
149185[solve-meta]
150186 analyzer-name = "dep"
151187 analyzer-version = 1
152− inputs-digest = "b502c41a61115d14d6379be26b0300f65d173bdad852f0170d387ebf2d7ec173"
188+ input-imports = [
189+ "github.com/BurntSushi/toml",
190+ "github.com/bitly/go-simplejson",
191+ "github.com/coreos/go-oidc",
192+ "github.com/mbland/hmacauth",
193+ "github.com/mreiferson/go-options",
194+ "github.com/stretchr/testify/assert",
195+ "golang.org/x/crypto/bcrypt",
196+ "golang.org/x/oauth2",
197+ "golang.org/x/oauth2/google",
198+ "google.golang.org/api/admin/directory/v1",
199+ "google.golang.org/api/googleapi",
200+ "gopkg.in/fsnotify.v1",
201+ ]
153202 solver-name = "gps-cdcl"
154203 solver-version = 1
oauthproxy.go+2−2
@@ -14,8 +14,8 @@ import (
1414 "strings"
1515 "time"
1616
17− "github.com/bitly/oauth2_proxy/cookie"
18− "github.com/bitly/oauth2_proxy/providers"
17+ "github.com/pusher/oauth2_proxy/cookie"
18+ "github.com/pusher/oauth2_proxy/providers"
1919 "github.com/mbland/hmacauth"
2020)
2121
oauthproxy_test.go+1−1
@@ -15,7 +15,7 @@ import (
1515 "testing"
1616 "time"
1717
18− "github.com/bitly/oauth2_proxy/providers"
18+ "github.com/pusher/oauth2_proxy/providers"
1919 "github.com/mbland/hmacauth"
2020 "github.com/stretchr/testify/assert"
2121)
options.go+1−1
@@ -13,7 +13,7 @@ import (
1313 "strings"
1414 "time"
1515
16− "github.com/bitly/oauth2_proxy/providers"
16+ "github.com/pusher/oauth2_proxy/providers"
1717 oidc "github.com/coreos/go-oidc"
1818 "github.com/mbland/hmacauth"
1919)
providers/azure.go+1−1
@@ -4,7 +4,7 @@ import (
44 "errors"
55 "fmt"
66 "github.com/bitly/go-simplejson"
7− "github.com/bitly/oauth2_proxy/api"
7+ "github.com/pusher/oauth2_proxy/api"
88 "log"
99 "net/http"
1010 "net/url"
providers/facebook.go+1−1
@@ -6,7 +6,7 @@ import (
66 "net/http"
77 "net/url"
88
9− "github.com/bitly/oauth2_proxy/api"
9+ "github.com/pusher/oauth2_proxy/api"
1010)
1111
1212type FacebookProvider struct {
providers/gitlab.go+1−1
@@ -5,7 +5,7 @@ import (
55 "net/http"
66 "net/url"
77
8− "github.com/bitly/oauth2_proxy/api"
8+ "github.com/pusher/oauth2_proxy/api"
99)
1010
1111type GitLabProvider struct {
providers/internal_util.go+1−1
@@ -6,7 +6,7 @@ import (
66 "net/http"
77 "net/url"
88
9− "github.com/bitly/oauth2_proxy/api"
9+ "github.com/pusher/oauth2_proxy/api"
1010)
1111
1212// stripToken is a helper function to obfuscate "access_token"
providers/linkedin.go+1−1
@@ -6,7 +6,7 @@ import (
66 "net/http"
77 "net/url"
88
9− "github.com/bitly/oauth2_proxy/api"
9+ "github.com/pusher/oauth2_proxy/api"
1010)
1111
1212type LinkedInProvider struct {
providers/provider_default.go+1−1
@@ -9,7 +9,7 @@ import (
99 "net/http"
1010 "net/url"
1111
12− "github.com/bitly/oauth2_proxy/cookie"
12+ "github.com/pusher/oauth2_proxy/cookie"
1313)
1414
1515func (p *ProviderData) Redeem(redirectURL, code string) (s *SessionState, err error) {
providers/providers.go+1−1
@@ -1,7 +1,7 @@
11package providers
22
33import (
4− "github.com/bitly/oauth2_proxy/cookie"
4+ "github.com/pusher/oauth2_proxy/cookie"
55)
66
77type Provider interface {
providers/session_state.go+1−1
@@ -6,7 +6,7 @@ import (
66 "strings"
77 "time"
88
9− "github.com/bitly/oauth2_proxy/cookie"
9+ "github.com/pusher/oauth2_proxy/cookie"
1010)
1111
1212type SessionState struct {
providers/session_state_test.go+1−1
@@ -6,7 +6,7 @@ import (
66 "testing"
77 "time"
88
9− "github.com/bitly/oauth2_proxy/cookie"
9+ "github.com/pusher/oauth2_proxy/cookie"
1010 "github.com/stretchr/testify/assert"
1111)
1212
templates.go+1−1
@@ -142,7 +142,7 @@ func getTemplates() *template.Template {
142142 <footer>
143143 {{ if eq .Footer "-" }}
144144 {{ else if eq .Footer ""}}
145− Secured with <a href="https://github.com/bitly/oauth2_proxy#oauth2_proxy">OAuth2 Proxy</a> version {{.Version}}
145+ Secured with <a href="https://github.com/pusher/oauth2_proxy#oauth2_proxy">OAuth2 Proxy</a> version {{.Version}}
146146 {{ else }}
147147 {{.Footer}}
148148 {{ end }}