from ipsilon.providers.common import ProviderBase, ProviderPageBase
from ipsilon.providers.common import FACILITY
from ipsilon.providers.saml2.auth import AuthenticateRequest
-from ipsilon.providers.saml2.admin import AdminPage
+from ipsilon.providers.saml2.admin import Saml2AdminPage
from ipsilon.providers.saml2.provider import IdentityProvider
from ipsilon.tools.certs import Certificate
from ipsilon.tools import saml2metadata as metadata
session = UserSession()
user = session.get_user()
- session.nuke_data('login', 'Return')
- self.stage = session.get_data('saml2', 'stage')
+ transdata = self.trans.retrieve()
+ self.stage = transdata['saml2_stage']
if user.is_anonymous:
self._debug("User is marked anonymous?!")
self._debug('Continue auth for %s' % user.name)
- dump = session.get_data('saml2', 'Request')
- if not dump:
+ if 'saml2_request' not in transdata:
self._debug("Couldn't find Request dump?!")
# TODO: Return to SP with auth failed error
raise cherrypy.HTTPError(400)
+ dump = transdata['saml2_request']
try:
login = self.cfg.idp.get_login_handler(dump)
def __init__(self, *args, **kwargs):
super(SAML2, self).__init__(*args, **kwargs)
self.metadata = Metadata(*args, **kwargs)
-
- # Init IDP data
- try:
- self.cfg.idp = IdentityProvider(self.cfg)
- except Exception, e: # pylint: disable=broad-except
- self._debug('Failed to init SAML2 provider: %r' % e)
- return
-
- # Import all known applications
- data = self.cfg.get_data()
- for idval in data:
- sp = data[idval]
- if 'type' not in sp or sp['type'] != 'SP':
- continue
- if 'name' not in sp or 'metadata' not in sp:
- continue
- try:
- self.cfg.idp.add_provider(sp)
- except Exception, e: # pylint: disable=broad-except
- self._debug('Failed to add SP %s: %r' % (sp['name'], e))
-
self.SSO = SSO(*args, **kwargs)
return self.get_config_value('default email domain')
def get_tree(self, site):
+ self.idp = self.init_idp()
self.page = SAML2(site, self)
- self.admin = AdminPage(site, self)
+ self.admin = Saml2AdminPage(site, self)
return self.page
+ def init_idp(self):
+ idp = None
+ # Init IDP data
+ try:
+ idp = IdentityProvider(self)
+ except Exception, e: # pylint: disable=broad-except
+ self._debug('Failed to init SAML2 provider: %r' % e)
+ return None
+
+ # Import all known applications
+ data = self.get_data()
+ for idval in data:
+ sp = data[idval]
+ if 'type' not in sp or sp['type'] != 'SP':
+ continue
+ if 'name' not in sp or 'metadata' not in sp:
+ continue
+ try:
+ idp.add_provider(sp)
+ except Exception, e: # pylint: disable=broad-except
+ self._debug('Failed to add SP %s: %r' % (sp['name'], e))
+
+ return idp
+
+ def on_enable(self):
+ self.init_idp()
+ if hasattr(self, 'admin'):
+ if self.admin:
+ self.admin.add_sps()
+
class Installer(object):
'idp certificate file': cert.cert,
'idp key file': cert.key,
'enabled': '1'}
- po.set_config(config)
- po.save_plugin_config(FACILITY)
+ po.save_plugin_config(FACILITY, config)
# Fixup permissions so only the ipsilon user can read these files
files.fix_user_dirs(path, opts['system_user'])