Skip to content

Single Log Out Fix #38

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
izderadicka wants to merge 3 commits into from
Closed

Single Log Out Fix #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e9d623
Added suport to set nameID in logout request
izderadicka Jan 2, 2015
7f10fe9
Added session index to Logout Request
izderadicka Jan 2, 2015
1f8e610
Fix creation of session_index elem
izderadicka Jan 2, 2015
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 src/onelogin/saml2/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def login(self, return_to=None):
parameters['Signature'] = self.build_request_signature(saml_request, parameters['RelayState'])
return self.redirect_to(self.get_sso_url(), parameters)

def logout(self, return_to=None):
def logout(self, return_to=None, name_id=None, session_index=None):
"""
Initiates the SLO process.

Expand All @@ -288,7 +288,8 @@ def logout(self, return_to=None):
OneLogin_Saml2_Error.SAML_SINGLE_LOGOUT_NOT_SUPPORTED
)

logout_request = OneLogin_Saml2_Logout_Request(self.__settings)
logout_request = OneLogin_Saml2_Logout_Request(self.__settings, name_id=name_id,
session_index=session_index)

saml_request = logout_request.get_request()

Expand Down
16 changes: 14 additions & 2 deletions src/onelogin/saml2/logout_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class OneLogin_Saml2_Logout_Request(object):

"""

def __init__(self, settings, request=None):
def __init__(self, settings, request=None, name_id=None, session_index=None):
"""
Constructs the Logout Request object.

Expand All @@ -45,7 +45,10 @@ def __init__(self, settings, request=None):
security = self.__settings.get_security_data()

uid = OneLogin_Saml2_Utils.generate_unique_id()
name_id_value = OneLogin_Saml2_Utils.generate_unique_id()
if not name_id:
name_id_value = OneLogin_Saml2_Utils.generate_unique_id()
else:
name_id_value = name_id
issue_instant = OneLogin_Saml2_Utils.parse_time_to_SAML(OneLogin_Saml2_Utils.now())

cert = None
Expand All @@ -68,13 +71,15 @@ def __init__(self, settings, request=None):
Destination="%(single_logout_url)s">
<saml:Issuer>%(entity_id)s</saml:Issuer>
%(name_id)s
%(session_index)s
</samlp:LogoutRequest>""" % \
{
'id': uid,
'issue_instant': issue_instant,
'single_logout_url': idp_data['singleLogoutService']['url'],
'entity_id': sp_data['entityId'],
'name_id': name_id,
'session_index' : self._generate_session_index(session_index)
}
else:
decoded = b64decode(request)
Expand All @@ -94,6 +99,13 @@ def get_request(self):
:rtype: str object
"""
return OneLogin_Saml2_Utils.deflate_and_base64_encode(self.__logout_request)


def _generate_session_index(self,id):
if id:
return "<samlp:SessionIndex>%s</samlp:SessionIndex>" % id
else:
return ""

@staticmethod
def get_id(request):
Expand Down