X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Futil%2Fpage.py;h=3a0181121c9d77cd8e1de9ba5a669fd2080a1a6f;hp=2cdca1c103d6b8a0668429ae3832e83e8fa9a159;hb=37ef4b972ea240f085e7d29923aba70787ac1668;hpb=2a6309cd0f22951b288393f7b70816db94841897 diff --git a/ipsilon/util/page.py b/ipsilon/util/page.py index 2cdca1c..3a01811 100755 --- a/ipsilon/util/page.py +++ b/ipsilon/util/page.py @@ -21,17 +21,29 @@ from ipsilon.util.user import UserSession import cherrypy +def admin_protect(fn): + + def check(*args, **kwargs): + if UserSession().get_user().is_admin: + return fn(*args, **kwargs) + + raise cherrypy.HTTPError(403) + + return check + + def protect(): UserSession().remote_login() class Page(object): - def __init__(self, site): + def __init__(self, site, form=False): if not 'template_env' in site: raise ValueError('Missing template environment') self._site = site self.basepath = cherrypy.config.get('base.mount', "") self.user = None + self.form = form def __call__(self, *args, **kwargs): # pylint: disable=star-args @@ -42,9 +54,23 @@ class Page(object): if callable(op) and getattr(self, args[0]+'.exposed', None): return op(*args[1:], **kwargs) else: - op = getattr(self, 'root', None) - if callable(op): - return op(*args, **kwargs) + if self.form: + self._debug("method: %s" % cherrypy.request.method) + op = getattr(self, cherrypy.request.method, None) + if callable(op): + # Basic CSRF protection + if cherrypy.request.method != 'GET': + if 'referer' not in cherrypy.request.headers: + return cherrypy.HTTPError(403) + referer = cherrypy.request.headers['referer'] + url = cherrypy.url(relative=False) + if referer != url: + return cherrypy.HTTPError(403) + return op(*args, **kwargs) + else: + op = getattr(self, 'root', None) + if callable(op): + return op(*args, **kwargs) return self.default(*args, **kwargs) @@ -62,7 +88,17 @@ class Page(object): m.update(kwargs) return t.render(**m) + def _debug(self, fact): + if cherrypy.config.get('debug', False): + cherrypy.log(fact) + def default(self, *args, **kwargs): raise cherrypy.HTTPError(404) + def add_subtree(self, name, page): + self.__dict__[name] = page + + def del_subtree(self, name): + del self.__dict__[name] + exposed = True