@@ -15,7 +15,6 @@ import (
1515 "time"
1616
1717 "github.com/coreos/go-oidc/v3/oidc"
18− middlewareapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/middleware"
1918 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
2019 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
2120 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/authentication/hmacauth"
@@ -54,7 +53,7 @@ func TestRobotsTxt(t *testing.T) {
5453 t.Fatal(err)
5554 }
5655 rw := httptest.NewRecorder()
57− req, _ := http.NewRequest(http.MethodGet, "/robots.txt", nil)
56+ req, _ := http.NewRequest("GET", "/robots.txt", nil)
5857 proxy.ServeHTTP(rw, req)
5958 assert.Equal(t, 200, rw.Code)
6059 assert.Equal(t, "User-agent: *\nDisallow: /\n", rw.Body.String())
@@ -241,7 +240,7 @@ func TestBasicAuthPassword(t *testing.T) {
241240
242241 // Save the required session
243242 rw := httptest.NewRecorder()
244− req, _ := http.NewRequest(http.MethodGet, "/", nil)
243+ req, _ := http.NewRequest("GET", "/", nil)
245244 err = proxy.sessionStore.Save(rw, req, &sessions.SessionState{
246245 Email: emailAddress,
247246 })
@@ -250,7 +249,7 @@ func TestBasicAuthPassword(t *testing.T) {
250249 // Extract the cookie value to inject into the test request
251250 cookie := rw.Header().Values("Set-Cookie")[0]
252251
253− req, _ = http.NewRequest(http.MethodGet, "/", nil)
252+ req, _ = http.NewRequest("GET", "/", nil)
254253 req.Header.Set("Cookie", cookie)
255254 rw = httptest.NewRecorder()
256255 proxy.ServeHTTP(rw, req)
@@ -300,14 +299,14 @@ func TestPassGroupsHeadersWithGroups(t *testing.T) {
300299
301300 // Save the required session
302301 rw := httptest.NewRecorder()
303− req, _ := http.NewRequest(http.MethodGet, "/", nil)
302+ req, _ := http.NewRequest("GET", "/", nil)
304303 err = proxy.sessionStore.Save(rw, req, session)
305304 assert.NoError(t, err)
306305
307306 // Extract the cookie value to inject into the test request
308307 cookie := rw.Header().Values("Set-Cookie")[0]
309308
310− req, _ = http.NewRequest(http.MethodGet, "/", nil)
309+ req, _ = http.NewRequest("GET", "/", nil)
311310 req.Header.Set("Cookie", cookie)
312311 rw = httptest.NewRecorder()
313312 proxy.ServeHTTP(rw, req)
@@ -457,7 +456,7 @@ func (patTest *PassAccessTokenTest) getEndpointWithCookie(cookie string, endpoin
457456 return 0, ""
458457 }
459458
460− req, err := http.NewRequest(http.MethodGet, endpoint, strings.NewReader(""))
459+ req, err := http.NewRequest("GET", endpoint, strings.NewReader(""))
461460 if err != nil {
462461 return 0, ""
463462 }
@@ -608,7 +607,7 @@ func NewSignInPageTest(skipProvider bool) (*SignInPageTest, error) {
608607
609608func (sipTest *SignInPageTest) GetEndpoint(endpoint string) (int, string) {
610609 rw := httptest.NewRecorder()
611− req, _ := http.NewRequest(http.MethodGet, endpoint, strings.NewReader(""))
610+ req, _ := http.NewRequest("GET", endpoint, strings.NewReader(""))
612611 sipTest.proxy.ServeHTTP(rw, req)
613612 return rw.Code, rw.Body.String()
614613}
@@ -713,50 +712,6 @@ func TestManualSignInCorrectCredentials(t *testing.T) {
713712 assert.Equal(t, http.StatusFound, statusCode)
714713}
715714
716−func TestSignInPageClearsExistingSessionCookie(t *testing.T) {
717− opts := baseTestOptions()
718− err := validation.Validate(opts)
719− require.NoError(t, err)
720−
721− proxy, err := NewOAuthProxy(opts, func(string) bool {
722− return true
723− })
724− require.NoError(t, err)
725−
726− // Create a real session cookie using the actual session store.
727− saveRW := httptest.NewRecorder()
728− saveReq := httptest.NewRequest(http.MethodGet, "/", nil)
729− err = proxy.sessionStore.Save(saveRW, saveReq, &sessions.SessionState{
730− Email: "john.doe@example.com",
731− })
732− require.NoError(t, err)
733−
734− cookies := saveRW.Result().Cookies()
735− require.NotEmpty(t, cookies)
736−
737− // Send that cookie to the sign-in page.
738− req := httptest.NewRequest(http.MethodGet, "/oauth2/sign_in", nil)
739− for _, c := range cookies {
740− req.AddCookie(c)
741− }
742−
743− rw := httptest.NewRecorder()
744− proxy.ServeHTTP(rw, req)
745−
746− assert.Equal(t, http.StatusOK, rw.Code)
747−
748− cleared := false
749− for _, c := range rw.Result().Cookies() {
750− if c.Name == proxy.CookieOptions.Name {
751− cleared = true
752− assert.Equal(t, "", c.Value)
753− assert.Less(t, c.MaxAge, 0)
754− }
755− }
756−
757− assert.True(t, cleared, "expected sign-in page to clear existing session cookie")
758−}
759−
760715func TestSignInPageIncludesTargetRedirect(t *testing.T) {
761716 sipTest, err := NewSignInPageTest(false)
762717 if err != nil {
@@ -894,7 +849,7 @@ func NewProcessCookieTest(opts ProcessCookieTestOpts, modifiers ...OptionsModifi
894849 // access_token validation.
895850 pcTest.proxy.CookieOptions.Refresh = time.Duration(0)
896851 pcTest.rw = httptest.NewRecorder()
897− pcTest.req, _ = http.NewRequest(http.MethodGet, "/", strings.NewReader(""))
852+ pcTest.req, _ = http.NewRequest("GET", "/", strings.NewReader(""))
898853 pcTest.validateUser = true
899854 return &pcTest, nil
900855}
@@ -1027,7 +982,7 @@ func NewUserInfoEndpointTest() (*ProcessCookieTest, error) {
1027982 if err != nil {
1028983 return nil, err
1029984 }
1030− pcTest.req, _ = http.NewRequest(http.MethodGet,
985+ pcTest.req, _ = http.NewRequest("GET",
1031986 pcTest.opts.ProxyPrefix+"/userinfo", nil)
1032987 return pcTest, nil
1033988}
@@ -1077,20 +1032,6 @@ func TestUserInfoEndpointAccepted(t *testing.T) {
10771032 },
10781033 expectedResponse: "{\"user\":\"john.doe\",\"email\":\"john.doe@example.com\",\"groups\":[\"example\",\"groups\"],\"preferredUsername\":\"john\"}\n",
10791034 },
1080− {
1081− name: "With Additional Claim",
1082− session: &sessions.SessionState{
1083− User: "john.doe",
1084− PreferredUsername: "john",
1085− Email: "john.doe@example.com",
1086− Groups: []string{"example", "groups"},
1087− AccessToken: "my_access_token",
1088− AdditionalClaims: map[string]interface{}{
1089− "foo": "bar",
1090− },
1091− },
1092− expectedResponse: "{\"user\":\"john.doe\",\"email\":\"john.doe@example.com\",\"groups\":[\"example\",\"groups\"],\"preferredUsername\":\"john\",\"additionalClaims\":{\"foo\":\"bar\"}}\n",
1093− },
10941035 }
10951036
10961037 for _, tc := range testCases {
@@ -1135,7 +1076,7 @@ func NewAuthOnlyEndpointTest(querystring string, modifiers ...OptionsModifier) (
11351076 return nil, err
11361077 }
11371078 pcTest.req, _ = http.NewRequest(
1138− http.MethodGet,
1079+ "GET",
11391080 fmt.Sprintf("%s/auth%s", pcTest.opts.ProxyPrefix, querystring),
11401081 nil)
11411082 return pcTest, nil
@@ -1274,7 +1215,7 @@ func TestAuthOnlyEndpointSetXAuthRequestHeaders(t *testing.T) {
12741215 pcTest.validateUser = true
12751216
12761217 pcTest.rw = httptest.NewRecorder()
1277− pcTest.req, _ = http.NewRequest(http.MethodGet,
1218+ pcTest.req, _ = http.NewRequest("GET",
12781219 pcTest.opts.ProxyPrefix+authOnlyPath, nil)
12791220
12801221 created := time.Now()
@@ -1367,7 +1308,7 @@ func TestAuthOnlyEndpointSetBasicAuthTrueRequestHeaders(t *testing.T) {
13671308 pcTest.validateUser = true
13681309
13691310 pcTest.rw = httptest.NewRecorder()
1370− pcTest.req, _ = http.NewRequest(http.MethodGet,
1311+ pcTest.req, _ = http.NewRequest("GET",
13711312 pcTest.opts.ProxyPrefix+authOnlyPath, nil)
13721313
13731314 created := time.Now()
@@ -1447,7 +1388,7 @@ func TestAuthOnlyEndpointSetBasicAuthFalseRequestHeaders(t *testing.T) {
14471388 pcTest.validateUser = true
14481389
14491390 pcTest.rw = httptest.NewRecorder()
1450− pcTest.req, _ = http.NewRequest(http.MethodGet,
1391+ pcTest.req, _ = http.NewRequest("GET",
14511392 pcTest.opts.ProxyPrefix+authOnlyPath, nil)
14521393
14531394 created := time.Now()
@@ -1495,7 +1436,7 @@ func TestAuthSkippedForPreflightRequests(t *testing.T) {
14951436 }
14961437 proxy.provider = NewTestProvider(upstreamURL, "")
14971438 rw := httptest.NewRecorder()
1498− req, _ := http.NewRequest(http.MethodOptions, "/preflight-request", nil)
1439+ req, _ := http.NewRequest("OPTIONS", "/preflight-request", nil)
14991440 proxy.ServeHTTP(rw, req)
15001441
15011442 assert.Equal(t, 200, rw.Code)
@@ -1652,19 +1593,19 @@ func TestRequestSignature(t *testing.T) {
16521593 resp string
16531594 }{
16541595 "No request signature": {
1655− method: http.MethodGet,
1596+ method: "GET",
16561597 body: "",
16571598 key: "",
16581599 resp: "no signature received",
16591600 },
16601601 "Get request": {
1661− method: http.MethodGet,
1602+ method: "GET",
16621603 body: "",
16631604 key: "7d9e1aa87a5954e6f9fc59266b3af9d7c35fda2d",
16641605 resp: "signatures match",
16651606 },
16661607 "Post request": {
1667− method: http.MethodPost,
1608+ method: "POST",
16681609 body: `{ "hello": "world!" }`,
16691610 key: "d90df39e2d19282840252612dd7c81421a372f61",
16701611 resp: "signatures match",
@@ -2087,44 +2028,6 @@ func Test_noCacheHeaders(t *testing.T) {
20872028 })
20882029}
20892030
2090−func TestSignOutCallsBackendLogoutURL(t *testing.T) {
2091− const testIDToken = "test-id-token-12345"
2092− var receivedURL string
2093− backendLogoutServer := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
2094− receivedURL = req.URL.String()
2095− rw.WriteHeader(http.StatusOK)
2096− }))
2097− defer backendLogoutServer.Close()
2098−
2099− opts := baseTestOptions()
2100− opts.Providers[0].BackendLogoutURL = backendLogoutServer.URL + "/logout?id_token_hint={id_token}"
2101− err := validation.Validate(opts)
2102− require.NoError(t, err)
2103−
2104− proxy, err := NewOAuthProxy(opts, func(string) bool { return true })
2105− require.NoError(t, err)
2106−
2107− // Save a session with IDToken so backend logout can use it
2108− rw := httptest.NewRecorder()
2109− req := httptest.NewRequest(http.MethodGet, "/", nil)
2110− err = proxy.sessionStore.Save(rw, req, &sessions.SessionState{
2111− Email: "user@example.com",
2112− IDToken: testIDToken,
2113− })
2114− require.NoError(t, err)
2115− cookie := rw.Header().Values("Set-Cookie")[0]
2116−
2117− // Hit sign_out with the session cookie; backend logout should be called before session is cleared
2118− signOutReq := httptest.NewRequest(http.MethodGet, "/oauth2/sign_out", nil)
2119− signOutReq.Header.Set("Cookie", cookie)
2120− rec := httptest.NewRecorder()
2121− proxy.ServeHTTP(rec, signOutReq)
2122−
2123− assert.Equal(t, http.StatusFound, rec.Code, "sign_out should redirect")
2124− assert.Contains(t, receivedURL, "id_token_hint="+testIDToken,
2125− "backend logout URL should have been called with id_token from session")
2126−}
2127−
21282031func baseTestOptions() *options.Options {
21292032 opts := options.NewOptions()
21302033 opts.Cookie.Secret = rawCookieSecret
@@ -2189,33 +2092,7 @@ func TestTrustedIPs(t *testing.T) {
21892092 reverseProxy: false,
21902093 realClientIPHeader: "X-Real-IP", // Default value
21912094 req: func() *http.Request {
2192− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2193− return req
2194− }(),
2195− expectTrusted: false,
2196− },
2197− // Check Unix socket with no trusted IPs configured does not error.
2198− {
2199− name: "UnixSocketWithoutTrustedIPs",
2200− trustedIPs: nil,
2201− reverseProxy: false,
2202− realClientIPHeader: "X-Real-IP",
2203− req: func() *http.Request {
2204− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2205− req.RemoteAddr = "@"
2206− return req
2207− }(),
2208− expectTrusted: false,
2209− },
2210− // Check Unix socket with trusted IPs configured returns false (no IP to match).
2211− {
2212− name: "UnixSocketWithTrustedIPs",
2213− trustedIPs: []string{"127.0.0.1"},
2214− reverseProxy: false,
2215− realClientIPHeader: "X-Real-IP",
2216− req: func() *http.Request {
2217− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2218− req.RemoteAddr = "@"
2095+ req, _ := http.NewRequest("GET", "/", nil)
22192096 return req
22202097 }(),
22212098 expectTrusted: false,
@@ -2227,7 +2104,7 @@ func TestTrustedIPs(t *testing.T) {
22272104 reverseProxy: false,
22282105 realClientIPHeader: "X-Real-IP", // Default value
22292106 req: func() *http.Request {
2230− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2107+ req, _ := http.NewRequest("GET", "/", nil)
22312108 req.RemoteAddr = "127.0.0.1:43670"
22322109 return req
22332110 }(),
@@ -2240,7 +2117,7 @@ func TestTrustedIPs(t *testing.T) {
22402117 reverseProxy: true,
22412118 realClientIPHeader: "X-Real-IP", // Default value
22422119 req: func() *http.Request {
2243− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2120+ req, _ := http.NewRequest("GET", "/", nil)
22442121 req.RemoteAddr = "127.0.0.1:44324"
22452122 return req
22462123 }(),
@@ -2253,7 +2130,7 @@ func TestTrustedIPs(t *testing.T) {
22532130 reverseProxy: true,
22542131 realClientIPHeader: "X-Forwarded-For",
22552132 req: func() *http.Request {
2256− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2133+ req, _ := http.NewRequest("GET", "/", nil)
22572134 req.Header.Add("X-Forwarded-For", "127.0.0.1")
22582135 return req
22592136 }(),
@@ -2266,7 +2143,7 @@ func TestTrustedIPs(t *testing.T) {
22662143 reverseProxy: true,
22672144 realClientIPHeader: "X-Forwarded-For",
22682145 req: func() *http.Request {
2269− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2146+ req, _ := http.NewRequest("GET", "/", nil)
22702147 req.Header.Add("X-Forwarded-For", "::1")
22712148 return req
22722149 }(),
@@ -2279,7 +2156,7 @@ func TestTrustedIPs(t *testing.T) {
22792156 reverseProxy: true,
22802157 realClientIPHeader: "X-Forwarded-For",
22812158 req: func() *http.Request {
2282− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2159+ req, _ := http.NewRequest("GET", "/", nil)
22832160 req.Header.Add("X-Forwarded-For", "12.34.56.78")
22842161 return req
22852162 }(),
@@ -2292,7 +2169,7 @@ func TestTrustedIPs(t *testing.T) {
22922169 reverseProxy: true,
22932170 realClientIPHeader: "X-Forwarded-For",
22942171 req: func() *http.Request {
2295− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2172+ req, _ := http.NewRequest("GET", "/", nil)
22962173 req.Header.Add("X-Forwarded-For", "::2")
22972174 return req
22982175 }(),
@@ -2305,7 +2182,7 @@ func TestTrustedIPs(t *testing.T) {
23052182 reverseProxy: true,
23062183 realClientIPHeader: "X-Forwarded-For",
23072184 req: func() *http.Request {
2308− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2185+ req, _ := http.NewRequest("GET", "/", nil)
23092186 req.Header.Add("X-Real-IP", "::1")
23102187 return req
23112188 }(),
@@ -2318,7 +2195,7 @@ func TestTrustedIPs(t *testing.T) {
23182195 reverseProxy: true,
23192196 realClientIPHeader: "X-Forwarded-For",
23202197 req: func() *http.Request {
2321− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2198+ req, _ := http.NewRequest("GET", "/", nil)
23222199 req.Header.Add("X-Forwarded-For", "adsfljk29242as!!")
23232200 return req
23242201 }(),
@@ -2331,7 +2208,7 @@ func TestTrustedIPs(t *testing.T) {
23312208 reverseProxy: false,
23322209 realClientIPHeader: "X-Real-IP",
23332210 req: func() *http.Request {
2334− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2211+ req, _ := http.NewRequest("GET", "/", nil)
23352212 req.RemoteAddr = "adsfljk29242as!!"
23362213 return req
23372214 }(),
@@ -2427,12 +2304,12 @@ func Test_buildRoutesAllowlist(t *testing.T) {
24272304 },
24282305 expectedRoutes: []expectedAllowedRoute{
24292306 {
2430− method: http.MethodGet,
2307+ method: "GET",
24312308 negate: false,
24322309 regexString: "^/foo/bar",
24332310 },
24342311 {
2435− method: http.MethodPost,
2312+ method: "POST",
24362313 negate: false,
24372314 regexString: "^/baz/[0-9]+/thing",
24382315 },
@@ -2485,11 +2362,11 @@ func Test_buildRoutesAllowlist(t *testing.T) {
24852362 regexString: "^/baz/[0-9]+/thing/regex",
24862363 },
24872364 {
2488− method: http.MethodGet,
2365+ method: "GET",
24892366 regexString: "^/foo/bar",
24902367 },
24912368 {
2492− method: http.MethodPost,
2369+ method: "POST",
24932370 regexString: "^/baz/[0-9]+/thing",
24942371 },
24952372 {
@@ -2641,7 +2518,7 @@ func TestApiRoutes(t *testing.T) {
26412518
26422519 for _, tc := range testCases {
26432520 t.Run(tc.name, func(t *testing.T) {
2644− req, err := http.NewRequest(http.MethodGet, tc.url, nil)
2521+ req, err := http.NewRequest("GET", tc.url, nil)
26452522 req.Header.Set("Accept", tc.contentType)
26462523 assert.NoError(t, err)
26472524
@@ -2679,11 +2556,9 @@ func TestAllowedRequest(t *testing.T) {
26792556 }
26802557 opts.SkipAuthRegex = []string{
26812558 "^/skip/auth/regex$",
2682− "^/public/.*/endpoint$",
26832559 }
26842560 opts.SkipAuthRoutes = []string{
26852561 "GET=^/skip/auth/routes/get",
2686− "^/foo/.*/bar$",
26872562 }
26882563 err := validation.Validate(opts)
26892564 assert.NoError(t, err)
@@ -2700,37 +2575,25 @@ func TestAllowedRequest(t *testing.T) {
27002575 }{
27012576 {
27022577 name: "Regex GET allowed",
2703− method: http.MethodGet,
2578+ method: "GET",
27042579 url: "/skip/auth/regex",
27052580 allowed: true,
27062581 },
27072582 {
27082583 name: "Regex POST allowed ",
2709− method: http.MethodPost,
2584+ method: "POST",
27102585 url: "/skip/auth/regex",
27112586 allowed: true,
27122587 },
27132588 {
27142589 name: "Regex denied",
2715− method: http.MethodGet,
2590+ method: "GET",
27162591 url: "/wrong/denied",
27172592 allowed: false,
27182593 },
2719− {
2720− name: "Regex allowed with fragment-free path",
2721− method: http.MethodGet,
2722− url: "/public/legit/endpoint",
2723− allowed: true,
2724− },
2725− {
2726− name: "Regex denied when path contains encoded fragment suffix",
2727− method: http.MethodGet,
2728− url: "/public/secret%23/endpoint",
2729− allowed: false,
2730− },
27312594 {
27322595 name: "Route allowed",
2733− method: http.MethodGet,
2596+ method: "GET",
27342597 url: "/skip/auth/routes/get",
27352598 allowed: true,
27362599 },
@@ -2742,28 +2605,16 @@ func TestAllowedRequest(t *testing.T) {
27422605 },
27432606 {
27442607 name: "Route denied with wrong path",
2745− method: http.MethodGet,
2608+ method: "GET",
27462609 url: "/skip/auth/routes/wrong/path",
27472610 allowed: false,
27482611 },
27492612 {
27502613 name: "Route denied with wrong path and method",
2751− method: http.MethodPost,
2614+ method: "POST",
27522615 url: "/skip/auth/routes/wrong/path",
27532616 allowed: false,
27542617 },
2755− {
2756− name: "Route allowed with fragment-free path",
2757− method: http.MethodGet,
2758− url: "/foo/public/bar",
2759− allowed: true,
2760− },
2761− {
2762− name: "Route denied when path contains encoded fragment suffix",
2763− method: http.MethodGet,
2764− url: "/foo/secret%23/bar",
2765− allowed: false,
2766− },
27672618 }
27682619
27692620 for _, tc := range testCases {
@@ -2804,11 +2655,9 @@ func TestAllowedRequestWithForwardedUriHeader(t *testing.T) {
28042655 }
28052656 opts.SkipAuthRegex = []string{
28062657 "^/skip/auth/regex$",
2807− "^/public/.*/endpoint$",
28082658 }
28092659 opts.SkipAuthRoutes = []string{
28102660 "GET=^/skip/auth/routes/get",
2811− "^/foo/.*/bar$",
28122661 }
28132662 err := validation.Validate(opts)
28142663 assert.NoError(t, err)
@@ -2825,37 +2674,25 @@ func TestAllowedRequestWithForwardedUriHeader(t *testing.T) {
28252674 }{
28262675 {
28272676 name: "Regex GET allowed",
2828− method: http.MethodGet,
2677+ method: "GET",
28292678 url: "/skip/auth/regex",
28302679 allowed: true,
28312680 },
28322681 {
28332682 name: "Regex POST allowed ",
2834− method: http.MethodPost,
2683+ method: "POST",
28352684 url: "/skip/auth/regex",
28362685 allowed: true,
28372686 },
28382687 {
28392688 name: "Regex denied",
2840− method: http.MethodGet,
2689+ method: "GET",
28412690 url: "/wrong/denied",
28422691 allowed: false,
28432692 },
2844− {
2845− name: "Regex allowed with fragment-free path",
2846− method: http.MethodGet,
2847− url: "/public/legit/endpoint",
2848− allowed: true,
2849− },
2850− {
2851− name: "Regex denied when X-Forwarded-Uri contains an encoded fragment suffix",
2852− method: http.MethodGet,
2853− url: "/public/secret%23/endpoint",
2854− allowed: false,
2855− },
28562693 {
28572694 name: "Route allowed",
2858− method: http.MethodGet,
2695+ method: "GET",
28592696 url: "/skip/auth/routes/get",
28602697 allowed: true,
28612698 },
@@ -2867,35 +2704,22 @@ func TestAllowedRequestWithForwardedUriHeader(t *testing.T) {
28672704 },
28682705 {
28692706 name: "Route denied with wrong path",
2870− method: http.MethodGet,
2707+ method: "GET",
28712708 url: "/skip/auth/routes/wrong/path",
28722709 allowed: false,
28732710 },
28742711 {
28752712 name: "Route denied with wrong path and method",
2876− method: http.MethodPost,
2713+ method: "POST",
28772714 url: "/skip/auth/routes/wrong/path",
28782715 allowed: false,
28792716 },
2880− {
2881− name: "Route allowed with fragment-free path",
2882− method: http.MethodGet,
2883− url: "/foo/public/bar",
2884− allowed: true,
2885− },
2886− {
2887− name: "Route denied when X-Forwarded-Uri contains an encoded fragment suffix",
2888− method: http.MethodGet,
2889− url: "/foo/secret%23/bar",
2890− allowed: false,
2891− },
28922717 }
28932718
28942719 for _, tc := range testCases {
28952720 t.Run(tc.name, func(t *testing.T) {
28962721 req, err := http.NewRequest(tc.method, opts.ProxyPrefix+authOnlyPath, nil)
28972722 req.Header.Set("X-Forwarded-Uri", tc.url)
2898− req.RemoteAddr = "127.0.0.1:4180"
28992723 assert.NoError(t, err)
29002724
29012725 rw := httptest.NewRecorder()
@@ -2910,43 +2734,6 @@ func TestAllowedRequestWithForwardedUriHeader(t *testing.T) {
29102734 }
29112735}
29122736
2913−func TestAllowedRequestWithForwardedUriHeaderRequiresTrustedProxy(t *testing.T) {
2914− upstreamServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
2915− w.WriteHeader(200)
2916− }))
2917− t.Cleanup(upstreamServer.Close)
2918−
2919− opts := baseTestOptions()
2920− opts.ReverseProxy = true
2921− opts.TrustedProxyIPs = []string{"127.0.0.1/32"}
2922− opts.UpstreamServers = options.UpstreamConfig{
2923− Upstreams: []options.Upstream{
2924− {
2925− ID: upstreamServer.URL,
2926− Path: "/",
2927− URI: upstreamServer.URL,
2928− },
2929− },
2930− }
2931− opts.SkipAuthRegex = []string{"^/skip/auth/regex$"}
2932−
2933− err := validation.Validate(opts)
2934− assert.NoError(t, err)
2935−
2936− proxy, err := NewOAuthProxy(opts, func(_ string) bool { return true })
2937− assert.NoError(t, err)
2938−
2939− req, err := http.NewRequest(http.MethodGet, opts.ProxyPrefix+authOnlyPath, nil)
2940− assert.NoError(t, err)
2941− req.RemoteAddr = "192.0.2.10:4180"
2942− req.Header.Set("X-Forwarded-Uri", "/skip/auth/regex")
2943−
2944− rw := httptest.NewRecorder()
2945− proxy.ServeHTTP(rw, req)
2946−
2947− assert.Equal(t, 401, rw.Code)
2948−}
2949−
29502737func TestAllowedRequestNegateWithoutMethod(t *testing.T) {
29512738 upstreamServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
29522739 w.WriteHeader(200)
@@ -2986,37 +2773,37 @@ func TestAllowedRequestNegateWithoutMethod(t *testing.T) {
29862773 }{
29872774 {
29882775 name: "Some static file allowed",
2989− method: http.MethodGet,
2776+ method: "GET",
29902777 url: "/static/file.txt",
29912778 allowed: true,
29922779 },
29932780 {
29942781 name: "POST to contact form allowed",
2995− method: http.MethodPost,
2782+ method: "POST",
29962783 url: "/contact",
29972784 allowed: true,
29982785 },
29992786 {
30002787 name: "Regex POST allowed",
3001− method: http.MethodPost,
2788+ method: "POST",
30022789 url: "/api/public-entity",
30032790 allowed: true,
30042791 },
30052792 {
30062793 name: "Regex POST with trailing slash allowed",
3007− method: http.MethodPost,
2794+ method: "POST",
30082795 url: "/api/public-entity/",
30092796 allowed: true,
30102797 },
30112798 {
30122799 name: "Regex GET api route denied",
3013− method: http.MethodGet,
2800+ method: "GET",
30142801 url: "/api/users",
30152802 allowed: false,
30162803 },
30172804 {
30182805 name: "Regex POST api route denied",
3019− method: http.MethodPost,
2806+ method: "POST",
30202807 url: "/api/users",
30212808 allowed: false,
30222809 },
@@ -3086,37 +2873,37 @@ func TestAllowedRequestNegateWithMethod(t *testing.T) {
30862873 }{
30872874 {
30882875 name: "Some static file allowed",
3089− method: http.MethodGet,
2876+ method: "GET",
30902877 url: "/static/file.txt",
30912878 allowed: true,
30922879 },
30932880 {
30942881 name: "POST to contact form not allowed",
3095− method: http.MethodPost,
2882+ method: "POST",
30962883 url: "/contact",
30972884 allowed: false,
30982885 },
30992886 {
31002887 name: "Regex POST allowed",
3101− method: http.MethodPost,
2888+ method: "POST",
31022889 url: "/api/public-entity",
31032890 allowed: true,
31042891 },
31052892 {
31062893 name: "Regex POST with trailing slash allowed",
3107− method: http.MethodPost,
2894+ method: "POST",
31082895 url: "/api/public-entity/",
31092896 allowed: true,
31102897 },
31112898 {
31122899 name: "Regex GET api route denied",
3113− method: http.MethodGet,
2900+ method: "GET",
31142901 url: "/api/users",
31152902 allowed: false,
31162903 },
31172904 {
31182905 name: "Regex POST api route denied",
3119− method: http.MethodPost,
2906+ method: "POST",
31202907 url: "/api/users",
31212908 allowed: false,
31222909 },
@@ -3256,7 +3043,7 @@ func TestProxyAllowedGroups(t *testing.T) {
32563043 t.Fatal(err)
32573044 }
32583045
3259− test.req, _ = http.NewRequest(http.MethodGet, fmt.Sprintf("/%s", tt.querystring), nil)
3046+ test.req, _ = http.NewRequest("GET", fmt.Sprintf("/%s", tt.querystring), nil)
32603047
32613048 test.req.Header.Add("accept", applicationJSON)
32623049 err = test.SaveSession(session)
@@ -3400,7 +3187,7 @@ func TestAuthOnlyAllowedGroupsWithSkipMethods(t *testing.T) {
34003187 {
34013188 name: "UserWithGroupSkipAuthPreflight",
34023189 groups: []string{"a", "c"},
3403− method: http.MethodOptions,
3190+ method: "OPTIONS",
34043191 ip: "1.2.3.5:43670",
34053192 withSession: true,
34063193 expectedStatusCode: http.StatusAccepted,
@@ -3408,7 +3195,7 @@ func TestAuthOnlyAllowedGroupsWithSkipMethods(t *testing.T) {
34083195 {
34093196 name: "UserWithGroupTrustedIp",
34103197 groups: []string{"a", "c"},
3411− method: http.MethodGet,
3198+ method: "GET",
34123199 ip: "1.2.3.4:43670",
34133200 withSession: true,
34143201 expectedStatusCode: http.StatusAccepted,
@@ -3416,7 +3203,7 @@ func TestAuthOnlyAllowedGroupsWithSkipMethods(t *testing.T) {
34163203 {
34173204 name: "UserWithoutGroupSkipAuthPreflight",
34183205 groups: []string{"c"},
3419− method: http.MethodOptions,
3206+ method: "OPTIONS",
34203207 ip: "1.2.3.5:43670",
34213208 withSession: true,
34223209 expectedStatusCode: http.StatusForbidden,
@@ -3424,21 +3211,21 @@ func TestAuthOnlyAllowedGroupsWithSkipMethods(t *testing.T) {
34243211 {
34253212 name: "UserWithoutGroupTrustedIp",
34263213 groups: []string{"c"},
3427− method: http.MethodGet,
3214+ method: "GET",
34283215 ip: "1.2.3.4:43670",
34293216 withSession: true,
34303217 expectedStatusCode: http.StatusForbidden,
34313218 },
34323219 {
34333220 name: "UserWithoutSessionSkipAuthPreflight",
3434− method: http.MethodOptions,
3221+ method: "OPTIONS",
34353222 ip: "1.2.3.5:43670",
34363223 withSession: false,
34373224 expectedStatusCode: http.StatusAccepted,
34383225 },
34393226 {
34403227 name: "UserWithoutSessionTrustedIp",
3441− method: http.MethodGet,
3228+ method: "GET",
34423229 ip: "1.2.3.4:43670",
34433230 withSession: false,
34443231 expectedStatusCode: http.StatusAccepted,
@@ -3538,24 +3325,6 @@ func TestAuthOnlyAllowedEmailDomains(t *testing.T) {
35383325 querystring: "?allowed_email_domains=a.b.c.example.com,*.c.example.com",
35393326 expectedStatusCode: http.StatusAccepted,
35403327 },
3541− {
3542− name: "UserWithMultipleAtSignsExactDomain",
3543− email: "attacker@evil.com@example.com",
3544− querystring: "?allowed_email_domains=example.com",
3545− expectedStatusCode: http.StatusForbidden,
3546− },
3547− {
3548− name: "UserWithMultipleAtSignsWildcardDomain",
3549− email: "attacker@evil.com@foo.example.com",
3550− querystring: "?allowed_email_domains=*.example.com",
3551− expectedStatusCode: http.StatusForbidden,
3552− },
3553− {
3554− name: "UserWithMultipleAtSignsDotPrefixedDomain",
3555− email: "attacker@evil.com@foo.example.com",
3556− querystring: "?allowed_email_domains=.example.com",
3557− expectedStatusCode: http.StatusForbidden,
3558− },
35593328 }
35603329
35613330 for _, tc := range testCases {
@@ -3762,49 +3531,3 @@ func TestGetOAuthRedirectURI(t *testing.T) {
37623531 })
37633532 }
37643533}
3765−
3766−func TestIdTokenPlaceholderInSignOut(t *testing.T) {
3767− opts := baseTestOptions()
3768− opts.WhitelistDomains = []string{"my-oidc-provider.example.com"}
3769−
3770− err := validation.Validate(opts)
3771− assert.NoError(t, err)
3772−
3773− const emailAddress = "john.doe@example.com"
3774− const userName = "9fcab5c9b889a557"
3775− created := time.Now()
3776−
3777− session := &sessions.SessionState{
3778− User: userName,
3779− Groups: []string{"a", "b"},
3780− Email: emailAddress,
3781− IDToken: "eYjjjjjj.vvvv.ddd",
3782− AccessToken: "oauth_token",
3783− CreatedAt: &created,
3784− }
3785−
3786− proxy, err := NewOAuthProxy(opts, func(email string) bool {
3787− return true
3788− })
3789− assert.NoError(t, err)
3790−
3791− // Save the required session
3792− rw := httptest.NewRecorder()
3793− req, _ := http.NewRequest(http.MethodGet, "/", nil)
3794− err = proxy.sessionStore.Save(rw, req, session)
3795− assert.NoError(t, err)
3796−
3797− rw = httptest.NewRecorder()
3798−
3799− rdUrl := url.QueryEscape("https://my-oidc-provider.example.com/sign_out_page?id_token_hint={id_token}&post_logout_redirect_uri=https://my-app.example.com/")
3800− req, _ = http.NewRequest(http.MethodGet, "/oauth2/sign_out?rd="+rdUrl, nil)
3801− req = middlewareapi.AddRequestScope(req, &middlewareapi.RequestScope{
3802− RequestID: "11111111-2222-4333-8444-555555555555",
3803− Session: session,
3804− })
3805−
3806− proxy.SignOut(rw, req)
3807− newLocation := rw.Header().Values("Location")[0]
3808−
3809− assert.Equal(t, "https://my-oidc-provider.example.com/sign_out_page?id_token_hint=eYjjjjjj.vvvv.ddd&post_logout_redirect_uri=https://my-app.example.com/", newLocation)
3810−}