diff --git a/go.mod b/go.mod index 4bbeb51a2c..d04aafd76f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/higress-group/oauth2-proxy +module github.com/Jing-ze/oauth2-proxy go 1.19 diff --git a/load.go b/load.go index 818398fa35..3a8f1162c0 100644 --- a/load.go +++ b/load.go @@ -3,9 +3,9 @@ package oidc import ( "fmt" - "github.com/higress-group/oauth2-proxy/pkg/apis/options" - "github.com/higress-group/oauth2-proxy/pkg/mapstructure" - "github.com/higress-group/oauth2-proxy/pkg/validation" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/options" + "github.com/Jing-ze/oauth2-proxy/pkg/mapstructure" + "github.com/Jing-ze/oauth2-proxy/pkg/validation" "github.com/tidwall/gjson" ) diff --git a/oauthproxy.go b/oauthproxy.go index c8e5d9a927..b521a377f0 100644 --- a/oauthproxy.go +++ b/oauthproxy.go @@ -9,18 +9,18 @@ import ( "strings" "time" - "github.com/higress-group/oauth2-proxy/pkg/apis/options" - sessionsapi "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" - "github.com/higress-group/oauth2-proxy/pkg/app/redirect" - "github.com/higress-group/oauth2-proxy/pkg/cookies" - "github.com/higress-group/oauth2-proxy/pkg/encryption" - "github.com/higress-group/oauth2-proxy/pkg/middleware" - requestutil "github.com/higress-group/oauth2-proxy/pkg/requests/util" - "github.com/higress-group/oauth2-proxy/pkg/sessions" - "github.com/higress-group/oauth2-proxy/pkg/util" - "github.com/higress-group/oauth2-proxy/providers" - - middlewareapi "github.com/higress-group/oauth2-proxy/pkg/apis/middleware" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/options" + sessionsapi "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" + "github.com/Jing-ze/oauth2-proxy/pkg/app/redirect" + "github.com/Jing-ze/oauth2-proxy/pkg/cookies" + "github.com/Jing-ze/oauth2-proxy/pkg/encryption" + "github.com/Jing-ze/oauth2-proxy/pkg/middleware" + requestutil "github.com/Jing-ze/oauth2-proxy/pkg/requests/util" + "github.com/Jing-ze/oauth2-proxy/pkg/sessions" + "github.com/Jing-ze/oauth2-proxy/pkg/util" + "github.com/Jing-ze/oauth2-proxy/providers" + + middlewareapi "github.com/Jing-ze/oauth2-proxy/pkg/apis/middleware" "github.com/alibaba/higress/plugins/wasm-go/pkg/wrapper" "github.com/gorilla/mux" diff --git a/pkg/apis/middleware/scope.go b/pkg/apis/middleware/scope.go index ea3ea5059c..f80f93edd3 100644 --- a/pkg/apis/middleware/scope.go +++ b/pkg/apis/middleware/scope.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" ) type scopeKey string diff --git a/pkg/apis/middleware/session.go b/pkg/apis/middleware/session.go index 9fa92ff0ad..b7e6d9b38d 100644 --- a/pkg/apis/middleware/session.go +++ b/pkg/apis/middleware/session.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - sessionsapi "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" + sessionsapi "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" - oidc "github.com/higress-group/oauth2-proxy/pkg/providers/go_oidc" + oidc "github.com/Jing-ze/oauth2-proxy/pkg/providers/go_oidc" ) // TokenToSessionFunc takes a raw ID Token and converts it into a SessionState. diff --git a/pkg/apis/sessions/session_state.go b/pkg/apis/sessions/session_state.go index 5905401430..438a537e9c 100644 --- a/pkg/apis/sessions/session_state.go +++ b/pkg/apis/sessions/session_state.go @@ -7,8 +7,8 @@ import ( "encoding/json" - "github.com/higress-group/oauth2-proxy/pkg/clock" - "github.com/higress-group/oauth2-proxy/pkg/encryption" + "github.com/Jing-ze/oauth2-proxy/pkg/clock" + "github.com/Jing-ze/oauth2-proxy/pkg/encryption" ) // // SessionState is used to store information about the currently authenticated user session diff --git a/pkg/app/redirect/director.go b/pkg/app/redirect/director.go index 041db187bb..e7068e330a 100644 --- a/pkg/app/redirect/director.go +++ b/pkg/app/redirect/director.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/higress-group/oauth2-proxy/pkg/util" + "github.com/Jing-ze/oauth2-proxy/pkg/util" ) // AppDirector is responsible for determining where OAuth2 Proxy should redirect diff --git a/pkg/app/redirect/getters.go b/pkg/app/redirect/getters.go index 2db07ae0ba..4ae3571d1d 100644 --- a/pkg/app/redirect/getters.go +++ b/pkg/app/redirect/getters.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - requestutil "github.com/higress-group/oauth2-proxy/pkg/requests/util" + requestutil "github.com/Jing-ze/oauth2-proxy/pkg/requests/util" ) // redirectGetter represents a method to allow the proxy to determine a redirect diff --git a/pkg/app/redirect/validator.go b/pkg/app/redirect/validator.go index c79a3b0c16..42e36fc1a1 100644 --- a/pkg/app/redirect/validator.go +++ b/pkg/app/redirect/validator.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/higress-group/oauth2-proxy/pkg/util" + "github.com/Jing-ze/oauth2-proxy/pkg/util" ) var ( diff --git a/pkg/cookies/cookies.go b/pkg/cookies/cookies.go index f4f781339c..aae0b83339 100644 --- a/pkg/cookies/cookies.go +++ b/pkg/cookies/cookies.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/higress-group/oauth2-proxy/pkg/apis/options" - "github.com/higress-group/oauth2-proxy/pkg/util" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/options" + "github.com/Jing-ze/oauth2-proxy/pkg/util" - requestutil "github.com/higress-group/oauth2-proxy/pkg/requests/util" + requestutil "github.com/Jing-ze/oauth2-proxy/pkg/requests/util" ) // MakeCookieFromOptions constructs a cookie based on the given *options.CookieOptions, diff --git a/pkg/cookies/csrf.go b/pkg/cookies/csrf.go index e18e13f4ab..39794afba6 100644 --- a/pkg/cookies/csrf.go +++ b/pkg/cookies/csrf.go @@ -6,13 +6,13 @@ import ( "net/http" "time" - "github.com/higress-group/oauth2-proxy/pkg/apis/options" - "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/options" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" "encoding/json" - "github.com/higress-group/oauth2-proxy/pkg/clock" - "github.com/higress-group/oauth2-proxy/pkg/encryption" + "github.com/Jing-ze/oauth2-proxy/pkg/clock" + "github.com/Jing-ze/oauth2-proxy/pkg/encryption" ) // CSRF manages various nonces stored in the CSRF cookie during the initial diff --git a/pkg/ip/realclientip.go b/pkg/ip/realclientip.go index 1a0de9155d..ce117ddb2b 100644 --- a/pkg/ip/realclientip.go +++ b/pkg/ip/realclientip.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - ipapi "github.com/higress-group/oauth2-proxy/pkg/apis/ip" + ipapi "github.com/Jing-ze/oauth2-proxy/pkg/apis/ip" ) func GetRealClientIPParser(headerKey string) (ipapi.RealClientIPParser, error) { diff --git a/pkg/middleware/scope.go b/pkg/middleware/scope.go index 8cf8e31a49..34a0c23c4c 100644 --- a/pkg/middleware/scope.go +++ b/pkg/middleware/scope.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - middlewareapi "github.com/higress-group/oauth2-proxy/pkg/apis/middleware" + middlewareapi "github.com/Jing-ze/oauth2-proxy/pkg/apis/middleware" "github.com/google/uuid" "github.com/justinas/alice" diff --git a/pkg/middleware/stored_session.go b/pkg/middleware/stored_session.go index 3801bc6b73..d9bef1490f 100644 --- a/pkg/middleware/stored_session.go +++ b/pkg/middleware/stored_session.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - middlewareapi "github.com/higress-group/oauth2-proxy/pkg/apis/middleware" - sessionsapi "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" - "github.com/higress-group/oauth2-proxy/pkg/util" + middlewareapi "github.com/Jing-ze/oauth2-proxy/pkg/apis/middleware" + sessionsapi "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" + "github.com/Jing-ze/oauth2-proxy/pkg/util" - oidc "github.com/higress-group/oauth2-proxy/pkg/providers/go_oidc" + oidc "github.com/Jing-ze/oauth2-proxy/pkg/providers/go_oidc" "github.com/alibaba/higress/plugins/wasm-go/pkg/wrapper" "github.com/higress-group/proxy-wasm-go-sdk/proxywasm" diff --git a/pkg/providers/go_oidc/jwks.go b/pkg/providers/go_oidc/jwks.go index 66856028c6..3e550217cb 100644 --- a/pkg/providers/go_oidc/jwks.go +++ b/pkg/providers/go_oidc/jwks.go @@ -26,7 +26,7 @@ import ( "net/http" "time" - "github.com/higress-group/oauth2-proxy/pkg/util" + "github.com/Jing-ze/oauth2-proxy/pkg/util" "github.com/alibaba/higress/plugins/wasm-go/pkg/wrapper" "github.com/go-jose/go-jose/v4" diff --git a/pkg/providers/oidc/provider_verifier.go b/pkg/providers/oidc/provider_verifier.go index 836af257d7..3a30a375a7 100644 --- a/pkg/providers/oidc/provider_verifier.go +++ b/pkg/providers/oidc/provider_verifier.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - oidc "github.com/higress-group/oauth2-proxy/pkg/providers/go_oidc" - "github.com/higress-group/oauth2-proxy/pkg/providers/util" + oidc "github.com/Jing-ze/oauth2-proxy/pkg/providers/go_oidc" + "github.com/Jing-ze/oauth2-proxy/pkg/providers/util" ) // ProviderVerifier represents the OIDC discovery and verification process diff --git a/pkg/providers/oidc/verifier.go b/pkg/providers/oidc/verifier.go index 8f53f04aff..06fb874e88 100755 --- a/pkg/providers/oidc/verifier.go +++ b/pkg/providers/oidc/verifier.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - oidc "github.com/higress-group/oauth2-proxy/pkg/providers/go_oidc" + oidc "github.com/Jing-ze/oauth2-proxy/pkg/providers/go_oidc" ) // idTokenVerifier allows an ID Token to be verified against the issue and provided keys. diff --git a/pkg/requests/util/util.go b/pkg/requests/util/util.go index d426303c6a..a8cc02fb02 100644 --- a/pkg/requests/util/util.go +++ b/pkg/requests/util/util.go @@ -3,7 +3,7 @@ package util import ( "net/http" - middlewareapi "github.com/higress-group/oauth2-proxy/pkg/apis/middleware" + middlewareapi "github.com/Jing-ze/oauth2-proxy/pkg/apis/middleware" ) const ( diff --git a/pkg/sessions/cookie/session_store.go b/pkg/sessions/cookie/session_store.go index f31edfb31a..08c911c17c 100644 --- a/pkg/sessions/cookie/session_store.go +++ b/pkg/sessions/cookie/session_store.go @@ -8,10 +8,10 @@ import ( "regexp" "time" - "github.com/higress-group/oauth2-proxy/pkg/apis/options" - "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" - pkgcookies "github.com/higress-group/oauth2-proxy/pkg/cookies" - "github.com/higress-group/oauth2-proxy/pkg/encryption" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/options" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" + pkgcookies "github.com/Jing-ze/oauth2-proxy/pkg/cookies" + "github.com/Jing-ze/oauth2-proxy/pkg/encryption" ) const ( diff --git a/pkg/sessions/session_store.go b/pkg/sessions/session_store.go index 45edbb7bf2..98b5954c67 100644 --- a/pkg/sessions/session_store.go +++ b/pkg/sessions/session_store.go @@ -3,9 +3,9 @@ package sessions import ( "fmt" - "github.com/higress-group/oauth2-proxy/pkg/apis/options" - "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" - "github.com/higress-group/oauth2-proxy/pkg/sessions/cookie" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/options" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" + "github.com/Jing-ze/oauth2-proxy/pkg/sessions/cookie" ) // NewSessionStore creates a SessionStore from the provided configuration diff --git a/pkg/validation/cookie.go b/pkg/validation/cookie.go index 4e64e4cbfe..2828bf4bd0 100644 --- a/pkg/validation/cookie.go +++ b/pkg/validation/cookie.go @@ -6,8 +6,8 @@ import ( "sort" "time" - "github.com/higress-group/oauth2-proxy/pkg/apis/options" - "github.com/higress-group/oauth2-proxy/pkg/encryption" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/options" + "github.com/Jing-ze/oauth2-proxy/pkg/encryption" ) func validateCookie(o options.Cookie) []string { diff --git a/pkg/validation/options.go b/pkg/validation/options.go index bbe472fe69..f524130448 100644 --- a/pkg/validation/options.go +++ b/pkg/validation/options.go @@ -5,8 +5,8 @@ import ( "net/url" "strings" - "github.com/higress-group/oauth2-proxy/pkg/apis/options" - "github.com/higress-group/oauth2-proxy/pkg/util" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/options" + "github.com/Jing-ze/oauth2-proxy/pkg/util" ) // Validate checks that required options are set and validates those that they diff --git a/pkg/validation/providers.go b/pkg/validation/providers.go index b4398f0111..8afd774bc7 100644 --- a/pkg/validation/providers.go +++ b/pkg/validation/providers.go @@ -3,7 +3,7 @@ package validation import ( "fmt" - "github.com/higress-group/oauth2-proxy/pkg/apis/options" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/options" ) // validateProviders is the initial validation migration for multiple providrers diff --git a/providers/aliyun.go b/providers/aliyun.go index ac64dbc2b6..a463b86736 100644 --- a/providers/aliyun.go +++ b/providers/aliyun.go @@ -6,9 +6,9 @@ import ( "net/http" "net/url" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" + "github.com/Jing-ze/oauth2-proxy/pkg/util" "github.com/alibaba/higress/plugins/wasm-go/pkg/wrapper" - "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" - "github.com/higress-group/oauth2-proxy/pkg/util" ) type AliyunProvider struct { diff --git a/providers/github.go b/providers/github.go index c7da498f3a..b42a9cc171 100644 --- a/providers/github.go +++ b/providers/github.go @@ -5,8 +5,8 @@ import ( "net/http" "net/url" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" "github.com/alibaba/higress/plugins/wasm-go/pkg/wrapper" - "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" ) // GitHubProvider represents an GitHub based Identity Provider diff --git a/providers/internal_util.go b/providers/internal_util.go index 93c49d5f56..f917d09b04 100644 --- a/providers/internal_util.go +++ b/providers/internal_util.go @@ -5,8 +5,8 @@ import ( "net/http" "net/url" + "github.com/Jing-ze/oauth2-proxy/pkg/util" "github.com/alibaba/higress/plugins/wasm-go/pkg/wrapper" - "github.com/higress-group/oauth2-proxy/pkg/util" ) // stripToken is a helper function to obfuscate "access_token" diff --git a/providers/oidc.go b/providers/oidc.go index 7c7056caf3..609feaf08d 100644 --- a/providers/oidc.go +++ b/providers/oidc.go @@ -7,9 +7,9 @@ import ( "net/http" "net/url" - "github.com/higress-group/oauth2-proxy/pkg/apis/options" - "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" - "github.com/higress-group/oauth2-proxy/pkg/util" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/options" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" + "github.com/Jing-ze/oauth2-proxy/pkg/util" "github.com/alibaba/higress/plugins/wasm-go/pkg/wrapper" ) diff --git a/providers/provider_data.go b/providers/provider_data.go index 3519bbffc4..8a19052759 100644 --- a/providers/provider_data.go +++ b/providers/provider_data.go @@ -9,13 +9,13 @@ import ( "regexp" "strings" - "github.com/higress-group/oauth2-proxy/pkg/apis/options" - "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" - "github.com/higress-group/oauth2-proxy/pkg/middleware" - oidc "github.com/higress-group/oauth2-proxy/pkg/providers/go_oidc" - internaloidc "github.com/higress-group/oauth2-proxy/pkg/providers/oidc" - "github.com/higress-group/oauth2-proxy/pkg/providers/util" - pkgutil "github.com/higress-group/oauth2-proxy/pkg/util" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/options" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" + "github.com/Jing-ze/oauth2-proxy/pkg/middleware" + oidc "github.com/Jing-ze/oauth2-proxy/pkg/providers/go_oidc" + internaloidc "github.com/Jing-ze/oauth2-proxy/pkg/providers/oidc" + "github.com/Jing-ze/oauth2-proxy/pkg/providers/util" + pkgutil "github.com/Jing-ze/oauth2-proxy/pkg/util" ) const ( diff --git a/providers/provider_default.go b/providers/provider_default.go index 73d04a0661..ff2cb0927c 100644 --- a/providers/provider_default.go +++ b/providers/provider_default.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" - "github.com/higress-group/oauth2-proxy/pkg/util" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" + "github.com/Jing-ze/oauth2-proxy/pkg/util" "github.com/alibaba/higress/plugins/wasm-go/pkg/wrapper" ) diff --git a/providers/providers.go b/providers/providers.go index 996d36915a..236f0f244f 100644 --- a/providers/providers.go +++ b/providers/providers.go @@ -8,11 +8,11 @@ import ( "net/url" "strings" - "github.com/higress-group/oauth2-proxy/pkg/apis/options" - "github.com/higress-group/oauth2-proxy/pkg/apis/sessions" - internaloidc "github.com/higress-group/oauth2-proxy/pkg/providers/oidc" - "github.com/higress-group/oauth2-proxy/pkg/providers/util" - pkgutil "github.com/higress-group/oauth2-proxy/pkg/util" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/options" + "github.com/Jing-ze/oauth2-proxy/pkg/apis/sessions" + internaloidc "github.com/Jing-ze/oauth2-proxy/pkg/providers/oidc" + "github.com/Jing-ze/oauth2-proxy/pkg/providers/util" + pkgutil "github.com/Jing-ze/oauth2-proxy/pkg/util" "github.com/alibaba/higress/plugins/wasm-go/pkg/wrapper" ) diff --git a/providers/util.go b/providers/util.go index 6b200eaae7..7ebb525f3f 100644 --- a/providers/util.go +++ b/providers/util.go @@ -5,7 +5,7 @@ import ( "net/http" "net/url" - pkgutil "github.com/higress-group/oauth2-proxy/pkg/util" + pkgutil "github.com/Jing-ze/oauth2-proxy/pkg/util" ) const (