Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Open redirect in oauth path #77

Closed
wants to merge 3 commits into from
Closed

Open redirect in oauth path #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5ff202
The host given in state parameter cannot be different from the host c…
saez0pub Oct 15, 2019
da61867
Possible open redirect fixed
saez0pub Oct 15, 2019
5d58150
Naming
saez0pub Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions internal/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (

"github.com/containous/traefik/pkg/rules"
"github.com/sirupsen/logrus"

"strings"
)

type Server struct {
Expand Down Expand Up @@ -146,6 +148,14 @@ func (s *Server) AuthCallbackHandler() http.HandlerFunc {
return
}

//Validate redirect
redirectBaseUseToForgeStatePrameter := redirectBase(r)
if !strings.HasPrefix(redirect+"/", redirectBaseUseToForgeStatePrameter+"/") {
logger.Errorf("Redirection %v does not match the redirectBase", redirect)
http.Error(w, "Not authorized", 401)
return
}

// Generate cookie
http.SetCookie(w, MakeCookie(r, user.Email))
logger.WithFields(logrus.Fields{
Expand Down
19 changes: 15 additions & 4 deletions internal/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,21 +130,31 @@ func TestServerAuthCallback(t *testing.T) {
assert.Equal(401, res.StatusCode, "auth callback without cookie shouldn't be authorised")

// Should catch invalid csrf cookie
req = newDefaultHttpRequest("/_oauth?state=12345678901234567890123456789012:http://redirect")
req = newDefaultHttpRequest("/_oauth?state=12345678901234567890123456789012:http://example.com")
c := MakeCSRFCookie(req, "nononononononononononononononono")
res, _ = doHttpRequest(req, c)
assert.Equal(401, res.StatusCode, "auth callback with invalid cookie shouldn't be authorised")

// Should redirect valid request
req = newDefaultHttpRequest("/_oauth?state=12345678901234567890123456789012:http://redirect")
req = newDefaultHttpRequest("/_oauth?state=12345678901234567890123456789012:http://example.com/redirect")
c = MakeCSRFCookie(req, "12345678901234567890123456789012")
res, _ = doHttpRequest(req, c)
assert.Equal(307, res.StatusCode, "valid auth callback should be allowed")

fwd, _ := res.Location()
assert.Equal("http", fwd.Scheme, "valid request should be redirected to return url")
assert.Equal("redirect", fwd.Host, "valid request should be redirected to return url")
assert.Equal("", fwd.Path, "valid request should be redirected to return url")
assert.Equal("example.com", fwd.Host, "valid request should be redirected to return url")
assert.Equal("/redirect", fwd.Path, "valid request should be redirected to return url")

req = newDefaultHttpRequest("/_oauth?state=12345678901234567890123456789012:http://example.com.notallowed")
c = MakeCSRFCookie(req, "12345678901234567890123456789012")
res, _ = doHttpRequest(req, c)
assert.Equal(401, res.StatusCode, "redirect domain cannot differ from the host defined in the state parameter")

req = newDefaultHttpRequest("/_oauth?state=12345678901234567890123456789012:http://notallowed.example.com")
c = MakeCSRFCookie(req, "12345678901234567890123456789012")
res, _ = doHttpRequest(req, c)
assert.Equal(401, res.StatusCode, "subdomain cannot differ from the host defined in the state parameter")
}

func TestServerDefaultAction(t *testing.T) {
Expand Down Expand Up @@ -355,6 +365,7 @@ func newHttpRequest(method, dest, uri string) *http.Request {
p, _ := url.Parse(dest)
r.Header.Add("X-Forwarded-Method", method)
r.Header.Add("X-Forwarded-Host", p.Host)
r.Header.Add("X-Forwarded-Proto", p.Scheme)
r.Header.Add("X-Forwarded-Uri", uri)
return r
}
Expand Down