-
Notifications
You must be signed in to change notification settings - Fork 3.6k
[WEB-4900]: validated authentication redirection paths #7798
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # Python imports | ||
| import uuid | ||
| from urllib.parse import urlencode, urljoin | ||
|
|
||
| # Django import | ||
| from django.http import HttpResponseRedirect | ||
|
|
@@ -16,8 +16,7 @@ | |
| AuthenticationException, | ||
| AUTHENTICATION_ERROR_CODES, | ||
| ) | ||
| from plane.utils.path_validator import validate_next_path | ||
|
|
||
| from plane.utils.path_validator import get_safe_redirect_url | ||
|
|
||
| class GitHubOauthInitiateEndpoint(View): | ||
| def get(self, request): | ||
|
|
@@ -35,10 +34,10 @@ def get(self, request): | |
| error_message="INSTANCE_NOT_CONFIGURED", | ||
| ) | ||
| params = exc.get_error_dict() | ||
| if next_path: | ||
| params["next_path"] = str(validate_next_path(next_path)) | ||
| url = urljoin( | ||
| base_host(request=request, is_app=True), "?" + urlencode(params) | ||
| url = get_safe_redirect_url( | ||
| base_url=base_host(request=request, is_app=True), | ||
| next_path=next_path, | ||
| params=params | ||
| ) | ||
| return HttpResponseRedirect(url) | ||
| try: | ||
|
|
@@ -49,10 +48,10 @@ def get(self, request): | |
| return HttpResponseRedirect(auth_url) | ||
| except AuthenticationException as e: | ||
| params = e.get_error_dict() | ||
| if next_path: | ||
| params["next_path"] = str(validate_next_path(next_path)) | ||
| url = urljoin( | ||
| base_host(request=request, is_app=True), "?" + urlencode(params) | ||
| url = get_safe_redirect_url( | ||
| base_url=base_host(request=request, is_app=True), | ||
| next_path=next_path, | ||
| params=params | ||
| ) | ||
| return HttpResponseRedirect(url) | ||
|
|
||
|
|
@@ -70,9 +69,11 @@ def get(self, request): | |
| error_message="GITHUB_OAUTH_PROVIDER_ERROR", | ||
| ) | ||
| params = exc.get_error_dict() | ||
| if next_path: | ||
| params["next_path"] = str(validate_next_path(next_path)) | ||
| url = urljoin(base_host, "?" + urlencode(params)) | ||
| url = get_safe_redirect_url( | ||
| base_url=base_host(request=request, is_app=True), | ||
| next_path=next_path, | ||
| params=params | ||
| ) | ||
sriramveeraghanta marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return HttpResponseRedirect(url) | ||
|
Comment on lines
+73
to
77
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shadowing base_host in callback breaks redirects. base_host = request.session.get("host") shadows the function; subsequent base_host(...) calls will error. Rename: - base_host = request.session.get("host")
+ host_url = request.session.get("host")Also applies to: 86-90, 114-118 🤖 Prompt for AI Agents |
||
|
|
||
| if not code: | ||
|
|
@@ -81,9 +82,11 @@ def get(self, request): | |
| error_message="GITHUB_OAUTH_PROVIDER_ERROR", | ||
| ) | ||
| params = exc.get_error_dict() | ||
| if next_path: | ||
| params["next_path"] = str(validate_next_path(next_path)) | ||
| url = urljoin(base_host, "?" + urlencode(params)) | ||
| url = get_safe_redirect_url( | ||
| base_url=base_host(request=request, is_app=True), | ||
| next_path=next_path, | ||
| params=params | ||
| ) | ||
| return HttpResponseRedirect(url) | ||
|
|
||
| try: | ||
|
|
@@ -93,17 +96,23 @@ def get(self, request): | |
| user = provider.authenticate() | ||
| # Login the user and record his device info | ||
| user_login(request=request, user=user, is_app=True) | ||
| # Get the redirection path | ||
| if next_path: | ||
| path = str(validate_next_path(next_path)) | ||
| path = next_path | ||
| else: | ||
| path = get_redirection_path(user=user) | ||
| # redirect to referer path | ||
| url = urljoin(base_host, path) | ||
|
|
||
| # Get the safe redirect URL | ||
| url = get_safe_redirect_url( | ||
| base_url=base_host(request=request, is_app=True), | ||
| next_path=path, | ||
| params={} | ||
| ) | ||
| return HttpResponseRedirect(url) | ||
| except AuthenticationException as e: | ||
| params = e.get_error_dict() | ||
| if next_path: | ||
| params["next_path"] = str(validate_next_path(next_path)) | ||
| url = urljoin(base_host, "?" + urlencode(params)) | ||
| url = get_safe_redirect_url( | ||
| base_url=base_host(request=request, is_app=True), | ||
| next_path=next_path, | ||
| params=params | ||
| ) | ||
| return HttpResponseRedirect(url) | ||
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.