From 33bab7b0d653200d4321a71a1467ba39714005c4 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 4 Apr 2014 13:19:51 -0400 Subject: Admin functions to delete Service Providers Signed-off-by: Simo Sorce --- ipsilon/providers/saml2/admin.py | 15 +++++++++++++++ ipsilon/providers/saml2/provider.py | 7 +++++++ 2 files changed, 22 insertions(+) (limited to 'ipsilon/providers/saml2') diff --git a/ipsilon/providers/saml2/admin.py b/ipsilon/providers/saml2/admin.py index 7db19fc..4e9741d 100755 --- a/ipsilon/providers/saml2/admin.py +++ b/ipsilon/providers/saml2/admin.py @@ -103,6 +103,7 @@ class SPAdminPage(Page): def __init__(self, sp, site, parent): super(SPAdminPage, self).__init__(site) + self.parent = parent self.sp = sp self.title = sp.name self.backurl = parent.url @@ -192,6 +193,12 @@ class SPAdminPage(Page): if callable(op): return op(*args, **kwargs) + def delete(self): + self.parent.del_sp(self.sp.name) + self.sp.permanently_delete() + return self.parent.root() + delete.exposed = True + class AdminPage(Page): def __init__(self, site, config): @@ -209,6 +216,14 @@ class AdminPage(Page): self.providers.append(sp) return page + def del_sp(self, name): + try: + page = getattr(self.sp, name) + 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))) + def mount(self, page): self.menu = page.menu self.url = '%s/%s' % (page.url, self.name) diff --git a/ipsilon/providers/saml2/provider.py b/ipsilon/providers/saml2/provider.py index 7975500..73ff005 100755 --- a/ipsilon/providers/saml2/provider.py +++ b/ipsilon/providers/saml2/provider.py @@ -140,6 +140,13 @@ class ServiceProvider(object): return nip.format raise NameIdNotAllowed(nip.format) + def permanently_delete(self): + data = self.cfg.get_data(name='id', value=self.provider_id) + if len(data) != 1: + raise InvalidProviderId('Could not find SP data') + idval = data.keys()[0] + self.cfg.del_datum(idval) + def _debug(self, fact): if cherrypy.config.get('debug', False): cherrypy.log(fact) -- cgit