diff --git a/internal/api/v1/auth/oidc_test.go b/internal/api/v1/auth/oidc_test.go index f249e8f..0ed759f 100644 --- a/internal/api/v1/auth/oidc_test.go +++ b/internal/api/v1/auth/oidc_test.go @@ -306,7 +306,7 @@ func TestInitOIDC(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - _, err := NewOIDCProvider(tt.issuerURL, tt.clientID, tt.clientSecret, tt.redirectURL, tt.logoutURL, tt.allowedUsers, tt.allowedGroups) + _, err := NewOIDCProvider(tt.issuerURL, tt.clientID, tt.clientSecret, tt.redirectURL, tt.allowedUsers, tt.allowedGroups) if (err != nil) != tt.wantErr { t.Errorf("InitOIDC() error = %v, wantErr %v", err, tt.wantErr) } diff --git a/internal/gperr/utils_test.go b/internal/gperr/utils_test.go index 7298f80..4fe4422 100644 --- a/internal/gperr/utils_test.go +++ b/internal/gperr/utils_test.go @@ -29,6 +29,11 @@ func TestIsJSONMarshallable(t *testing.T) { { name: "baseError", err: &baseError{}, + want: false, + }, + { + name: "baseError with json marshallable error", + err: &baseError{&testErr{}}, want: true, }, { diff --git a/internal/net/gphttp/loadbalancer/types/server.go b/internal/net/gphttp/loadbalancer/types/server.go index a409b6e..15abc0a 100644 --- a/internal/net/gphttp/loadbalancer/types/server.go +++ b/internal/net/gphttp/loadbalancer/types/server.go @@ -52,6 +52,7 @@ func NewServer(name string, url *net.URL, weight Weight, handler http.Handler, h func TestNewServer[T ~int | ~float32 | ~float64](weight T) Server { srv := &server{ weight: Weight(weight), + url: net.MustParseURL("http://localhost"), } return srv } diff --git a/internal/net/gphttp/middleware/redirect_http_test.go b/internal/net/gphttp/middleware/redirect_http_test.go index 53221d0..eccd33c 100644 --- a/internal/net/gphttp/middleware/redirect_http_test.go +++ b/internal/net/gphttp/middleware/redirect_http_test.go @@ -4,7 +4,6 @@ import ( "net/http" "testing" - "github.com/yusing/go-proxy/internal/common" "github.com/yusing/go-proxy/internal/net/types" . "github.com/yusing/go-proxy/internal/utils/testing" ) @@ -15,7 +14,7 @@ func TestRedirectToHTTPs(t *testing.T) { }) ExpectNoError(t, err) ExpectEqual(t, result.ResponseStatus, http.StatusPermanentRedirect) - ExpectEqual(t, result.ResponseHeaders.Get("Location"), "https://example.com:"+common.ProxyHTTPSPort) + ExpectEqual(t, result.ResponseHeaders.Get("Location"), "https://example.com") } func TestNoRedirect(t *testing.T) { diff --git a/internal/net/gphttp/middleware/test_data/middleware_compose.yml b/internal/net/gphttp/middleware/test_data/middleware_compose.yml index 4ec3040..2e1718b 100644 --- a/internal/net/gphttp/middleware/test_data/middleware_compose.yml +++ b/internal/net/gphttp/middleware/test_data/middleware_compose.yml @@ -8,19 +8,6 @@ theGreatPretender: - X-Test3 - X-Test4 -notAuthenticAuthentik: - - use: RedirectHTTP - - use: ForwardAuth - address: https://authentik.company - trustForwardHeader: true - addAuthCookiesToResponse: - - session_id - - user_id - authResponseHeaders: - - X-Auth-SessionID - - X-Auth-UserID - - use: CustomErrorPage - realIPAuthentik: - use: RedirectHTTP - use: RealIP @@ -30,9 +17,6 @@ realIPAuthentik: - "192.168.0.0/16" - "172.16.0.0/12" recursive: true - - use: ForwardAuth - address: https://authentik.company - trustForwardHeader: true testFakeRealIP: - use: ModifyRequest