Skip to content

Updates _sp_authn_requests_signed_alg to work with multiple bindings #142

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

Closed
wants to merge 2 commits into from
Closed

Updates _sp_authn_requests_signed_alg to work with multiple bindings #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93bbbde
Updates _sp_authn_requests_signed_alg to work with both BINDING_HTTP_…
mobleyc Feb 10, 2019
85298be
Clarifies configuration example. Adds support for sigalg use in logout.
mobleyc Feb 17, 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
7 changes: 7 additions & 0 deletions djangosaml2/overrides.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,11 @@ def do_logout(self, *args, **kwargs):
except AttributeError:
logger.warning('SAML_LOGOUT_REQUEST_PREFERRED_BINDING setting is'
' not defined. Default binding will be used.')

# 1. global_logout calls do_logout but does not forward kwargs, so we cannot use global_logout(sigalg=sigalg)
# 2. sigalg is used by BINDING_HTTP_REDIRECT
if kwargs.get('sign_alg') and not kwargs.get('sigalg'):
logger.debug("Setting sigalg: %s", kwargs.get('sign_alg'))
kwargs['sigalg'] = kwargs.get('sign_alg')

return super(Saml2Client, self).do_logout(*args, **kwargs)
39 changes: 32 additions & 7 deletions djangosaml2/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,31 @@ def callable_bool(value):
return value


def get_sigalg(conf):
# See also:
# 1. https://github.com/IdentityPython/pysaml2/pull/396
# 2. https://github.com/IdentityPython/pysaml2/pull/495
#
# Configuration example:
# {
# 'service': {
# 'sp': {
# 'authn_requests_signed': True,
# 'authn_requests_signed_alg': 'sha256'
# }
# }
# }
#
sign_requests = getattr(conf, '_sp_authn_requests_signed', False)

sig_alg_option_map = {'sha1': SIG_RSA_SHA1,
'sha256': SIG_RSA_SHA256}

sig_alg_option = getattr(conf, '_sp_authn_requests_signed_alg', 'sha1')
logger.debug("sig_alg_option: %s", sig_alg_option)
return sig_alg_option_map.get(sig_alg_option, SIG_RSA_SHA1) if sign_requests else None


def login(request,
config_loader_path=None,
wayf_template='djangosaml2/wayf.html',
Expand Down Expand Up @@ -171,15 +196,13 @@ def login(request,
client = Saml2Client(conf)
http_response = None

sigalg = get_sigalg(conf)

logger.debug('Redirecting user to the IdP via %s binding.', binding)
if binding == BINDING_HTTP_REDIRECT:
try:
# do not sign the xml itself, instead use the sigalg to
# generate the signature as a URL param
sig_alg_option_map = {'sha1': SIG_RSA_SHA1,
'sha256': SIG_RSA_SHA256}
sig_alg_option = getattr(conf, '_sp_authn_requests_signed_alg', 'sha1')
sigalg = sig_alg_option_map[sig_alg_option] if sign_requests else None
nsprefix = get_namespace_prefixes()
session_id, result = client.prepare_for_authenticate(
entityid=selected_idp, relay_state=came_from,
Expand All @@ -200,7 +223,8 @@ def login(request,
return HttpResponse(text_type(e))
session_id, request_xml = client.create_authn_request(
location,
binding=binding)
binding=binding,
sign_alg=sigalg)
try:
if PY3:
saml_request = base64.b64encode(binary_type(request_xml, 'UTF-8'))
Expand All @@ -222,7 +246,7 @@ def login(request,
try:
session_id, result = client.prepare_for_authenticate(
entityid=selected_idp, relay_state=came_from,
binding=binding)
binding=binding, sign_alg=sigalg)
except TypeError as e:
logger.error('Unable to know which IdP to use')
return HttpResponse(text_type(e))
Expand Down Expand Up @@ -364,6 +388,7 @@ def logout(request, config_loader_path=None):
"""
state = StateCache(request.session)
conf = get_config(config_loader_path, request)
sigalg = get_sigalg(conf)

client = Saml2Client(conf, state_cache=state,
identity_cache=IdentityCache(request.session))
Expand All @@ -373,7 +398,7 @@ def logout(request, config_loader_path=None):
'The session does not contain the subject id for user %s',
request.user)

result = client.global_logout(subject_id)
result = client.global_logout(subject_id, sign_alg=sigalg)

state.sync()

Expand Down