server: fix registration redirect for non-root URLs #558
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
there's even a test! |
| @@ -358,7 +358,7 @@ func handleAuthFunc(srv OIDCServer, idpcs []connector.Connector, tpl *template.T | |||
| if ok { | |||
| q := url.Values{} | |||
| q.Set("code", key) | |||
| ru := httpPathRegister + "?" + q.Encode() | |||
| ru := strings.TrimRight(baseURL, "/") + "/" + strings.TrimLeft(httpPathRegister, "/") + "?" + q.Encode() | |||
There was a problem hiding this comment.
Could you maybe use path.Join or url.Parse instead? It should remove some of the need to trim, but is also more likely work correctly with joining paths together.
There was a problem hiding this comment.
Sure, I'll switch it to passing a URL and use path.Join
There was a problem hiding this comment.
Actually, it seems weird that you're having to pass the basePath through to so many different places. Is this a thing you only need to do here due to needing to set the Location header?
ericchiang
force-pushed
the
fix-local-registration-for-non-root-url
branch
from
e7c15a4 to
47a6a8b
Compare
|
updated |
|
woops, I have no idea what just happened there. one sec |
ericchiang
force-pushed
the
fix-local-registration-for-non-root-url
branch
from
47a6a8b to
00d5aa9
Compare
|
cc @chancez ready for another review |
ericchiang
force-pushed
the
fix-local-registration-for-non-root-url
branch
from
00d5aa9 to
22e7377
Compare
| @@ -210,6 +226,33 @@ func TestHandleAuthFuncResponsesSingleRedirectURL(t *testing.T) { | |||
| }, | |||
| wantCode: http.StatusBadRequest, | |||
| }, | |||
|
|
|||
| // reigstration | |||
|
LGTM after nits. |
ericchiang
force-pushed
the
fix-local-registration-for-non-root-url
branch
from
22e7377 to
fa8f98a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #553
cc @sym3tri @chancez