@@ -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",
@@ -2189,33 +2130,7 @@ func TestTrustedIPs(t *testing.T) {
21892130 reverseProxy: false,
21902131 realClientIPHeader: "X-Real-IP", // Default value
21912132 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 = "@"
2133+ req, _ := http.NewRequest("GET", "/", nil)
22192134 return req
22202135 }(),
22212136 expectTrusted: false,
@@ -2227,7 +2142,7 @@ func TestTrustedIPs(t *testing.T) {
22272142 reverseProxy: false,
22282143 realClientIPHeader: "X-Real-IP", // Default value
22292144 req: func() *http.Request {
2230− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2145+ req, _ := http.NewRequest("GET", "/", nil)
22312146 req.RemoteAddr = "127.0.0.1:43670"
22322147 return req
22332148 }(),
@@ -2240,7 +2155,7 @@ func TestTrustedIPs(t *testing.T) {
22402155 reverseProxy: true,
22412156 realClientIPHeader: "X-Real-IP", // Default value
22422157 req: func() *http.Request {
2243− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2158+ req, _ := http.NewRequest("GET", "/", nil)
22442159 req.RemoteAddr = "127.0.0.1:44324"
22452160 return req
22462161 }(),
@@ -2253,7 +2168,7 @@ func TestTrustedIPs(t *testing.T) {
22532168 reverseProxy: true,
22542169 realClientIPHeader: "X-Forwarded-For",
22552170 req: func() *http.Request {
2256− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2171+ req, _ := http.NewRequest("GET", "/", nil)
22572172 req.Header.Add("X-Forwarded-For", "127.0.0.1")
22582173 return req
22592174 }(),
@@ -2266,7 +2181,7 @@ func TestTrustedIPs(t *testing.T) {
22662181 reverseProxy: true,
22672182 realClientIPHeader: "X-Forwarded-For",
22682183 req: func() *http.Request {
2269− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2184+ req, _ := http.NewRequest("GET", "/", nil)
22702185 req.Header.Add("X-Forwarded-For", "::1")
22712186 return req
22722187 }(),
@@ -2279,7 +2194,7 @@ func TestTrustedIPs(t *testing.T) {
22792194 reverseProxy: true,
22802195 realClientIPHeader: "X-Forwarded-For",
22812196 req: func() *http.Request {
2282− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2197+ req, _ := http.NewRequest("GET", "/", nil)
22832198 req.Header.Add("X-Forwarded-For", "12.34.56.78")
22842199 return req
22852200 }(),
@@ -2292,7 +2207,7 @@ func TestTrustedIPs(t *testing.T) {
22922207 reverseProxy: true,
22932208 realClientIPHeader: "X-Forwarded-For",
22942209 req: func() *http.Request {
2295− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2210+ req, _ := http.NewRequest("GET", "/", nil)
22962211 req.Header.Add("X-Forwarded-For", "::2")
22972212 return req
22982213 }(),
@@ -2305,7 +2220,7 @@ func TestTrustedIPs(t *testing.T) {
23052220 reverseProxy: true,
23062221 realClientIPHeader: "X-Forwarded-For",
23072222 req: func() *http.Request {
2308− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2223+ req, _ := http.NewRequest("GET", "/", nil)
23092224 req.Header.Add("X-Real-IP", "::1")
23102225 return req
23112226 }(),
@@ -2318,7 +2233,7 @@ func TestTrustedIPs(t *testing.T) {
23182233 reverseProxy: true,
23192234 realClientIPHeader: "X-Forwarded-For",
23202235 req: func() *http.Request {
2321− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2236+ req, _ := http.NewRequest("GET", "/", nil)
23222237 req.Header.Add("X-Forwarded-For", "adsfljk29242as!!")
23232238 return req
23242239 }(),
@@ -2331,7 +2246,7 @@ func TestTrustedIPs(t *testing.T) {
23312246 reverseProxy: false,
23322247 realClientIPHeader: "X-Real-IP",
23332248 req: func() *http.Request {
2334− req, _ := http.NewRequest(http.MethodGet, "/", nil)
2249+ req, _ := http.NewRequest("GET", "/", nil)
23352250 req.RemoteAddr = "adsfljk29242as!!"
23362251 return req
23372252 }(),
@@ -2427,12 +2342,12 @@ func Test_buildRoutesAllowlist(t *testing.T) {
24272342 },
24282343 expectedRoutes: []expectedAllowedRoute{
24292344 {
2430− method: http.MethodGet,
2345+ method: "GET",
24312346 negate: false,
24322347 regexString: "^/foo/bar",
24332348 },
24342349 {
2435− method: http.MethodPost,
2350+ method: "POST",
24362351 negate: false,
24372352 regexString: "^/baz/[0-9]+/thing",
24382353 },
@@ -2485,11 +2400,11 @@ func Test_buildRoutesAllowlist(t *testing.T) {
24852400 regexString: "^/baz/[0-9]+/thing/regex",
24862401 },
24872402 {
2488− method: http.MethodGet,
2403+ method: "GET",
24892404 regexString: "^/foo/bar",
24902405 },
24912406 {
2492− method: http.MethodPost,
2407+ method: "POST",
24932408 regexString: "^/baz/[0-9]+/thing",
24942409 },
24952410 {
@@ -2641,7 +2556,7 @@ func TestApiRoutes(t *testing.T) {
26412556
26422557 for _, tc := range testCases {
26432558 t.Run(tc.name, func(t *testing.T) {
2644− req, err := http.NewRequest(http.MethodGet, tc.url, nil)
2559+ req, err := http.NewRequest("GET", tc.url, nil)
26452560 req.Header.Set("Accept", tc.contentType)
26462561 assert.NoError(t, err)
26472562
@@ -2679,11 +2594,9 @@ func TestAllowedRequest(t *testing.T) {
26792594 }
26802595 opts.SkipAuthRegex = []string{
26812596 "^/skip/auth/regex$",
2682− "^/public/.*/endpoint$",
26832597 }
26842598 opts.SkipAuthRoutes = []string{
26852599 "GET=^/skip/auth/routes/get",
2686− "^/foo/.*/bar$",
26872600 }
26882601 err := validation.Validate(opts)
26892602 assert.NoError(t, err)
@@ -2700,37 +2613,25 @@ func TestAllowedRequest(t *testing.T) {
27002613 }{
27012614 {
27022615 name: "Regex GET allowed",
2703− method: http.MethodGet,
2616+ method: "GET",
27042617 url: "/skip/auth/regex",
27052618 allowed: true,
27062619 },
27072620 {
27082621 name: "Regex POST allowed ",
2709− method: http.MethodPost,
2622+ method: "POST",
27102623 url: "/skip/auth/regex",
27112624 allowed: true,
27122625 },
27132626 {
27142627 name: "Regex denied",
2715− method: http.MethodGet,
2628+ method: "GET",
27162629 url: "/wrong/denied",
27172630 allowed: false,
27182631 },
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− },
27312632 {
27322633 name: "Route allowed",
2733− method: http.MethodGet,
2634+ method: "GET",
27342635 url: "/skip/auth/routes/get",
27352636 allowed: true,
27362637 },
@@ -2742,28 +2643,16 @@ func TestAllowedRequest(t *testing.T) {
27422643 },
27432644 {
27442645 name: "Route denied with wrong path",
2745− method: http.MethodGet,
2646+ method: "GET",
27462647 url: "/skip/auth/routes/wrong/path",
27472648 allowed: false,
27482649 },
27492650 {
27502651 name: "Route denied with wrong path and method",
2751− method: http.MethodPost,
2652+ method: "POST",
27522653 url: "/skip/auth/routes/wrong/path",
27532654 allowed: false,
27542655 },
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− },
27672656 }
27682657
27692658 for _, tc := range testCases {
@@ -2804,11 +2693,9 @@ func TestAllowedRequestWithForwardedUriHeader(t *testing.T) {
28042693 }
28052694 opts.SkipAuthRegex = []string{
28062695 "^/skip/auth/regex$",
2807− "^/public/.*/endpoint$",
28082696 }
28092697 opts.SkipAuthRoutes = []string{
28102698 "GET=^/skip/auth/routes/get",
2811− "^/foo/.*/bar$",
28122699 }
28132700 err := validation.Validate(opts)
28142701 assert.NoError(t, err)
@@ -2825,37 +2712,25 @@ func TestAllowedRequestWithForwardedUriHeader(t *testing.T) {
28252712 }{
28262713 {
28272714 name: "Regex GET allowed",
2828− method: http.MethodGet,
2715+ method: "GET",
28292716 url: "/skip/auth/regex",
28302717 allowed: true,
28312718 },
28322719 {
28332720 name: "Regex POST allowed ",
2834− method: http.MethodPost,
2721+ method: "POST",
28352722 url: "/skip/auth/regex",
28362723 allowed: true,
28372724 },
28382725 {
28392726 name: "Regex denied",
2840− method: http.MethodGet,
2727+ method: "GET",
28412728 url: "/wrong/denied",
28422729 allowed: false,
28432730 },
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− },
28562731 {
28572732 name: "Route allowed",
2858− method: http.MethodGet,
2733+ method: "GET",
28592734 url: "/skip/auth/routes/get",
28602735 allowed: true,
28612736 },
@@ -2867,35 +2742,22 @@ func TestAllowedRequestWithForwardedUriHeader(t *testing.T) {
28672742 },
28682743 {
28692744 name: "Route denied with wrong path",
2870− method: http.MethodGet,
2745+ method: "GET",
28712746 url: "/skip/auth/routes/wrong/path",
28722747 allowed: false,
28732748 },
28742749 {
28752750 name: "Route denied with wrong path and method",
2876− method: http.MethodPost,
2751+ method: "POST",
28772752 url: "/skip/auth/routes/wrong/path",
28782753 allowed: false,
28792754 },
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− },
28922755 }
28932756
28942757 for _, tc := range testCases {
28952758 t.Run(tc.name, func(t *testing.T) {
28962759 req, err := http.NewRequest(tc.method, opts.ProxyPrefix+authOnlyPath, nil)
28972760 req.Header.Set("X-Forwarded-Uri", tc.url)
2898− req.RemoteAddr = "127.0.0.1:4180"
28992761 assert.NoError(t, err)
29002762
29012763 rw := httptest.NewRecorder()
@@ -2910,43 +2772,6 @@ func TestAllowedRequestWithForwardedUriHeader(t *testing.T) {
29102772 }
29112773}
29122774
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−
29502775func TestAllowedRequestNegateWithoutMethod(t *testing.T) {
29512776 upstreamServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
29522777 w.WriteHeader(200)
@@ -2986,37 +2811,37 @@ func TestAllowedRequestNegateWithoutMethod(t *testing.T) {
29862811 }{
29872812 {
29882813 name: "Some static file allowed",
2989− method: http.MethodGet,
2814+ method: "GET",
29902815 url: "/static/file.txt",
29912816 allowed: true,
29922817 },
29932818 {
29942819 name: "POST to contact form allowed",
2995− method: http.MethodPost,
2820+ method: "POST",
29962821 url: "/contact",
29972822 allowed: true,
29982823 },
29992824 {
30002825 name: "Regex POST allowed",
3001− method: http.MethodPost,
2826+ method: "POST",
30022827 url: "/api/public-entity",
30032828 allowed: true,
30042829 },
30052830 {
30062831 name: "Regex POST with trailing slash allowed",
3007− method: http.MethodPost,
2832+ method: "POST",
30082833 url: "/api/public-entity/",
30092834 allowed: true,
30102835 },
30112836 {
30122837 name: "Regex GET api route denied",
3013− method: http.MethodGet,
2838+ method: "GET",
30142839 url: "/api/users",
30152840 allowed: false,
30162841 },
30172842 {
30182843 name: "Regex POST api route denied",
3019− method: http.MethodPost,
2844+ method: "POST",
30202845 url: "/api/users",
30212846 allowed: false,
30222847 },
@@ -3086,37 +2911,37 @@ func TestAllowedRequestNegateWithMethod(t *testing.T) {
30862911 }{
30872912 {
30882913 name: "Some static file allowed",
3089− method: http.MethodGet,
2914+ method: "GET",
30902915 url: "/static/file.txt",
30912916 allowed: true,
30922917 },
30932918 {
30942919 name: "POST to contact form not allowed",
3095− method: http.MethodPost,
2920+ method: "POST",
30962921 url: "/contact",
30972922 allowed: false,
30982923 },
30992924 {
31002925 name: "Regex POST allowed",
3101− method: http.MethodPost,
2926+ method: "POST",
31022927 url: "/api/public-entity",
31032928 allowed: true,
31042929 },
31052930 {
31062931 name: "Regex POST with trailing slash allowed",
3107− method: http.MethodPost,
2932+ method: "POST",
31082933 url: "/api/public-entity/",
31092934 allowed: true,
31102935 },
31112936 {
31122937 name: "Regex GET api route denied",
3113− method: http.MethodGet,
2938+ method: "GET",
31142939 url: "/api/users",
31152940 allowed: false,
31162941 },
31172942 {
31182943 name: "Regex POST api route denied",
3119− method: http.MethodPost,
2944+ method: "POST",
31202945 url: "/api/users",
31212946 allowed: false,
31222947 },
@@ -3256,7 +3081,7 @@ func TestProxyAllowedGroups(t *testing.T) {
32563081 t.Fatal(err)
32573082 }
32583083
3259− test.req, _ = http.NewRequest(http.MethodGet, fmt.Sprintf("/%s", tt.querystring), nil)
3084+ test.req, _ = http.NewRequest("GET", fmt.Sprintf("/%s", tt.querystring), nil)
32603085
32613086 test.req.Header.Add("accept", applicationJSON)
32623087 err = test.SaveSession(session)
@@ -3400,7 +3225,7 @@ func TestAuthOnlyAllowedGroupsWithSkipMethods(t *testing.T) {
34003225 {
34013226 name: "UserWithGroupSkipAuthPreflight",
34023227 groups: []string{"a", "c"},
3403− method: http.MethodOptions,
3228+ method: "OPTIONS",
34043229 ip: "1.2.3.5:43670",
34053230 withSession: true,
34063231 expectedStatusCode: http.StatusAccepted,
@@ -3408,7 +3233,7 @@ func TestAuthOnlyAllowedGroupsWithSkipMethods(t *testing.T) {
34083233 {
34093234 name: "UserWithGroupTrustedIp",
34103235 groups: []string{"a", "c"},
3411− method: http.MethodGet,
3236+ method: "GET",
34123237 ip: "1.2.3.4:43670",
34133238 withSession: true,
34143239 expectedStatusCode: http.StatusAccepted,
@@ -3416,7 +3241,7 @@ func TestAuthOnlyAllowedGroupsWithSkipMethods(t *testing.T) {
34163241 {
34173242 name: "UserWithoutGroupSkipAuthPreflight",
34183243 groups: []string{"c"},
3419− method: http.MethodOptions,
3244+ method: "OPTIONS",
34203245 ip: "1.2.3.5:43670",
34213246 withSession: true,
34223247 expectedStatusCode: http.StatusForbidden,
@@ -3424,21 +3249,21 @@ func TestAuthOnlyAllowedGroupsWithSkipMethods(t *testing.T) {
34243249 {
34253250 name: "UserWithoutGroupTrustedIp",
34263251 groups: []string{"c"},
3427− method: http.MethodGet,
3252+ method: "GET",
34283253 ip: "1.2.3.4:43670",
34293254 withSession: true,
34303255 expectedStatusCode: http.StatusForbidden,
34313256 },
34323257 {
34333258 name: "UserWithoutSessionSkipAuthPreflight",
3434− method: http.MethodOptions,
3259+ method: "OPTIONS",
34353260 ip: "1.2.3.5:43670",
34363261 withSession: false,
34373262 expectedStatusCode: http.StatusAccepted,
34383263 },
34393264 {
34403265 name: "UserWithoutSessionTrustedIp",
3441− method: http.MethodGet,
3266+ method: "GET",
34423267 ip: "1.2.3.4:43670",
34433268 withSession: false,
34443269 expectedStatusCode: http.StatusAccepted,
@@ -3538,24 +3363,6 @@ func TestAuthOnlyAllowedEmailDomains(t *testing.T) {
35383363 querystring: "?allowed_email_domains=a.b.c.example.com,*.c.example.com",
35393364 expectedStatusCode: http.StatusAccepted,
35403365 },
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− },
35593366 }
35603367
35613368 for _, tc := range testCases {
@@ -3762,49 +3569,3 @@ func TestGetOAuthRedirectURI(t *testing.T) {
37623569 })
37633570 }
37643571}
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−}