summaryrefslogtreecommitdiffstats
path: root/ipsilon/providers/saml2
diff options
context:
space:
mode:
Diffstat (limited to 'ipsilon/providers/saml2')
-rw-r--r--ipsilon/providers/saml2/admin.py18
-rw-r--r--ipsilon/providers/saml2/auth.py12
-rw-r--r--ipsilon/providers/saml2/provider.py8
-rw-r--r--ipsilon/providers/saml2/rest.py4
4 files changed, 21 insertions, 21 deletions
diff --git a/ipsilon/providers/saml2/admin.py b/ipsilon/providers/saml2/admin.py
index f8163f7..931d096 100644
--- a/ipsilon/providers/saml2/admin.py
+++ b/ipsilon/providers/saml2/admin.py
@@ -58,14 +58,14 @@ class NewSPAdminPage(AdminPage):
name = None
meta = None
if 'content-type' not in cherrypy.request.headers:
- self._debug("Invalid request, missing content-type")
+ self.debug("Invalid request, missing content-type")
message = "Malformed request"
message_type = ADMIN_STATUS_ERROR
return self.form_new(message, message_type)
ctype = cherrypy.request.headers['content-type'].split(';')[0]
if ctype != 'multipart/form-data':
- self._debug("Invalid form type (%s), trying to cope" % (
- cherrypy.request.content_type,))
+ self.debug("Invalid form type (%s), trying to cope" % (
+ cherrypy.request.content_type,))
for key, value in kwargs.iteritems():
if key == 'name':
name = value
@@ -76,7 +76,7 @@ class NewSPAdminPage(AdminPage):
if hasattr(value, 'content_type'):
meta = value.fullvalue()
else:
- self._debug("Invalid format for 'meta'")
+ self.debug("Invalid format for 'meta'")
elif key == 'metaurl':
if len(value) > 0:
try:
@@ -84,7 +84,7 @@ class NewSPAdminPage(AdminPage):
r.raise_for_status()
meta = r.content
except Exception, e: # pylint: disable=broad-except
- self._debug("Failed to fetch metadata: " + repr(e))
+ self.debug("Failed to fetch metadata: " + repr(e))
message = "Failed to fetch metadata: " + repr(e)
message_type = ADMIN_STATUS_ERROR
return self.form_new(message, message_type)
@@ -101,7 +101,7 @@ class NewSPAdminPage(AdminPage):
message = str(e)
message_type = ADMIN_STATUS_ERROR
except Exception, e: # pylint: disable=broad-except
- self._debug(repr(e))
+ self.debug(repr(e))
message = "Failed to create Service Provider!"
message_type = ADMIN_STATUS_ERROR
else:
@@ -247,7 +247,7 @@ class SPAdminPage(AdminPage):
message_type = ADMIN_STATUS_ERROR
return self.root_with_msg(message, message_type)
except Exception as e: # pylint: disable=broad-except
- self._debug("Error: %s" % repr(e))
+ self.debug("Error: %s" % repr(e))
message = "Internal Error"
message_type = ADMIN_STATUS_ERROR
return self.root_with_msg(message, message_type)
@@ -300,7 +300,7 @@ class Saml2AdminPage(AdminPage):
self.providers.remove(page.sp)
self.sp.del_subtree(name)
except Exception, e: # pylint: disable=broad-except
- self._debug("Failed to remove provider %s: %s" % (name, str(e)))
+ self.debug("Failed to remove provider %s: %s" % (name, str(e)))
def add_sps(self):
if self.cfg.idp:
@@ -310,7 +310,7 @@ class Saml2AdminPage(AdminPage):
self.del_sp(sp.name)
self.add_sp(sp.name, sp)
except Exception, e: # pylint: disable=broad-except
- self._debug("Failed to find provider %s: %s" % (p, str(e)))
+ self.debug("Failed to find provider %s: %s" % (p, str(e)))
def mount(self, page):
self.menu = page.menu
diff --git a/ipsilon/providers/saml2/auth.py b/ipsilon/providers/saml2/auth.py
index 521e0c0..b2c9549 100644
--- a/ipsilon/providers/saml2/auth.py
+++ b/ipsilon/providers/saml2/auth.py
@@ -35,7 +35,7 @@ class UnknownProvider(ProviderException):
def __init__(self, message):
super(UnknownProvider, self).__init__(message)
- self._debug(message)
+ self.debug(message)
class AuthenticateRequest(ProviderPageBase):
@@ -95,7 +95,7 @@ class AuthenticateRequest(ProviderPageBase):
e, message)
raise UnknownProvider(msg)
- self._debug('SP %s requested authentication' % login.remoteProviderId)
+ self.debug('SP %s requested authentication' % login.remoteProviderId)
return login
@@ -108,13 +108,13 @@ class AuthenticateRequest(ProviderPageBase):
try:
login = self._parse_request(request)
except InvalidRequest, e:
- self._debug(str(e))
+ self.debug(str(e))
raise cherrypy.HTTPError(400, 'Invalid SAML request token')
except UnknownProvider, e:
- self._debug(str(e))
+ self.debug(str(e))
raise cherrypy.HTTPError(400, 'Unknown Service Provider')
except Exception, e: # pylint: disable=broad-except
- self._debug(str(e))
+ self.debug(str(e))
raise cherrypy.HTTPError(500)
return login
@@ -305,7 +305,7 @@ class AuthenticateRequest(ProviderPageBase):
raise cherrypy.HTTPError(501)
elif login.protocolProfile == lasso.LOGIN_PROTOCOL_PROFILE_BRWS_POST:
login.buildAuthnResponseMsg()
- self._debug('POSTing back to SP [%s]' % (login.msgUrl))
+ self.debug('POSTing back to SP [%s]' % (login.msgUrl))
context = {
"title": 'Redirecting back to the web application',
"action": login.msgUrl,
diff --git a/ipsilon/providers/saml2/provider.py b/ipsilon/providers/saml2/provider.py
index d3cc144..5d36fbd 100644
--- a/ipsilon/providers/saml2/provider.py
+++ b/ipsilon/providers/saml2/provider.py
@@ -32,7 +32,7 @@ class InvalidProviderId(ProviderException):
def __init__(self, code):
message = 'Invalid Provider ID: %s' % code
super(InvalidProviderId, self).__init__(message)
- self._debug(message)
+ self.debug(message)
class NameIdNotAllowed(Exception):
@@ -207,12 +207,12 @@ class ServiceProvider(ServiceProviderConfig):
self.load_config()
def get_valid_nameid(self, nip):
- self._debug('Requested NameId [%s]' % (nip.format,))
+ self.debug('Requested NameId [%s]' % (nip.format,))
if nip.format is None:
return SAML2_NAMEID_MAP[self.default_nameid]
else:
allowed = self.allowed_nameids
- self._debug('Allowed NameIds %s' % (repr(allowed)))
+ self.debug('Allowed NameIds %s' % (repr(allowed)))
for nameid in allowed:
if nip.format == SAML2_NAMEID_MAP[nameid]:
return nip.format
@@ -291,7 +291,7 @@ class IdentityProvider(Log):
def add_provider(self, sp):
self.server.addProviderFromBuffer(lasso.PROVIDER_ROLE_SP,
sp['metadata'])
- self._debug('Added SP %s' % sp['name'])
+ self.debug('Added SP %s' % sp['name'])
def get_login_handler(self, dump=None):
if dump:
diff --git a/ipsilon/providers/saml2/rest.py b/ipsilon/providers/saml2/rest.py
index 730b374..1610ac4 100644
--- a/ipsilon/providers/saml2/rest.py
+++ b/ipsilon/providers/saml2/rest.py
@@ -98,10 +98,10 @@ class SPS(RestProviderBase):
spc = ServiceProviderCreator(obj)
sp = spc.create_from_buffer(name, metadata)
except (InvalidProviderId, ServerAddProviderFailedError) as e:
- self._debug(repr(e))
+ self.debug(repr(e))
return rest_error(400, str(e))
except Exception, e: # pylint: disable=broad-except
- self._debug(repr(e))
+ self.debug(repr(e))
return rest_error(500, "Failed to create Service Provider")
obj.admin.add_sp(name, sp)
generated by cgit (git 2.34.1) at 2024-06-07 14:55:04 +0000