@@ -54,7 +54,7 @@ func TestRobotsTxt(t *testing.T) {
54 t.Fatal(err)
54 t.Fatal(err)
56 rw := httptest.NewRecorder()
56 rw := httptest.NewRecorder()
57− req, _ := http.NewRequest(http.MethodGet, "/robots.txt", nil)
57+ req, _ := http.NewRequest("GET", "/robots.txt", nil)
58 proxy.ServeHTTP(rw, req)
58 proxy.ServeHTTP(rw, req)
59 assert.Equal(t, 200, rw.Code)
59 assert.Equal(t, 200, rw.Code)
60 assert.Equal(t, "User-agent: *\nDisallow: /\n", rw.Body.String())
60 assert.Equal(t, "User-agent: *\nDisallow: /\n", rw.Body.String())
@@ -241,7 +241,7 @@ func TestBasicAuthPassword(t *testing.T) {
242 // Save the required session
242 // Save the required session
243 rw := httptest.NewRecorder()
243 rw := httptest.NewRecorder()
244− req, _ := http.NewRequest(http.MethodGet, "/", nil)
244+ req, _ := http.NewRequest("GET", "/", nil)
245 err = proxy.sessionStore.Save(rw, req, &sessions.SessionState{
245 err = proxy.sessionStore.Save(rw, req, &sessions.SessionState{
246 Email: emailAddress,
246 Email: emailAddress,
@@ -250,7 +250,7 @@ func TestBasicAuthPassword(t *testing.T) {
250 // Extract the cookie value to inject into the test request
250 // Extract the cookie value to inject into the test request
251 cookie := rw.Header().Values("Set-Cookie")[0]
251 cookie := rw.Header().Values("Set-Cookie")[0]
253− req, _ = http.NewRequest(http.MethodGet, "/", nil)
253+ req, _ = http.NewRequest("GET", "/", nil)
254 req.Header.Set("Cookie", cookie)
254 req.Header.Set("Cookie", cookie)
255 rw = httptest.NewRecorder()
255 rw = httptest.NewRecorder()
256 proxy.ServeHTTP(rw, req)
256 proxy.ServeHTTP(rw, req)
@@ -300,14 +300,14 @@ func TestPassGroupsHeadersWithGroups(t *testing.T) {
301 // Save the required session
301 // Save the required session
302 rw := httptest.NewRecorder()
302 rw := httptest.NewRecorder()
303− req, _ := http.NewRequest(http.MethodGet, "/", nil)
303+ req, _ := http.NewRequest("GET", "/", nil)
304 err = proxy.sessionStore.Save(rw, req, session)
304 err = proxy.sessionStore.Save(rw, req, session)
305 assert.NoError(t, err)
305 assert.NoError(t, err)
307 // Extract the cookie value to inject into the test request
307 // Extract the cookie value to inject into the test request
308 cookie := rw.Header().Values("Set-Cookie")[0]
308 cookie := rw.Header().Values("Set-Cookie")[0]
310− req, _ = http.NewRequest(http.MethodGet, "/", nil)
310+ req, _ = http.NewRequest("GET", "/", nil)
311 req.Header.Set("Cookie", cookie)
311 req.Header.Set("Cookie", cookie)
312 rw = httptest.NewRecorder()
312 rw = httptest.NewRecorder()
313 proxy.ServeHTTP(rw, req)
313 proxy.ServeHTTP(rw, req)
@@ -457,7 +457,7 @@ func (patTest *PassAccessTokenTest) getEndpointWithCookie(cookie string, endpoin
457 return 0, ""
457 return 0, ""
460− req, err := http.NewRequest(http.MethodGet, endpoint, strings.NewReader(""))
460+ req, err := http.NewRequest("GET", endpoint, strings.NewReader(""))
461 if err != nil {
461 if err != nil {
462 return 0, ""
462 return 0, ""
@@ -608,7 +608,7 @@ func NewSignInPageTest(skipProvider bool) (*SignInPageTest, error) {
609func (sipTest *SignInPageTest) GetEndpoint(endpoint string) (int, string) {
609func (sipTest *SignInPageTest) GetEndpoint(endpoint string) (int, string) {
610 rw := httptest.NewRecorder()
610 rw := httptest.NewRecorder()
611− req, _ := http.NewRequest(http.MethodGet, endpoint, strings.NewReader(""))
611+ req, _ := http.NewRequest("GET", endpoint, strings.NewReader(""))
612 sipTest.proxy.ServeHTTP(rw, req)
612 sipTest.proxy.ServeHTTP(rw, req)
613 return rw.Code, rw.Body.String()
613 return rw.Code, rw.Body.String()
@@ -713,50 +713,6 @@ func TestManualSignInCorrectCredentials(t *testing.T) {
713 assert.Equal(t, http.StatusFound, statusCode)
713 assert.Equal(t, http.StatusFound, statusCode)
716−func TestSignInPageClearsExistingSessionCookie(t *testing.T) {
717− opts := baseTestOptions()
718− err := validation.Validate(opts)
719− require.NoError(t, err)
721− proxy, err := NewOAuthProxy(opts, func(string) bool {
724− require.NoError(t, err)
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",
732− require.NoError(t, err)
734− cookies := saveRW.Result().Cookies()
735− require.NotEmpty(t, cookies)
737− // Send that cookie to the sign-in page.
738− req := httptest.NewRequest(http.MethodGet, "/oauth2/sign_in", nil)
739− for _, c := range cookies {
743− rw := httptest.NewRecorder()
744− proxy.ServeHTTP(rw, req)
746− assert.Equal(t, http.StatusOK, rw.Code)
749− for _, c := range rw.Result().Cookies() {
750− if c.Name == proxy.CookieOptions.Name {
752− assert.Equal(t, "", c.Value)
753− assert.Less(t, c.MaxAge, 0)
757− assert.True(t, cleared, "expected sign-in page to clear existing session cookie")
760func TestSignInPageIncludesTargetRedirect(t *testing.T) {
716func TestSignInPageIncludesTargetRedirect(t *testing.T) {
761 sipTest, err := NewSignInPageTest(false)
717 sipTest, err := NewSignInPageTest(false)
762 if err != nil {
718 if err != nil {
@@ -894,7 +850,7 @@ func NewProcessCookieTest(opts ProcessCookieTestOpts, modifiers ...OptionsModifi
894 // access_token validation.
850 // access_token validation.
895 pcTest.proxy.CookieOptions.Refresh = time.Duration(0)
851 pcTest.proxy.CookieOptions.Refresh = time.Duration(0)
896 pcTest.rw = httptest.NewRecorder()
852 pcTest.rw = httptest.NewRecorder()
897− pcTest.req, _ = http.NewRequest(http.MethodGet, "/", strings.NewReader(""))
853+ pcTest.req, _ = http.NewRequest("GET", "/", strings.NewReader(""))
898 pcTest.validateUser = true
854 pcTest.validateUser = true
899 return &pcTest, nil
855 return &pcTest, nil
@@ -1027,7 +983,7 @@ func NewUserInfoEndpointTest() (*ProcessCookieTest, error) {
1027 if err != nil {
983 if err != nil {
1028 return nil, err
984 return nil, err
1030− pcTest.req, _ = http.NewRequest(http.MethodGet,
986+ pcTest.req, _ = http.NewRequest("GET",
1031 pcTest.opts.ProxyPrefix+"/userinfo", nil)
987 pcTest.opts.ProxyPrefix+"/userinfo", nil)
1032 return pcTest, nil
988 return pcTest, nil
@@ -1135,7 +1091,7 @@ func NewAuthOnlyEndpointTest(querystring string, modifiers ...OptionsModifier) (
1135 return nil, err
1091 return nil, err
1137 pcTest.req, _ = http.NewRequest(
1093 pcTest.req, _ = http.NewRequest(
1138− http.MethodGet,
1094+ "GET",
1139 fmt.Sprintf("%s/auth%s", pcTest.opts.ProxyPrefix, querystring),
1095 fmt.Sprintf("%s/auth%s", pcTest.opts.ProxyPrefix, querystring),
1141 return pcTest, nil
1097 return pcTest, nil
@@ -1274,7 +1230,7 @@ func TestAuthOnlyEndpointSetXAuthRequestHeaders(t *testing.T) {
1274 pcTest.validateUser = true
1230 pcTest.validateUser = true
1276 pcTest.rw = httptest.NewRecorder()
1232 pcTest.rw = httptest.NewRecorder()
1277− pcTest.req, _ = http.NewRequest(http.MethodGet,
1233+ pcTest.req, _ = http.NewRequest("GET",
1278 pcTest.opts.ProxyPrefix+authOnlyPath, nil)
1234 pcTest.opts.ProxyPrefix+authOnlyPath, nil)
1280 created := time.Now()
1236 created := time.Now()
@@ -1367,7 +1323,7 @@ func TestAuthOnlyEndpointSetBasicAuthTrueRequestHeaders(t *testing.T) {
1367 pcTest.validateUser = true
1323 pcTest.validateUser = true
1369 pcTest.rw = httptest.NewRecorder()
1325 pcTest.rw = httptest.NewRecorder()
1370− pcTest.req, _ = http.NewRequest(http.MethodGet,
1326+ pcTest.req, _ = http.NewRequest("GET",
1371 pcTest.opts.ProxyPrefix+authOnlyPath, nil)
1327 pcTest.opts.ProxyPrefix+authOnlyPath, nil)
1373 created := time.Now()
1329 created := time.Now()
@@ -1447,7 +1403,7 @@ func TestAuthOnlyEndpointSetBasicAuthFalseRequestHeaders(t *testing.T) {
1447 pcTest.validateUser = true
1403 pcTest.validateUser = true
1449 pcTest.rw = httptest.NewRecorder()
1405 pcTest.rw = httptest.NewRecorder()
1450− pcTest.req, _ = http.NewRequest(http.MethodGet,
1406+ pcTest.req, _ = http.NewRequest("GET",
1451 pcTest.opts.ProxyPrefix+authOnlyPath, nil)
1407 pcTest.opts.ProxyPrefix+authOnlyPath, nil)
1453 created := time.Now()
1409 created := time.Now()
@@ -1495,7 +1451,7 @@ func TestAuthSkippedForPreflightRequests(t *testing.T) {
1496 proxy.provider = NewTestProvider(upstreamURL, "")
1452 proxy.provider = NewTestProvider(upstreamURL, "")
1497 rw := httptest.NewRecorder()
1453 rw := httptest.NewRecorder()
1498− req, _ := http.NewRequest(http.MethodOptions, "/preflight-request", nil)
1454+ req, _ := http.NewRequest("OPTIONS", "/preflight-request", nil)
1499 proxy.ServeHTTP(rw, req)
1455 proxy.ServeHTTP(rw, req)
1501 assert.Equal(t, 200, rw.Code)
1457 assert.Equal(t, 200, rw.Code)
@@ -1652,19 +1608,19 @@ func TestRequestSignature(t *testing.T) {
1652 resp string
1608 resp string
1654 "No request signature": {
1610 "No request signature": {
1655− method: http.MethodGet,
1611+ method: "GET",
1656 body: "",
1612 body: "",
1657 key: "",
1613 key: "",
1658 resp: "no signature received",
1614 resp: "no signature received",
1660 "Get request": {
1616 "Get request": {
1661− method: http.MethodGet,
1617+ method: "GET",
1662 body: "",
1618 body: "",
1663 key: "7d9e1aa87a5954e6f9fc59266b3af9d7c35fda2d",
1619 key: "7d9e1aa87a5954e6f9fc59266b3af9d7c35fda2d",
1664 resp: "signatures match",
1620 resp: "signatures match",
1666 "Post request": {
1622 "Post request": {
1667− method: http.MethodPost,
1623+ method: "POST",
1668 body: `{ "hello": "world!" }`,
1624 body: `{ "hello": "world!" }`,
1669 key: "d90df39e2d19282840252612dd7c81421a372f61",
1625 key: "d90df39e2d19282840252612dd7c81421a372f61",
1670 resp: "signatures match",
1626 resp: "signatures match",
@@ -2189,7 +2145,7 @@ func TestTrustedIPs(t *testing.T) {
2189 reverseProxy: false,
2145 reverseProxy: false,
2190 realClientIPHeader: "X-Real-IP", // Default value
2146 realClientIPHeader: "X-Real-IP", // Default value
2191 req: func() *http.Request {
2147 req: func() *http.Request {
2192− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2148+ req, _ := http.NewRequest("GET", "/", nil)
2193 return req
2149 return req
2195 expectTrusted: false,
2151 expectTrusted: false,
@@ -2201,7 +2157,7 @@ func TestTrustedIPs(t *testing.T) {
2201 reverseProxy: false,
2157 reverseProxy: false,
2202 realClientIPHeader: "X-Real-IP",
2158 realClientIPHeader: "X-Real-IP",
2203 req: func() *http.Request {
2159 req: func() *http.Request {
2204− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2160+ req, _ := http.NewRequest("GET", "/", nil)
2205 req.RemoteAddr = "@"
2161 req.RemoteAddr = "@"
2206 return req
2162 return req
@@ -2214,7 +2170,7 @@ func TestTrustedIPs(t *testing.T) {
2214 reverseProxy: false,
2170 reverseProxy: false,
2215 realClientIPHeader: "X-Real-IP",
2171 realClientIPHeader: "X-Real-IP",
2216 req: func() *http.Request {
2172 req: func() *http.Request {
2217− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2173+ req, _ := http.NewRequest("GET", "/", nil)
2218 req.RemoteAddr = "@"
2174 req.RemoteAddr = "@"
2219 return req
2175 return req
@@ -2227,7 +2183,7 @@ func TestTrustedIPs(t *testing.T) {
2227 reverseProxy: false,
2183 reverseProxy: false,
2228 realClientIPHeader: "X-Real-IP", // Default value
2184 realClientIPHeader: "X-Real-IP", // Default value
2229 req: func() *http.Request {
2185 req: func() *http.Request {
2230− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2186+ req, _ := http.NewRequest("GET", "/", nil)
2231 req.RemoteAddr = "127.0.0.1:43670"
2187 req.RemoteAddr = "127.0.0.1:43670"
2232 return req
2188 return req
@@ -2240,7 +2196,7 @@ func TestTrustedIPs(t *testing.T) {
2240 reverseProxy: true,
2196 reverseProxy: true,
2241 realClientIPHeader: "X-Real-IP", // Default value
2197 realClientIPHeader: "X-Real-IP", // Default value
2242 req: func() *http.Request {
2198 req: func() *http.Request {
2243− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2199+ req, _ := http.NewRequest("GET", "/", nil)
2244 req.RemoteAddr = "127.0.0.1:44324"
2200 req.RemoteAddr = "127.0.0.1:44324"
2245 return req
2201 return req
@@ -2253,7 +2209,7 @@ func TestTrustedIPs(t *testing.T) {
2253 reverseProxy: true,
2209 reverseProxy: true,
2254 realClientIPHeader: "X-Forwarded-For",
2210 realClientIPHeader: "X-Forwarded-For",
2255 req: func() *http.Request {
2211 req: func() *http.Request {
2256− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2212+ req, _ := http.NewRequest("GET", "/", nil)
2257 req.Header.Add("X-Forwarded-For", "127.0.0.1")
2213 req.Header.Add("X-Forwarded-For", "127.0.0.1")
2258 return req
2214 return req
@@ -2266,7 +2222,7 @@ func TestTrustedIPs(t *testing.T) {
2266 reverseProxy: true,
2222 reverseProxy: true,
2267 realClientIPHeader: "X-Forwarded-For",
2223 realClientIPHeader: "X-Forwarded-For",
2268 req: func() *http.Request {
2224 req: func() *http.Request {
2269− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2225+ req, _ := http.NewRequest("GET", "/", nil)
2270 req.Header.Add("X-Forwarded-For", "::1")
2226 req.Header.Add("X-Forwarded-For", "::1")
2271 return req
2227 return req
@@ -2279,7 +2235,7 @@ func TestTrustedIPs(t *testing.T) {
2279 reverseProxy: true,
2235 reverseProxy: true,
2280 realClientIPHeader: "X-Forwarded-For",
2236 realClientIPHeader: "X-Forwarded-For",
2281 req: func() *http.Request {
2237 req: func() *http.Request {
2282− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2238+ req, _ := http.NewRequest("GET", "/", nil)
2283 req.Header.Add("X-Forwarded-For", "12.34.56.78")
2239 req.Header.Add("X-Forwarded-For", "12.34.56.78")
2284 return req
2240 return req
@@ -2292,7 +2248,7 @@ func TestTrustedIPs(t *testing.T) {
2292 reverseProxy: true,
2248 reverseProxy: true,
2293 realClientIPHeader: "X-Forwarded-For",
2249 realClientIPHeader: "X-Forwarded-For",
2294 req: func() *http.Request {
2250 req: func() *http.Request {
2295− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2251+ req, _ := http.NewRequest("GET", "/", nil)
2296 req.Header.Add("X-Forwarded-For", "::2")
2252 req.Header.Add("X-Forwarded-For", "::2")
2297 return req
2253 return req
@@ -2305,7 +2261,7 @@ func TestTrustedIPs(t *testing.T) {
2305 reverseProxy: true,
2261 reverseProxy: true,
2306 realClientIPHeader: "X-Forwarded-For",
2262 realClientIPHeader: "X-Forwarded-For",
2307 req: func() *http.Request {
2263 req: func() *http.Request {
2308− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2264+ req, _ := http.NewRequest("GET", "/", nil)
2309 req.Header.Add("X-Real-IP", "::1")
2265 req.Header.Add("X-Real-IP", "::1")
2310 return req
2266 return req
@@ -2318,7 +2274,7 @@ func TestTrustedIPs(t *testing.T) {
2318 reverseProxy: true,
2274 reverseProxy: true,
2319 realClientIPHeader: "X-Forwarded-For",
2275 realClientIPHeader: "X-Forwarded-For",
2320 req: func() *http.Request {
2276 req: func() *http.Request {
2321− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2277+ req, _ := http.NewRequest("GET", "/", nil)
2322 req.Header.Add("X-Forwarded-For", "adsfljk29242as!!")
2278 req.Header.Add("X-Forwarded-For", "adsfljk29242as!!")
2323 return req
2279 return req
@@ -2331,7 +2287,7 @@ func TestTrustedIPs(t *testing.T) {
2331 reverseProxy: false,
2287 reverseProxy: false,
2332 realClientIPHeader: "X-Real-IP",
2288 realClientIPHeader: "X-Real-IP",
2333 req: func() *http.Request {
2289 req: func() *http.Request {
2334− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2290+ req, _ := http.NewRequest("GET", "/", nil)
2335 req.RemoteAddr = "adsfljk29242as!!"
2291 req.RemoteAddr = "adsfljk29242as!!"
2336 return req
2292 return req
@@ -2427,12 +2383,12 @@ func Test_buildRoutesAllowlist(t *testing.T) {
2428 expectedRoutes: []expectedAllowedRoute{
2384 expectedRoutes: []expectedAllowedRoute{
2430− method: http.MethodGet,
2386+ method: "GET",
2431 negate: false,
2387 negate: false,
2432 regexString: "^/foo/bar",
2388 regexString: "^/foo/bar",
2435− method: http.MethodPost,
2391+ method: "POST",
2436 negate: false,
2392 negate: false,
2437 regexString: "^/baz/[0-9]+/thing",
2393 regexString: "^/baz/[0-9]+/thing",
@@ -2485,11 +2441,11 @@ func Test_buildRoutesAllowlist(t *testing.T) {
2485 regexString: "^/baz/[0-9]+/thing/regex",
2441 regexString: "^/baz/[0-9]+/thing/regex",
2488− method: http.MethodGet,
2444+ method: "GET",
2489 regexString: "^/foo/bar",
2445 regexString: "^/foo/bar",
2492− method: http.MethodPost,
2448+ method: "POST",
2493 regexString: "^/baz/[0-9]+/thing",
2449 regexString: "^/baz/[0-9]+/thing",
@@ -2641,7 +2597,7 @@ func TestApiRoutes(t *testing.T) {
2642 for _, tc := range testCases {
2598 for _, tc := range testCases {
2643 t.Run(tc.name, func(t *testing.T) {
2599 t.Run(tc.name, func(t *testing.T) {
2644− req, err := http.NewRequest(http.MethodGet, tc.url, nil)
2600+ req, err := http.NewRequest("GET", tc.url, nil)
2645 req.Header.Set("Accept", tc.contentType)
2601 req.Header.Set("Accept", tc.contentType)
2646 assert.NoError(t, err)
2602 assert.NoError(t, err)
@@ -2679,11 +2635,9 @@ func TestAllowedRequest(t *testing.T) {
2680 opts.SkipAuthRegex = []string{
2636 opts.SkipAuthRegex = []string{
2681 "^/skip/auth/regex$",
2637 "^/skip/auth/regex$",
2682− "^/public/.*/endpoint$",
2684 opts.SkipAuthRoutes = []string{
2639 opts.SkipAuthRoutes = []string{
2685 "GET=^/skip/auth/routes/get",
2640 "GET=^/skip/auth/routes/get",
2688 err := validation.Validate(opts)
2642 err := validation.Validate(opts)
2689 assert.NoError(t, err)
2643 assert.NoError(t, err)
@@ -2700,37 +2654,25 @@ func TestAllowedRequest(t *testing.T) {
2702 name: "Regex GET allowed",
2656 name: "Regex GET allowed",
2703− method: http.MethodGet,
2657+ method: "GET",
2704 url: "/skip/auth/regex",
2658 url: "/skip/auth/regex",
2705 allowed: true,
2659 allowed: true,
2708 name: "Regex POST allowed ",
2662 name: "Regex POST allowed ",
2709− method: http.MethodPost,
2663+ method: "POST",
2710 url: "/skip/auth/regex",
2664 url: "/skip/auth/regex",
2711 allowed: true,
2665 allowed: true,
2714 name: "Regex denied",
2668 name: "Regex denied",
2715− method: http.MethodGet,
2669+ method: "GET",
2716 url: "/wrong/denied",
2670 url: "/wrong/denied",
2717 allowed: false,
2671 allowed: false,
2720− name: "Regex allowed with fragment-free path",
2721− method: http.MethodGet,
2722− url: "/public/legit/endpoint",
2726− name: "Regex denied when path contains encoded fragment suffix",
2727− method: http.MethodGet,
2728− url: "/public/secret%23/endpoint",
2732 name: "Route allowed",
2674 name: "Route allowed",
2733− method: http.MethodGet,
2675+ method: "GET",
2734 url: "/skip/auth/routes/get",
2676 url: "/skip/auth/routes/get",
2735 allowed: true,
2677 allowed: true,
@@ -2742,28 +2684,16 @@ func TestAllowedRequest(t *testing.T) {
2744 name: "Route denied with wrong path",
2686 name: "Route denied with wrong path",
2745− method: http.MethodGet,
2687+ method: "GET",
2746 url: "/skip/auth/routes/wrong/path",
2688 url: "/skip/auth/routes/wrong/path",
2747 allowed: false,
2689 allowed: false,
2750 name: "Route denied with wrong path and method",
2692 name: "Route denied with wrong path and method",
2751− method: http.MethodPost,
2693+ method: "POST",
2752 url: "/skip/auth/routes/wrong/path",
2694 url: "/skip/auth/routes/wrong/path",
2753 allowed: false,
2695 allowed: false,
2756− name: "Route allowed with fragment-free path",
2757− method: http.MethodGet,
2758− url: "/foo/public/bar",
2762− name: "Route denied when path contains encoded fragment suffix",
2763− method: http.MethodGet,
2764− url: "/foo/secret%23/bar",
2769 for _, tc := range testCases {
2699 for _, tc := range testCases {
@@ -2804,11 +2734,9 @@ func TestAllowedRequestWithForwardedUriHeader(t *testing.T) {
2805 opts.SkipAuthRegex = []string{
2735 opts.SkipAuthRegex = []string{
2806 "^/skip/auth/regex$",
2736 "^/skip/auth/regex$",
2807− "^/public/.*/endpoint$",
2809 opts.SkipAuthRoutes = []string{
2738 opts.SkipAuthRoutes = []string{
2810 "GET=^/skip/auth/routes/get",
2739 "GET=^/skip/auth/routes/get",
2813 err := validation.Validate(opts)
2741 err := validation.Validate(opts)
2814 assert.NoError(t, err)
2742 assert.NoError(t, err)
@@ -2825,37 +2753,25 @@ func TestAllowedRequestWithForwardedUriHeader(t *testing.T) {
2827 name: "Regex GET allowed",
2755 name: "Regex GET allowed",
2828− method: http.MethodGet,
2756+ method: "GET",
2829 url: "/skip/auth/regex",
2757 url: "/skip/auth/regex",
2830 allowed: true,
2758 allowed: true,
2833 name: "Regex POST allowed ",
2761 name: "Regex POST allowed ",
2834− method: http.MethodPost,
2762+ method: "POST",
2835 url: "/skip/auth/regex",
2763 url: "/skip/auth/regex",
2836 allowed: true,
2764 allowed: true,
2839 name: "Regex denied",
2767 name: "Regex denied",
2840− method: http.MethodGet,
2768+ method: "GET",
2841 url: "/wrong/denied",
2769 url: "/wrong/denied",
2842 allowed: false,
2770 allowed: false,
2845− name: "Regex allowed with fragment-free path",
2846− method: http.MethodGet,
2847− url: "/public/legit/endpoint",
2851− name: "Regex denied when X-Forwarded-Uri contains an encoded fragment suffix",
2852− method: http.MethodGet,
2853− url: "/public/secret%23/endpoint",
2857 name: "Route allowed",
2773 name: "Route allowed",
2858− method: http.MethodGet,
2774+ method: "GET",
2859 url: "/skip/auth/routes/get",
2775 url: "/skip/auth/routes/get",
2860 allowed: true,
2776 allowed: true,
@@ -2867,35 +2783,22 @@ func TestAllowedRequestWithForwardedUriHeader(t *testing.T) {
2869 name: "Route denied with wrong path",
2785 name: "Route denied with wrong path",
2870− method: http.MethodGet,
2786+ method: "GET",
2871 url: "/skip/auth/routes/wrong/path",
2787 url: "/skip/auth/routes/wrong/path",
2872 allowed: false,
2788 allowed: false,
2875 name: "Route denied with wrong path and method",
2791 name: "Route denied with wrong path and method",
2876− method: http.MethodPost,
2792+ method: "POST",
2877 url: "/skip/auth/routes/wrong/path",
2793 url: "/skip/auth/routes/wrong/path",
2878 allowed: false,
2794 allowed: false,
2881− name: "Route allowed with fragment-free path",
2882− method: http.MethodGet,
2883− url: "/foo/public/bar",
2887− name: "Route denied when X-Forwarded-Uri contains an encoded fragment suffix",
2888− method: http.MethodGet,
2889− url: "/foo/secret%23/bar",
2894 for _, tc := range testCases {
2798 for _, tc := range testCases {
2895 t.Run(tc.name, func(t *testing.T) {
2799 t.Run(tc.name, func(t *testing.T) {
2896 req, err := http.NewRequest(tc.method, opts.ProxyPrefix+authOnlyPath, nil)
2800 req, err := http.NewRequest(tc.method, opts.ProxyPrefix+authOnlyPath, nil)
2897 req.Header.Set("X-Forwarded-Uri", tc.url)
2801 req.Header.Set("X-Forwarded-Uri", tc.url)
2898− req.RemoteAddr = "127.0.0.1:4180"
2899 assert.NoError(t, err)
2802 assert.NoError(t, err)
2901 rw := httptest.NewRecorder()
2804 rw := httptest.NewRecorder()
@@ -2910,43 +2813,6 @@ func TestAllowedRequestWithForwardedUriHeader(t *testing.T) {
2913−func TestAllowedRequestWithForwardedUriHeaderRequiresTrustedProxy(t *testing.T) {
2914− upstreamServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
2917− t.Cleanup(upstreamServer.Close)
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{
2925− ID: upstreamServer.URL,
2927− URI: upstreamServer.URL,
2931− opts.SkipAuthRegex = []string{"^/skip/auth/regex$"}
2933− err := validation.Validate(opts)
2934− assert.NoError(t, err)
2936− proxy, err := NewOAuthProxy(opts, func(_ string) bool { return true })
2937− assert.NoError(t, err)
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")
2944− rw := httptest.NewRecorder()
2945− proxy.ServeHTTP(rw, req)
2947− assert.Equal(t, 401, rw.Code)
2950func TestAllowedRequestNegateWithoutMethod(t *testing.T) {
2816func TestAllowedRequestNegateWithoutMethod(t *testing.T) {
2951 upstreamServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
2817 upstreamServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
2952 w.WriteHeader(200)
2818 w.WriteHeader(200)
@@ -2986,37 +2852,37 @@ func TestAllowedRequestNegateWithoutMethod(t *testing.T) {
2988 name: "Some static file allowed",
2854 name: "Some static file allowed",
2989− method: http.MethodGet,
2855+ method: "GET",
2990 url: "/static/file.txt",
2856 url: "/static/file.txt",
2991 allowed: true,
2857 allowed: true,
2994 name: "POST to contact form allowed",
2860 name: "POST to contact form allowed",
2995− method: http.MethodPost,
2861+ method: "POST",
2996 url: "/contact",
2862 url: "/contact",
2997 allowed: true,
2863 allowed: true,
3000 name: "Regex POST allowed",
2866 name: "Regex POST allowed",
3001− method: http.MethodPost,
2867+ method: "POST",
3002 url: "/api/public-entity",
2868 url: "/api/public-entity",
3003 allowed: true,
2869 allowed: true,
3006 name: "Regex POST with trailing slash allowed",
2872 name: "Regex POST with trailing slash allowed",
3007− method: http.MethodPost,
2873+ method: "POST",
3008 url: "/api/public-entity/",
2874 url: "/api/public-entity/",
3009 allowed: true,
2875 allowed: true,
3012 name: "Regex GET api route denied",
2878 name: "Regex GET api route denied",
3013− method: http.MethodGet,
2879+ method: "GET",
3014 url: "/api/users",
2880 url: "/api/users",
3015 allowed: false,
2881 allowed: false,
3018 name: "Regex POST api route denied",
2884 name: "Regex POST api route denied",
3019− method: http.MethodPost,
2885+ method: "POST",
3020 url: "/api/users",
2886 url: "/api/users",
3021 allowed: false,
2887 allowed: false,
@@ -3086,37 +2952,37 @@ func TestAllowedRequestNegateWithMethod(t *testing.T) {
3088 name: "Some static file allowed",
2954 name: "Some static file allowed",
3089− method: http.MethodGet,
2955+ method: "GET",
3090 url: "/static/file.txt",
2956 url: "/static/file.txt",
3091 allowed: true,
2957 allowed: true,
3094 name: "POST to contact form not allowed",
2960 name: "POST to contact form not allowed",
3095− method: http.MethodPost,
2961+ method: "POST",
3096 url: "/contact",
2962 url: "/contact",
3097 allowed: false,
2963 allowed: false,
3100 name: "Regex POST allowed",
2966 name: "Regex POST allowed",
3101− method: http.MethodPost,
2967+ method: "POST",
3102 url: "/api/public-entity",
2968 url: "/api/public-entity",
3103 allowed: true,
2969 allowed: true,
3106 name: "Regex POST with trailing slash allowed",
2972 name: "Regex POST with trailing slash allowed",
3107− method: http.MethodPost,
2973+ method: "POST",
3108 url: "/api/public-entity/",
2974 url: "/api/public-entity/",
3109 allowed: true,
2975 allowed: true,
3112 name: "Regex GET api route denied",
2978 name: "Regex GET api route denied",
3113− method: http.MethodGet,
2979+ method: "GET",
3114 url: "/api/users",
2980 url: "/api/users",
3115 allowed: false,
2981 allowed: false,
3118 name: "Regex POST api route denied",
2984 name: "Regex POST api route denied",
3119− method: http.MethodPost,
2985+ method: "POST",
3120 url: "/api/users",
2986 url: "/api/users",
3121 allowed: false,
2987 allowed: false,
@@ -3256,7 +3122,7 @@ func TestProxyAllowedGroups(t *testing.T) {
3256 t.Fatal(err)
3122 t.Fatal(err)
3259− test.req, _ = http.NewRequest(http.MethodGet, fmt.Sprintf("/%s", tt.querystring), nil)
3125+ test.req, _ = http.NewRequest("GET", fmt.Sprintf("/%s", tt.querystring), nil)
3261 test.req.Header.Add("accept", applicationJSON)
3127 test.req.Header.Add("accept", applicationJSON)
3262 err = test.SaveSession(session)
3128 err = test.SaveSession(session)
@@ -3400,7 +3266,7 @@ func TestAuthOnlyAllowedGroupsWithSkipMethods(t *testing.T) {
3401 name: "UserWithGroupSkipAuthPreflight",
3267 name: "UserWithGroupSkipAuthPreflight",
3402 groups: []string{"a", "c"},
3268 groups: []string{"a", "c"},
3403− method: http.MethodOptions,
3269+ method: "OPTIONS",
3404 ip: "1.2.3.5:43670",
3270 ip: "1.2.3.5:43670",
3405 withSession: true,
3271 withSession: true,
3406 expectedStatusCode: http.StatusAccepted,
3272 expectedStatusCode: http.StatusAccepted,
@@ -3408,7 +3274,7 @@ func TestAuthOnlyAllowedGroupsWithSkipMethods(t *testing.T) {
3409 name: "UserWithGroupTrustedIp",
3275 name: "UserWithGroupTrustedIp",
3410 groups: []string{"a", "c"},
3276 groups: []string{"a", "c"},
3411− method: http.MethodGet,
3277+ method: "GET",
3412 ip: "1.2.3.4:43670",
3278 ip: "1.2.3.4:43670",
3413 withSession: true,
3279 withSession: true,
3414 expectedStatusCode: http.StatusAccepted,
3280 expectedStatusCode: http.StatusAccepted,
@@ -3416,7 +3282,7 @@ func TestAuthOnlyAllowedGroupsWithSkipMethods(t *testing.T) {
3417 name: "UserWithoutGroupSkipAuthPreflight",
3283 name: "UserWithoutGroupSkipAuthPreflight",
3418 groups: []string{"c"},
3284 groups: []string{"c"},
3419− method: http.MethodOptions,
3285+ method: "OPTIONS",
3420 ip: "1.2.3.5:43670",
3286 ip: "1.2.3.5:43670",
3421 withSession: true,
3287 withSession: true,
3422 expectedStatusCode: http.StatusForbidden,
3288 expectedStatusCode: http.StatusForbidden,
@@ -3424,21 +3290,21 @@ func TestAuthOnlyAllowedGroupsWithSkipMethods(t *testing.T) {
3425 name: "UserWithoutGroupTrustedIp",
3291 name: "UserWithoutGroupTrustedIp",
3426 groups: []string{"c"},
3292 groups: []string{"c"},
3427− method: http.MethodGet,
3293+ method: "GET",
3428 ip: "1.2.3.4:43670",
3294 ip: "1.2.3.4:43670",
3429 withSession: true,
3295 withSession: true,
3430 expectedStatusCode: http.StatusForbidden,
3296 expectedStatusCode: http.StatusForbidden,
3433 name: "UserWithoutSessionSkipAuthPreflight",
3299 name: "UserWithoutSessionSkipAuthPreflight",
3434− method: http.MethodOptions,
3300+ method: "OPTIONS",
3435 ip: "1.2.3.5:43670",
3301 ip: "1.2.3.5:43670",
3436 withSession: false,
3302 withSession: false,
3437 expectedStatusCode: http.StatusAccepted,
3303 expectedStatusCode: http.StatusAccepted,
3440 name: "UserWithoutSessionTrustedIp",
3306 name: "UserWithoutSessionTrustedIp",
3441− method: http.MethodGet,
3307+ method: "GET",
3442 ip: "1.2.3.4:43670",
3308 ip: "1.2.3.4:43670",
3443 withSession: false,
3309 withSession: false,
3444 expectedStatusCode: http.StatusAccepted,
3310 expectedStatusCode: http.StatusAccepted,
@@ -3538,24 +3404,6 @@ func TestAuthOnlyAllowedEmailDomains(t *testing.T) {
3538 querystring: "?allowed_email_domains=a.b.c.example.com,*.c.example.com",
3404 querystring: "?allowed_email_domains=a.b.c.example.com,*.c.example.com",
3539 expectedStatusCode: http.StatusAccepted,
3405 expectedStatusCode: http.StatusAccepted,
3542− name: "UserWithMultipleAtSignsExactDomain",
3543− email: "attacker@evil.com@example.com",
3544− querystring: "?allowed_email_domains=example.com",
3545− expectedStatusCode: http.StatusForbidden,
3548− name: "UserWithMultipleAtSignsWildcardDomain",
3549− email: "attacker@evil.com@foo.example.com",
3550− querystring: "?allowed_email_domains=*.example.com",
3551− expectedStatusCode: http.StatusForbidden,
3554− name: "UserWithMultipleAtSignsDotPrefixedDomain",
3555− email: "attacker@evil.com@foo.example.com",
3556− querystring: "?allowed_email_domains=.example.com",
3557− expectedStatusCode: http.StatusForbidden,
3561 for _, tc := range testCases {
3409 for _, tc := range testCases {
@@ -3790,14 +3638,14 @@ func TestIdTokenPlaceholderInSignOut(t *testing.T) {
3791 // Save the required session
3639 // Save the required session
3792 rw := httptest.NewRecorder()
3640 rw := httptest.NewRecorder()
3793− req, _ := http.NewRequest(http.MethodGet, "/", nil)
3641+ req, _ := http.NewRequest("GET", "/", nil)
3794 err = proxy.sessionStore.Save(rw, req, session)
3642 err = proxy.sessionStore.Save(rw, req, session)
3795 assert.NoError(t, err)
3643 assert.NoError(t, err)
3797 rw = httptest.NewRecorder()
3645 rw = httptest.NewRecorder()
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/")
3647 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)
3648+ req, _ = http.NewRequest("GET", "/oauth2/sign_out?rd="+rdUrl, nil)
3801 req = middlewareapi.AddRequestScope(req, &middlewareapi.RequestScope{
3649 req = middlewareapi.AddRequestScope(req, &middlewareapi.RequestScope{
3802 RequestID: "11111111-2222-4333-8444-555555555555",
3650 RequestID: "11111111-2222-4333-8444-555555555555",
3803 Session: session,
3651 Session: session,