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