Fix import path for v7 (#800)
* fix import path for v7
find ./ -name "*.go" | xargs sed -i -e 's|"github.com/oauth2-proxy/oauth2-proxy|"github.com/oauth2-proxy/oauth2-proxy/v7|'
* fix module path
* go mod tidy
* fix installation docs
* update CHANGELOG
* Update CHANGELOG.md
Co-authored-by: Joel Speed <Joel.speed@hotmail.co.uk>
Co-authored-by: Joel Speed <Joel.speed@hotmail.co.uk>
commit3fa42edb7350219d317c4bd47faf5da6192dc70f
authorMitsuo Heijo <mitsuo.heijo@gmail.com>
dateWed 30 Sep 2020, 01:44 (6 years ago)
parent7c44797
CHANGELOG.md+4
@@ -12,6 +12,9 @@
1212## Breaking Changes
1313
1414- [#722](https://github.com/oauth2-proxy/oauth2-proxy/pull/722) When a Redis session store is configured, OAuth2-Proxy will fail to start up unless connection and health checks to Redis pass
15+- [#800](https://github.com/oauth2-proxy/oauth2-proxy/pull/800) Fix import path for v7. The import path has changed to support the go get installation.
16+ - You can now `go get github.com/oauth2-proxy/oauth2-proxy/v7` to get the latest `v7` version of OAuth2 Proxy
17+ - Import paths for package are now under `v7`, eg `github.com/oauth2-proxy/oauth2-proxy/v7/pkg/<module>`
1518- [#753](https://github.com/oauth2-proxy/oauth2-proxy/pull/753) A bug in the Azure provider prevented it from properly passing the configured protected `--resource`
1619 via the login url. If this option was used in the past, behavior will change with this release as it will
1720 affect the tokens returned by Azure. In the past, the tokens were always for `https://graph.microsoft.com` (the default)
@@ -25,6 +28,7 @@
2528- [#791](https://github.com/oauth2-proxy/oauth2-proxy/pull/791) Remove GetPreferredUsername method from provider interface (@NickMeves)
2629- [#764](https://github.com/oauth2-proxy/oauth2-proxy/pull/764) Document bcrypt encryption for htpasswd (and hide SHA) (@lentzi90)
2730- [#616](https://github.com/oauth2-proxy/oauth2-proxy/pull/616) Add support to ensure user belongs in required groups when using the OIDC provider (@stefansedich)
31+- [#800](https://github.com/oauth2-proxy/oauth2-proxy/pull/800) Fix import path for v7 (@johejo)
2832
2933# v6.1.1
3034
docs/1_installation.md+1−1
@@ -11,7 +11,7 @@ nav_order: 1
1111
1212 a. Download [Prebuilt Binary](https://github.com/oauth2-proxy/oauth2-proxy/releases) (current release is `v6.1.1`)
1313
14− b. Build with `$ go get github.com/oauth2-proxy/oauth2-proxy` which will put the binary in `$GOROOT/bin`
14+ b. Build with `$ go get github.com/oauth2-proxy/oauth2-proxy/v7` which will put the binary in `$GOPATH/bin`
1515
1616 c. Using the prebuilt docker image [quay.io/oauth2-proxy/oauth2-proxy](https://quay.io/oauth2-proxy/oauth2-proxy) (AMD64, ARMv6 and ARM64 tags available)
1717
go.mod+1−1
@@ -1,4 +1,4 @@
1−module github.com/oauth2-proxy/oauth2-proxy
1+module github.com/oauth2-proxy/oauth2-proxy/v7
22
33go 1.14
44
go.sum−6
@@ -150,15 +150,11 @@ github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI
150150github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
151151github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
152152github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
153−github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU=
154−github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
155153github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
156154github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
157155github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
158156github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
159157github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
160−github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
161−github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
162158github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
163159github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
164160github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
@@ -295,8 +291,6 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
295291golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
296292golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 h1:5Beo0mZN8dRzgrMMkDp0jc8YXQKx9DiJ2k1dkvGsn5A=
297293golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
298−golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
299−golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
300294golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
301295golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
302296google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
http.go+2−2
@@ -9,8 +9,8 @@ import (
99 "strings"
1010 "time"
1111
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
13− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
13+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1414)
1515
1616// Server represents an HTTP server
http_test.go+1−1
@@ -6,7 +6,7 @@ import (
66 "testing"
77 "time"
88
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
1010 "github.com/stretchr/testify/assert"
1111)
1212
logging_handler.go+1−1
@@ -10,7 +10,7 @@ import (
1010 "net/http"
1111 "time"
1212
13− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
13+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1414)
1515
1616// responseLogger is wrapper of http.ResponseWriter that keeps track of its HTTP status
logging_handler_test.go+1−1
@@ -6,7 +6,7 @@ import (
66 "net/http/httptest"
77 "testing"
88
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1010 "github.com/stretchr/testify/assert"
1111)
1212
main.go+4−4
@@ -11,10 +11,10 @@ import (
1111 "time"
1212
1313 "github.com/justinas/alice"
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
15− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
16− "github.com/oauth2-proxy/oauth2-proxy/pkg/middleware"
17− "github.com/oauth2-proxy/oauth2-proxy/pkg/validation"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
15+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
16+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/middleware"
17+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/validation"
1818)
1919
2020func main() {
oauthproxy.go+14−14
@@ -16,20 +16,20 @@ import (
1616
1717 "github.com/coreos/go-oidc"
1818 "github.com/justinas/alice"
19− ipapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/ip"
20− middlewareapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/middleware"
21− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
22− sessionsapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
23− "github.com/oauth2-proxy/oauth2-proxy/pkg/authentication/basic"
24− "github.com/oauth2-proxy/oauth2-proxy/pkg/cookies"
25− "github.com/oauth2-proxy/oauth2-proxy/pkg/encryption"
26− "github.com/oauth2-proxy/oauth2-proxy/pkg/ip"
27− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
28− "github.com/oauth2-proxy/oauth2-proxy/pkg/middleware"
29− "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions"
30− "github.com/oauth2-proxy/oauth2-proxy/pkg/upstream"
31− "github.com/oauth2-proxy/oauth2-proxy/pkg/util"
32− "github.com/oauth2-proxy/oauth2-proxy/providers"
19+ ipapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/ip"
20+ middlewareapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/middleware"
21+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
22+ sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
23+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/authentication/basic"
24+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/cookies"
25+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption"
26+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/ip"
27+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
28+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/middleware"
29+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions"
30+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/upstream"
31+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/util"
32+ "github.com/oauth2-proxy/oauth2-proxy/v7/providers"
3333)
3434
3535const (
oauthproxy_test.go+7−7
@@ -19,13 +19,13 @@ import (
1919
2020 "github.com/coreos/go-oidc"
2121 "github.com/mbland/hmacauth"
22− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
23− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
24− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
25− sessionscookie "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions/cookie"
26− "github.com/oauth2-proxy/oauth2-proxy/pkg/upstream"
27− "github.com/oauth2-proxy/oauth2-proxy/pkg/validation"
28− "github.com/oauth2-proxy/oauth2-proxy/providers"
22+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
23+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
24+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
25+ sessionscookie "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/cookie"
26+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/upstream"
27+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/validation"
28+ "github.com/oauth2-proxy/oauth2-proxy/v7/providers"
2929 "github.com/stretchr/testify/assert"
3030 "github.com/stretchr/testify/require"
3131)
pkg/apis/middleware/scope.go+1−1
@@ -1,7 +1,7 @@
11package middleware
22
33import (
4− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
4+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
55)
66
77// RequestScope contains information regarding the request that is being made.
pkg/apis/middleware/session.go+1−1
@@ -4,7 +4,7 @@ import (
44 "context"
55
66 "github.com/coreos/go-oidc"
7− sessionsapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
7+ sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
88)
99
1010// TokenToSessionFunc takes a rawIDToken and an idToken and converts it into a
pkg/apis/options/legacy_options.go+1−1
@@ -7,7 +7,7 @@ import (
77 "strings"
88 "time"
99
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1111 "github.com/spf13/pflag"
1212)
1313
pkg/apis/options/logging.go+1−1
@@ -1,7 +1,7 @@
11package options
22
33import (
4− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
4+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
55 "github.com/spf13/pflag"
66)
77
pkg/apis/options/options.go+2−2
@@ -6,8 +6,8 @@ import (
66 "regexp"
77
88 oidc "github.com/coreos/go-oidc"
9− ipapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/ip"
10− "github.com/oauth2-proxy/oauth2-proxy/providers"
9+ ipapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/ip"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/providers"
1111 "github.com/spf13/pflag"
1212)
1313
pkg/apis/options/options_suite_test.go+1−1
@@ -3,7 +3,7 @@ package options
33import (
44 "testing"
55
6− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
6+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
77 . "github.com/onsi/ginkgo"
88 . "github.com/onsi/gomega"
99)
pkg/apis/sessions/legacy_v5_tester.go+1−1
@@ -5,7 +5,7 @@ import (
55 "testing"
66 "time"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/encryption"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption"
99 "github.com/stretchr/testify/assert"
1010)
1111
pkg/apis/sessions/session_state.go+1−1
@@ -11,7 +11,7 @@ import (
1111 "time"
1212 "unicode/utf8"
1313
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/encryption"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption"
1515 "github.com/pierrec/lz4"
1616 "github.com/vmihailenco/msgpack/v4"
1717)
pkg/apis/sessions/session_state_test.go+1−1
@@ -8,7 +8,7 @@ import (
88 "testing"
99 "time"
1010
11− "github.com/oauth2-proxy/oauth2-proxy/pkg/encryption"
11+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption"
1212 . "github.com/onsi/gomega"
1313 "github.com/stretchr/testify/assert"
1414)
pkg/authentication/basic/basic_suite_test.go+1−1
@@ -3,7 +3,7 @@ package basic
33import (
44 "testing"
55
6− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
6+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
77 . "github.com/onsi/ginkgo"
88 . "github.com/onsi/gomega"
99)
pkg/authentication/basic/htpasswd.go+1−1
@@ -9,7 +9,7 @@ import (
99 "io"
1010 "os"
1111
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1313 "golang.org/x/crypto/bcrypt"
1414)
1515
pkg/cookies/cookies.go+3−3
@@ -7,9 +7,9 @@ import (
77 "strings"
88 "time"
99
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
11− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/util"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
11+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/util"
1313)
1414
1515// MakeCookie constructs a cookie from the given parameters,
pkg/ip/realclientip.go+1−1
@@ -6,7 +6,7 @@ import (
66 "net/http"
77 "strings"
88
9− ipapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/ip"
9+ ipapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/ip"
1010)
1111
1212func GetRealClientIPParser(headerKey string) (ipapi.RealClientIPParser, error) {
pkg/ip/realclientip_test.go+1−1
@@ -6,7 +6,7 @@ import (
66 "reflect"
77 "testing"
88
9− ipapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/ip"
9+ ipapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/ip"
1010 "github.com/stretchr/testify/assert"
1111)
1212
pkg/logger/logger.go+1−1
@@ -12,7 +12,7 @@ import (
1212 "text/template"
1313 "time"
1414
15− "github.com/oauth2-proxy/oauth2-proxy/pkg/util"
15+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/util"
1616)
1717
1818// AuthStatus defines the different types of auth logging that occur
pkg/middleware/basic_session.go+3−3
@@ -5,9 +5,9 @@ import (
55 "net/http"
66
77 "github.com/justinas/alice"
8− sessionsapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/authentication/basic"
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
8+ sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/authentication/basic"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1111)
1212
1313func NewBasicAuthSessionLoader(validator basic.Validator) alice.Constructor {
pkg/middleware/basic_session_test.go+2−2
@@ -6,8 +6,8 @@ import (
66 "net/http"
77 "net/http/httptest"
88
9− middlewareapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/middleware"
10− sessionsapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
9+ middlewareapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/middleware"
10+ sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1111 . "github.com/onsi/ginkgo"
1212 . "github.com/onsi/ginkgo/extensions/table"
1313 . "github.com/onsi/gomega"
pkg/middleware/jwt_session.go+3−3
@@ -8,9 +8,9 @@ import (
88
99 "github.com/coreos/go-oidc"
1010 "github.com/justinas/alice"
11− middlewareapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/middleware"
12− sessionsapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
13− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
11+ middlewareapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/middleware"
12+ sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
13+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1414)
1515
1616const jwtRegexFormat = `^eyJ[a-zA-Z0-9_-]*\.eyJ[a-zA-Z0-9_-]*\.[a-zA-Z0-9_-]+$`
pkg/middleware/jwt_session_test.go+2−2
@@ -15,8 +15,8 @@ import (
1515
1616 "github.com/coreos/go-oidc"
1717 "github.com/dgrijalva/jwt-go"
18− middlewareapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/middleware"
19− sessionsapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
18+ middlewareapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/middleware"
19+ sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
2020 . "github.com/onsi/ginkgo"
2121 . "github.com/onsi/ginkgo/extensions/table"
2222 . "github.com/onsi/gomega"
pkg/middleware/middleware_suite_test.go+1−1
@@ -4,7 +4,7 @@ import (
44 "net/http"
55 "testing"
66
7− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
7+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
88 . "github.com/onsi/ginkgo"
99 . "github.com/onsi/gomega"
1010)
pkg/middleware/redirect_to_https.go+1−1
@@ -7,7 +7,7 @@ import (
77 "strings"
88
99 "github.com/justinas/alice"
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/util"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/util"
1111)
1212
1313const httpsScheme = "https"
pkg/middleware/scope.go+1−1
@@ -5,7 +5,7 @@ import (
55 "net/http"
66
77 "github.com/justinas/alice"
8− middlewareapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/middleware"
8+ middlewareapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/middleware"
99)
1010
1111type scopeKey string
pkg/middleware/scope_test.go+1−1
@@ -5,7 +5,7 @@ import (
55 "net/http"
66 "net/http/httptest"
77
8− middlewareapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/middleware"
8+ middlewareapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/middleware"
99 . "github.com/onsi/ginkgo"
1010 . "github.com/onsi/gomega"
1111)
pkg/middleware/stored_session.go+2−2
@@ -8,8 +8,8 @@ import (
88 "time"
99
1010 "github.com/justinas/alice"
11− sessionsapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
11+ sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1313)
1414
1515// StoredSessionLoaderOptions cotnains all of the requirements to construct
pkg/middleware/stored_session_test.go+2−2
@@ -8,8 +8,8 @@ import (
88 "net/http/httptest"
99 "time"
1010
11− middlewareapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/middleware"
12− sessionsapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
11+ middlewareapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/middleware"
12+ sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1313 . "github.com/onsi/ginkgo"
1414 . "github.com/onsi/ginkgo/extensions/table"
1515 . "github.com/onsi/gomega"
pkg/requests/requests_suite_test.go+1−1
@@ -9,7 +9,7 @@ import (
99 "net/http/httptest"
1010 "testing"
1111
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1313 . "github.com/onsi/ginkgo"
1414 . "github.com/onsi/gomega"
1515)
pkg/sessions/cookie/session_store.go+5−5
@@ -8,11 +8,11 @@ import (
88 "strings"
99 "time"
1010
11− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
13− pkgcookies "github.com/oauth2-proxy/oauth2-proxy/pkg/cookies"
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/encryption"
15− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
11+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
13+ pkgcookies "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/cookies"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption"
15+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1616)
1717
1818const (
pkg/sessions/cookie/session_store_test.go+4−4
@@ -8,10 +8,10 @@ import (
88 "testing"
99 "time"
1010
11− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
12− sessionsapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
13− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions/tests"
11+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
12+ sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
13+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/tests"
1515 . "github.com/onsi/ginkgo"
1616 . "github.com/onsi/gomega"
1717 "github.com/stretchr/testify/assert"
pkg/sessions/persistence/manager.go+2−2
@@ -5,8 +5,8 @@ import (
55 "net/http"
66 "time"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1010)
1111
1212// Manager wraps a Store and handles the implementation details of the
pkg/sessions/persistence/manager_test.go+3−3
@@ -3,9 +3,9 @@ package persistence
33import (
44 "time"
55
6− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
7− sessionsapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions/tests"
6+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
7+ sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/tests"
99 . "github.com/onsi/ginkgo"
1010)
1111
pkg/sessions/persistence/persistence_suite_test.go+1−1
@@ -3,7 +3,7 @@ package persistence
33import (
44 "testing"
55
6− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
6+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
77 . "github.com/onsi/ginkgo"
88 . "github.com/onsi/gomega"
99)
pkg/sessions/persistence/ticket.go+4−4
@@ -13,10 +13,10 @@ import (
1313 "strings"
1414 "time"
1515
16− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
17− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
18− "github.com/oauth2-proxy/oauth2-proxy/pkg/cookies"
19− "github.com/oauth2-proxy/oauth2-proxy/pkg/encryption"
16+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
17+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
18+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/cookies"
19+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption"
2020)
2121
2222// saveFunc performs a persistent store's save functionality using
pkg/sessions/persistence/ticket_test.go+2−2
@@ -11,8 +11,8 @@ import (
1111 "testing"
1212 "time"
1313
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
15− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
15+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1616 . "github.com/onsi/ginkgo"
1717 . "github.com/onsi/ginkgo/extensions/table"
1818 . "github.com/onsi/gomega"
pkg/sessions/redis/redis_store.go+4−4
@@ -8,10 +8,10 @@ import (
88 "time"
99
1010 "github.com/go-redis/redis/v7"
11− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
13− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions/persistence"
11+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
13+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/persistence"
1515)
1616
1717// SessionStore is an implementation of the persistence.Store
pkg/sessions/redis/redis_store_test.go+5−5
@@ -9,11 +9,11 @@ import (
99 "github.com/Bose/minisentinel"
1010 "github.com/alicebob/miniredis/v2"
1111 "github.com/go-redis/redis/v7"
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
13− sessionsapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
15− "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions/persistence"
16− "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions/tests"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
13+ sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
15+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/persistence"
16+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/tests"
1717 . "github.com/onsi/ginkgo"
1818 . "github.com/onsi/gomega"
1919)
pkg/sessions/session_store.go+4−4
@@ -3,10 +3,10 @@ package sessions
33import (
44 "fmt"
55
6− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
7− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions/cookie"
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions/redis"
6+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
7+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/cookie"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/redis"
1010)
1111
1212// NewSessionStore creates a SessionStore from the provided configuration
pkg/sessions/session_store_test.go+6−6
@@ -6,12 +6,12 @@ import (
66 "testing"
77 "time"
88
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
11− "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions"
12− sessionscookie "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions/cookie"
13− "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions/persistence"
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions/redis"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
11+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions"
12+ sessionscookie "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/cookie"
13+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/persistence"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/redis"
1515 . "github.com/onsi/ginkgo"
1616 . "github.com/onsi/gomega"
1717)
pkg/sessions/tests/session_store_tests.go+4−4
@@ -8,10 +8,10 @@ import (
88 "strings"
99 "time"
1010
11− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
12− sessionsapi "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
13− cookiesapi "github.com/oauth2-proxy/oauth2-proxy/pkg/cookies"
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/encryption"
11+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
12+ sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
13+ cookiesapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/cookies"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption"
1515 . "github.com/onsi/ginkgo"
1616 . "github.com/onsi/gomega"
1717)
pkg/upstream/http.go+1−1
@@ -9,7 +9,7 @@ import (
99 "time"
1010
1111 "github.com/mbland/hmacauth"
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
1313 "github.com/yhat/wsutil"
1414)
1515
pkg/upstream/http_test.go+1−1
@@ -13,7 +13,7 @@ import (
1313 "strings"
1414 "time"
1515
16− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
16+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
1717 . "github.com/onsi/ginkgo"
1818 . "github.com/onsi/ginkgo/extensions/table"
1919 . "github.com/onsi/gomega"
pkg/upstream/proxy.go+2−2
@@ -6,8 +6,8 @@ import (
66 "net/http"
77 "net/url"
88
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1111)
1212
1313// ProxyErrorHandler is a function that will be used to render error pages when
pkg/upstream/proxy_test.go+1−1
@@ -8,7 +8,7 @@ import (
88 "net/http"
99 "net/http/httptest"
1010
11− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
11+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
1212 . "github.com/onsi/ginkgo"
1313 . "github.com/onsi/ginkgo/extensions/table"
1414 . "github.com/onsi/gomega"
pkg/upstream/upstream_suite_test.go+1−1
@@ -11,7 +11,7 @@ import (
1111 "path"
1212 "testing"
1313
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1515 . "github.com/onsi/ginkgo"
1616 . "github.com/onsi/gomega"
1717 "golang.org/x/net/websocket"
pkg/validation/cookie.go+2−2
@@ -5,8 +5,8 @@ import (
55 "net/http"
66 "sort"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/encryption"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption"
1010)
1111
1212func validateCookie(o options.Cookie) []string {
pkg/validation/cookie_test.go+1−1
@@ -5,7 +5,7 @@ import (
55 "testing"
66 "time"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
99 . "github.com/onsi/gomega"
1010)
1111
pkg/validation/logging.go+2−2
@@ -3,8 +3,8 @@ package validation
33import (
44 "os"
55
6− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
7− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
6+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
7+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
88 "gopkg.in/natefinch/lumberjack.v2"
99)
1010
pkg/validation/options.go+6−6
@@ -15,12 +15,12 @@ import (
1515 "github.com/coreos/go-oidc"
1616 "github.com/dgrijalva/jwt-go"
1717 "github.com/mbland/hmacauth"
18− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
19− "github.com/oauth2-proxy/oauth2-proxy/pkg/ip"
20− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
21− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
22− "github.com/oauth2-proxy/oauth2-proxy/pkg/util"
23− "github.com/oauth2-proxy/oauth2-proxy/providers"
18+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
19+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/ip"
20+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
21+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
22+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/util"
23+ "github.com/oauth2-proxy/oauth2-proxy/v7/providers"
2424)
2525
2626// Validate checks that required options are set and validates those that they
pkg/validation/options_test.go+1−1
@@ -10,7 +10,7 @@ import (
1010 "testing"
1111 "time"
1212
13− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
13+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
1414 "github.com/stretchr/testify/assert"
1515)
1616
pkg/validation/sessions.go+3−3
@@ -5,9 +5,9 @@ import (
55 "fmt"
66 "time"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/encryption"
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/sessions/redis"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/redis"
1111)
1212
1313func validateSessionCookieMinimal(o *options.Options) []string {
pkg/validation/sessions_test.go+1−1
@@ -5,7 +5,7 @@ import (
55
66 "github.com/Bose/minisentinel"
77 "github.com/alicebob/miniredis/v2"
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
99 . "github.com/onsi/ginkgo"
1010 . "github.com/onsi/ginkgo/extensions/table"
1111 . "github.com/onsi/gomega"
pkg/validation/upstreams.go+1−1
@@ -5,7 +5,7 @@ import (
55 "net/url"
66 "time"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
99)
1010
1111func validateUpstreams(upstreams options.Upstreams) []string {
pkg/validation/upstreams_test.go+1−1
@@ -3,7 +3,7 @@ package validation
33import (
44 "time"
55
6− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
6+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
77 . "github.com/onsi/ginkgo"
88 . "github.com/onsi/ginkgo/extensions/table"
99 . "github.com/onsi/gomega"
pkg/validation/validation_suite_test.go+1−1
@@ -3,7 +3,7 @@ package validation
33import (
44 "testing"
55
6− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
6+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
77 . "github.com/onsi/ginkgo"
88 . "github.com/onsi/gomega"
99)
providers/auth_test.go+1−1
@@ -5,7 +5,7 @@ import (
55 "net/http"
66 "net/url"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
99)
1010
1111var authorizedAccessToken = "imaginary_access_token"
providers/azure.go+3−3
@@ -9,9 +9,9 @@ import (
99 "time"
1010
1111 "github.com/bitly/go-simplejson"
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
13− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
13+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1515)
1616
1717// AzureProvider represents an Azure based Identity Provider
providers/bitbucket.go+3−3
@@ -5,9 +5,9 @@ import (
55 "net/url"
66 "strings"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1111)
1212
1313// BitbucketProvider represents an Bitbucket based Identity Provider
providers/bitbucket_test.go+1−1
@@ -8,7 +8,7 @@ import (
88 "net/url"
99 "testing"
1010
11− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
11+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1212 . "github.com/onsi/gomega"
1313 "github.com/stretchr/testify/assert"
1414)
providers/digitalocean.go+2−2
@@ -5,8 +5,8 @@ import (
55 "errors"
66 "net/url"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1010)
1111
1212// DigitalOceanProvider represents a DigitalOcean based Identity Provider
providers/digitalocean_test.go+1−1
@@ -7,7 +7,7 @@ import (
77 "net/url"
88 "testing"
99
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1111 . "github.com/onsi/gomega"
1212 "github.com/stretchr/testify/assert"
1313)
providers/facebook.go+2−2
@@ -5,8 +5,8 @@ import (
55 "errors"
66 "net/url"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1010)
1111
1212// FacebookProvider represents an Facebook based Identity Provider
providers/github.go+3−3
@@ -11,9 +11,9 @@ import (
1111 "strconv"
1212 "strings"
1313
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
15− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
16− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
15+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
16+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1717)
1818
1919// GitHubProvider represents an GitHub based Identity Provider
providers/github_test.go+1−1
@@ -7,7 +7,7 @@ import (
77 "net/url"
88 "testing"
99
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1111 . "github.com/onsi/gomega"
1212 "github.com/stretchr/testify/assert"
1313)
providers/gitlab.go+2−2
@@ -7,8 +7,8 @@ import (
77 "time"
88
99 oidc "github.com/coreos/go-oidc"
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
11− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
11+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1212 "golang.org/x/oauth2"
1313)
1414
providers/gitlab_test.go+1−1
@@ -7,7 +7,7 @@ import (
77 "net/url"
88 "testing"
99
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1111 "github.com/stretchr/testify/assert"
1212)
1313
providers/google.go+3−3
@@ -13,9 +13,9 @@ import (
1313 "strings"
1414 "time"
1515
16− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
17− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
18− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
16+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
17+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
18+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1919 "golang.org/x/oauth2/google"
2020 admin "google.golang.org/api/admin/directory/v1"
2121 "google.golang.org/api/googleapi"
providers/internal_util.go+2−2
@@ -5,8 +5,8 @@ import (
55 "net/http"
66 "net/url"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1010)
1111
1212// stripToken is a helper function to obfuscate "access_token"
providers/internal_util_test.go+1−1
@@ -8,7 +8,7 @@ import (
88 "net/url"
99 "testing"
1010
11− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
11+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1212 "github.com/stretchr/testify/assert"
1313)
1414
providers/keycloak.go+3−3
@@ -4,9 +4,9 @@ import (
44 "context"
55 "net/url"
66
7− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
7+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1010)
1111
1212type KeycloakProvider struct {
providers/keycloak_test.go+1−1
@@ -7,7 +7,7 @@ import (
77 "net/url"
88 "testing"
99
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1111 . "github.com/onsi/gomega"
1212 "github.com/stretchr/testify/assert"
1313)
providers/linkedin.go+2−2
@@ -6,8 +6,8 @@ import (
66 "net/http"
77 "net/url"
88
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1111)
1212
1313// LinkedInProvider represents an LinkedIn based Identity Provider
providers/linkedin_test.go+1−1
@@ -7,7 +7,7 @@ import (
77 "net/url"
88 "testing"
99
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1111 . "github.com/onsi/gomega"
1212 "github.com/stretchr/testify/assert"
1313)
providers/logingov.go+2−2
@@ -11,8 +11,8 @@ import (
1111 "time"
1212
1313 "github.com/dgrijalva/jwt-go"
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
15− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
15+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1616 "gopkg.in/square/go-jose.v2"
1717)
1818
providers/nextcloud.go+2−2
@@ -4,8 +4,8 @@ import (
44 "context"
55 "fmt"
66
7− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
7+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
99)
1010
1111// NextcloudProvider represents an Nextcloud based Identity Provider
providers/nextcloud_test.go+1−1
@@ -7,7 +7,7 @@ import (
77 "net/url"
88 "testing"
99
10− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
10+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1111 "github.com/stretchr/testify/assert"
1212)
1313
providers/oidc.go+2−2
@@ -9,8 +9,8 @@ import (
99 oidc "github.com/coreos/go-oidc"
1010 "golang.org/x/oauth2"
1111
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
13− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
13+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1414)
1515
1616const emailClaim = "email"
providers/oidc_test.go+1−1
@@ -20,7 +20,7 @@ import (
2020 "github.com/stretchr/testify/assert"
2121 "golang.org/x/oauth2"
2222
23− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
23+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
2424)
2525
2626const accessToken = "access_token"
providers/provider_data.go+1−1
@@ -5,7 +5,7 @@ import (
55 "io/ioutil"
66 "net/url"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
99)
1010
1111// ProviderData contains information required to configure all implementations
providers/provider_default.go+2−2
@@ -10,8 +10,8 @@ import (
1010
1111 "github.com/coreos/go-oidc"
1212
13− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
14− "github.com/oauth2-proxy/oauth2-proxy/pkg/requests"
13+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
14+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
1515)
1616
1717var _ Provider = (*ProviderData)(nil)
providers/provider_default_test.go+1−1
@@ -6,7 +6,7 @@ import (
66 "testing"
77 "time"
88
9− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
9+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1010 "github.com/stretchr/testify/assert"
1111)
1212
providers/providers.go+1−1
@@ -4,7 +4,7 @@ import (
44 "context"
55
66 "github.com/coreos/go-oidc"
7− "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/sessions"
7+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
88)
99
1010// Provider represents an upstream identity provider implementation
templates.go+1−1
@@ -5,7 +5,7 @@ import (
55 "path"
66 "strings"
77
8− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
8+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
99)
1010
1111func loadTemplates(dir string) *template.Template {
validator.go+1−1
@@ -9,7 +9,7 @@ import (
99 "sync/atomic"
1010 "unsafe"
1111
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1313)
1414
1515// UserMap holds information from the authenticated emails file
watcher.go+1−1
@@ -9,7 +9,7 @@ import (
99
1010 "github.com/fsnotify/fsnotify"
1111
12− "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
12+ "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1313)
1414
1515// WaitForReplacement waits for a file to exist on disk and then starts a watch
watcher_unsupported.go+1−1
@@ -2,7 +2,7 @@
22
33package main
44
5−import "github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
5+import "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
66
77func WatchForUpdates(filename string, done <-chan bool, action func()) {
88 logger.Errorf("file watching not implemented on this platform")