entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 35 Releases Activity

saml2: remove compatibility with very old lasso versions (#39086)

This commit is contained in:
Frédéric Péters 2020-01-18 22:36:37 +01:00
parent 9aa6749598
commit 13fd3f9551
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wcs/qommon/__init__.py
View File

@ -200,22 +200,3 @@ class AppConfig(django.apps.AppConfig):
get_publisher_class().init_publisher_class()
default_app_config = 'wcs.qommon.AppConfig'
if lasso:
if not hasattr(lasso, 'SAML2_SUPPORT'):
lasso.SAML2_SUPPORT = False
if not hasattr(lasso, 'SAML2_NAME_IDENTIFIER_FORMAT_EMAIL'):
lasso.SAML2_NAME_IDENTIFIER_FORMAT_EMAIL = 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress'
if not hasattr(lasso, 'SAML2_NAME_IDENTIFIER_FORMAT_UNSPECIFIED'):
lasso.SAML2_NAME_IDENTIFIER_FORMAT_EMAIL = 'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified'
if not hasattr(lasso, 'cptrToPy') and not hasattr(lasso, 'OrigProvider'):
lasso.OrigProvider = lasso.Provider
# old (SWIG) bindings
class Provider(lasso.OrigProvider):
def __init__(self, *args):
lasso.OrigProvider.__init__(self, *args)
if self.this is None:
raise lasso.Error('Error creating Provider')
lasso.Provider = Provider

15
wcs/qommon/misc.py
View File

@ -108,14 +108,13 @@ def get_lasso_server():
continue
raise
if hasattr(lasso, 'ENCRYPTION_SYM_KEY_TYPE_DEFAULT'):
encryption_mode = lasso.ENCRYPTION_MODE_NONE
if idp.get('encrypt_nameid', False):
encryption_mode |= lasso.ENCRYPTION_MODE_NAMEID
provider_t = get_provider(klp)
provider = server.getProvider(provider_t.providerId)
if provider is not None:
provider.setEncryptionMode(encryption_mode)
encryption_mode = lasso.ENCRYPTION_MODE_NONE
if idp.get('encrypt_nameid', False):
encryption_mode |= lasso.ENCRYPTION_MODE_NAMEID
provider_t = get_provider(klp)
provider = server.getProvider(provider_t.providerId)
if provider is not None:
provider.setEncryptionMode(encryption_mode)
return server