@@ -336,3 +336,142 @@ func TestRedirectHTTPSRedirect_forwardedProtoTrust(t *testing.T) {
336336 })
337337 }
338338}
339+
340+ func TestRedirectMalformedHost (t * testing.T ) {
341+ for _ , tc := range []struct {
342+ host string
343+ hasWWW bool
344+ }{{"" , false }, {"www." , true }, {"www.:80" , true }, {"WWW." , true }, {":80" , false }, {".example.com" , false }, {"example.com%2fpath" , false }} {
345+ for _ , mw := range []struct {
346+ name string
347+ make func () echo.MiddlewareFunc
348+ reject bool
349+ }{{"https" , HTTPSRedirect , true }, {"https-www" , HTTPSWWWRedirect , true }, {"https-non-www" , HTTPSNonWWWRedirect , true }, {"www" , WWWRedirect , ! tc .hasWWW }, {"non-www" , NonWWWRedirect , tc .hasWWW }} {
350+ t .Run (mw .name + "/" + tc .host , func (t * testing.T ) {
351+ e := echo .New ()
352+ e .Pre (mw .make ())
353+ called := false
354+ e .GET ("/*" , func (c * echo.Context ) error { called = true ; return c .NoContent (http .StatusOK ) })
355+ req := httptest .NewRequest (http .MethodGet , "/attacker.com/login" , nil )
356+ req .Host = tc .host
357+ rec := httptest .NewRecorder ()
358+ e .ServeHTTP (rec , req )
359+ want := http .StatusOK
360+ if mw .reject {
361+ want = http .StatusBadRequest
362+ }
363+ assert .Equal (t , want , rec .Code )
364+ assert .Equal (t , ! mw .reject , called )
365+ assert .Empty (t , rec .Header ().Get (echo .HeaderLocation ))
366+ })
367+ }
368+ }
369+ }
370+
371+ func TestRedirectBareWWWHostOverHTTP (t * testing.T ) {
372+ e := echo .New ()
373+ e .Pre (HTTPSNonWWWRedirect ())
374+ e .GET ("/*" , func (c * echo.Context ) error { return c .NoContent (http .StatusOK ) })
375+ server := httptest .NewServer (e )
376+ defer server .Close ()
377+ req , err := http .NewRequest (http .MethodGet , server .URL + "/attacker.com/login" , nil )
378+ if ! assert .NoError (t , err ) {
379+ return
380+ }
381+ req .Host = "www."
382+ client := server .Client ()
383+ client .CheckRedirect = func (* http.Request , []* http.Request ) error { return http .ErrUseLastResponse }
384+ resp , err := client .Do (req )
385+ if ! assert .NoError (t , err ) {
386+ return
387+ }
388+ defer resp .Body .Close ()
389+ assert .Equal (t , http .StatusBadRequest , resp .StatusCode )
390+ assert .Empty (t , resp .Header .Get (echo .HeaderLocation ))
391+ }
392+
393+ func TestRedirectRequestTarget (t * testing.T ) {
394+ for _ , tc := range []struct { uri , want string }{
395+ {"" , "https://example.com/files/a%2Fb?x=1" },
396+ {"http://example.com/files/a%2Fb?x=1" , "https://example.com/files/a%2Fb?x=1" },
397+ {"//attacker.com/x" , "https://example.com//attacker.com/x" },
398+ {"/x\t /y" , "https://example.com/x%09/y" },
399+ } {
400+ t .Run (tc .uri , func (t * testing.T ) {
401+ e := echo .New ()
402+ req := httptest .NewRequest (http .MethodGet , "http://example.com/files/a%2Fb?x=1" , nil )
403+ req .RequestURI = tc .uri
404+ rec := httptest .NewRecorder ()
405+ c := e .NewContext (req , rec )
406+ assert .NoError (t , HTTPSRedirect ()(func (* echo.Context ) error { return nil })(c ))
407+ assert .Equal (t , tc .want , rec .Header ().Get (echo .HeaderLocation ))
408+ })
409+ }
410+ }
411+
412+ func TestRedirectValidAuthority (t * testing.T ) {
413+ for _ , host := range []string {"example.com" , "example.com:8080" , "[::1]" , "[::1]:8080" } {
414+ t .Run (host , func (t * testing.T ) {
415+ e := echo .New ()
416+ req := httptest .NewRequest (http .MethodGet , "/docs" , nil )
417+ req .Host = host
418+ rec := httptest .NewRecorder ()
419+ assert .NoError (t , HTTPSRedirect ()(func (* echo.Context ) error { return nil })(e .NewContext (req , rec )))
420+ assert .Equal (t , "https://" + host + "/docs" , rec .Header ().Get (echo .HeaderLocation ))
421+ })
422+ }
423+ }
424+
425+ func TestRedirectWWWCaseAndWebSocketScheme (t * testing.T ) {
426+ for _ , tc := range []struct {
427+ name , host , proto , want string
428+ make func () echo.MiddlewareFunc
429+ }{
430+ {"strip uppercase" , "WWW.example.com" , "http" , "http://example.com/docs" , NonWWWRedirect },
431+ {"avoid duplicate" , "WWW.example.com" , "http" , "https://www.example.com/docs" , HTTPSWWWRedirect },
432+ {"already www" , "WWW.example.com" , "https" , "" , WWWRedirect },
433+ {"ws" , "example.com" , "ws" , "http://www.example.com/docs" , WWWRedirect },
434+ {"wss" , "www.example.com" , "wss" , "https://example.com/docs" , NonWWWRedirect },
435+ {"already secure" , "example.com" , "wss" , "" , HTTPSRedirect },
436+ } {
437+ t .Run (tc .name , func (t * testing.T ) {
438+ e := echo .New ()
439+ req := httptest .NewRequest (http .MethodGet , "/docs" , nil )
440+ req .Host = tc .host
441+ req .RemoteAddr = "127.0.0.1:1234"
442+ req .Header .Set (echo .HeaderXForwardedProto , tc .proto )
443+ rec := httptest .NewRecorder ()
444+ assert .NoError (t , tc .make ()(func (* echo.Context ) error { return nil })(e .NewContext (req , rec )))
445+ assert .Equal (t , tc .want , rec .Header ().Get (echo .HeaderLocation ))
446+ })
447+ }
448+ }
449+
450+ func TestRedirectAsteriskTarget (t * testing.T ) {
451+ e := echo .New ()
452+ req := httptest .NewRequest (http .MethodOptions , "*" , nil )
453+ req .Host = "example.com"
454+ rec := httptest .NewRecorder ()
455+ called := false
456+ err := HTTPSRedirect ()(func (c * echo.Context ) error { called = true ; return c .NoContent (http .StatusNoContent ) })(e .NewContext (req , rec ))
457+ assert .NoError (t , err )
458+ assert .True (t , called )
459+ assert .Equal (t , http .StatusNoContent , rec .Code )
460+ assert .Empty (t , rec .Header ().Get (echo .HeaderLocation ))
461+ }
462+
463+ func TestRedirectUnchangedHost (t * testing.T ) {
464+ e := echo .New ()
465+ req := httptest .NewRequest (http .MethodGet , "https://example.com/docs" , nil )
466+ req .Host = ""
467+ rec := httptest .NewRecorder ()
468+ called := false
469+ err := HTTPSRedirect ()(func (c * echo.Context ) error {
470+ called = true
471+ return c .NoContent (http .StatusOK )
472+ })(e .NewContext (req , rec ))
473+ assert .NoError (t , err )
474+ assert .True (t , called )
475+ assert .Equal (t , http .StatusOK , rec .Code )
476+ assert .Empty (t , rec .Header ().Get (echo .HeaderLocation ))
477+ }
0 commit comments