From 3d38500a756d26294956c53bdcc82313a8bbfc55 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 6 Oct 2014 22:48:07 -0400 Subject: Add AdminPage abstraction on top of util.Page This is to allow different default headers between Admin pages and other pages. In particular we set no-caching headers to all admin pages to force browsers to refresh as often as possible. Signed-off-by: Simo Sorce Reviewed-by: Patrick Uiterwijk --- ipsilon/providers/saml2/admin.py | 12 ++++++------ ipsilon/providers/saml2idp.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'ipsilon/providers') diff --git a/ipsilon/providers/saml2/admin.py b/ipsilon/providers/saml2/admin.py index 7e14312..dae4a47 100755 --- a/ipsilon/providers/saml2/admin.py +++ b/ipsilon/providers/saml2/admin.py @@ -18,7 +18,7 @@ # along with this program. If not, see . import cherrypy -from ipsilon.util.page import Page +from ipsilon.admin.common import AdminPage from ipsilon.providers.saml2.provider import ServiceProvider from ipsilon.providers.saml2.provider import ServiceProviderCreator from ipsilon.providers.saml2.provider import InvalidProviderId @@ -29,7 +29,7 @@ import requests VALID_IN_NAME = r'[^\ a-zA-Z0-9]' -class NewSPAdminPage(Page): +class NewSPAdminPage(AdminPage): def __init__(self, site, parent): super(NewSPAdminPage, self).__init__(site, form=True) @@ -127,7 +127,7 @@ class UnauthorizedUser(Exception): pass -class SPAdminPage(Page): +class SPAdminPage(AdminPage): def __init__(self, sp, site, parent): super(SPAdminPage, self).__init__(site, form=True) @@ -277,15 +277,15 @@ class SPAdminPage(Page): delete.public_function = True -class AdminPage(Page): +class Saml2AdminPage(AdminPage): def __init__(self, site, config): - super(AdminPage, self).__init__(site) + super(Saml2AdminPage, self).__init__(site) self.name = 'admin' self.cfg = config self.providers = [] self.menu = [] self.url = None - self.sp = Page(self._site) + self.sp = AdminPage(self._site) def add_sp(self, name, sp): page = SPAdminPage(sp, self._site, self) diff --git a/ipsilon/providers/saml2idp.py b/ipsilon/providers/saml2idp.py index e30e4a1..7508760 100755 --- a/ipsilon/providers/saml2idp.py +++ b/ipsilon/providers/saml2idp.py @@ -20,7 +20,7 @@ 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 @@ -214,7 +214,7 @@ Provides SAML 2.0 authentication infrastructure. """ 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): -- cgit