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
recipe-server: Optionally accept remote authentication #569
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Empty file.
17 changes: 17 additions & 0 deletions
17
recipe-server/normandy/control/templatetags/normandy_logout_button.py
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
from django import template | ||
from django.conf import settings | ||
from django.core.urlresolvers import reverse | ||
from django.utils.safestring import mark_safe | ||
|
||
|
||
register = template.Library() | ||
|
||
|
||
@register.simple_tag | ||
def logout_button(): | ||
if settings.USE_OIDC: | ||
logout_url = settings.OIDC_LOGOUT_URL | ||
else: | ||
logout_url = reverse('control:logout') | ||
|
||
return mark_safe(f'<a href="{logout_url}">Log Out <i class="fa fa-sign-out post"></i></a>') |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
from django.core.urlresolvers import reverse | ||
|
||
from normandy.control.templatetags.normandy_logout_button import logout_button | ||
|
||
|
||
class TestLogoutButton(object): | ||
def test_without_oidc(self, settings): | ||
settings.USE_OIDC = False | ||
html = logout_button() | ||
assert reverse('control:logout') in html | ||
assert 'None' not in html | ||
|
||
def test_with_oidc(self, settings): | ||
settings.USE_OIDC = True | ||
settings.OIDC_LOGOUT_URL = 'https://example.com/auth/logout' | ||
html = logout_button() | ||
assert settings.OIDC_LOGOUT_URL in html | ||
assert reverse('control:logout') not in html |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we have the setting be the real header name, and just apply the transformation here instead of making the person configuring the site do it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i would rather specify the header as
HTTP_OIDC_CLAIM_USER_PROFILE_EMAIL
thanOidc-Claim-User-Profile-Email
, because that's how I specify it in openresty lua. It sounds like that would work either way though, and this would allow for more flexible input.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I'd prefer to stick with the
HTTP_OIDC_CLAIM_USER_PROFILE_EMAIL
style. I'll clean up the docs, but I think enough tools use this format that it is a fine thing to do.