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

allow preserving the originally requested path after the authentication redirect #335

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow preserving the originally requested path after the authentication redirect #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions internal/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,10 @@ func redirectBase(r *http.Request) string {
return fmt.Sprintf("%s://%s", r.Header.Get("X-Forwarded-Proto"), r.Host)
}

// Return url
// returnUrl is the URL that we will return to after authentication. Uses `RequestURI()` in order
// to preserve both the path and query parameters.
func returnUrl(r *http.Request) string {
return fmt.Sprintf("%s%s", redirectBase(r), r.URL.Path)
return fmt.Sprintf("%s%s", redirectBase(r), r.URL.RequestURI())
}

// Get oauth redirect uri
Expand Down
17 changes: 17 additions & 0 deletions internal/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,23 @@ func TestMakeState(t *testing.T) {
p3 := provider.GenericOAuth{}
state = MakeState(r, &p3, "nonce")
assert.Equal("nonce:generic-oauth:http://example.com/hello", state)

// Test at the root, but with a forwarded prefix
// this is how traefik forwards the request path information
r = httptest.NewRequest("GET", "http://example.com", nil)
r.Header.Add("X-Forwarded-Proto", "https")
r.Header.Add("X-Forwarded-Prefix", "/other/path")
p4 := provider.GenericOAuth{}
state = MakeState(r, &p4, "nonce")
assert.Equal("nonce:generic-oauth:https://example.com/other/path", state)

// Path and a forwarded prefix should use the path
r = httptest.NewRequest("GET", "http://example.com/multi/path", nil)
r.Header.Add("X-Forwarded-Proto", "https")
r.Header.Add("X-Forwarded-Prefix", "/something")
p5 := provider.GenericOAuth{}
state = MakeState(r, &p5, "nonce")
assert.Equal("nonce:generic-oauth:https://example.com/multi/path", state)
}

func TestAuthNonce(t *testing.T) {
Expand Down