From fe50fd3423969fca640cc35b32678bab5fd491cb Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 10 Oct 2014 13:34:00 -0400 Subject: Handle invalid/expired transactions gracefully Return a useful error page every time and invalid or expired transaction is requested, instead of ending up with an internal backtrace and an ugly 500 error. Signed-off-by: Simo Sorce Reviewed-by: Patrick Uiterwijk --- ipsilon/login/common.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ipsilon/login/common.py') diff --git a/ipsilon/login/common.py b/ipsilon/login/common.py index 94284b0..cb45fd6 100755 --- a/ipsilon/login/common.py +++ b/ipsilon/login/common.py @@ -24,7 +24,6 @@ from ipsilon.util.plugin import PluginLoader, PluginObject from ipsilon.util.plugin import PluginInstaller from ipsilon.info.common import Info from ipsilon.util.cookies import SecureCookie -from ipsilon.util.trans import Transaction import cherrypy @@ -193,7 +192,7 @@ class LoginFormBase(LoginPageBase): return self._template(self.formtemplate, **context) def root(self, *args, **kwargs): - self.trans = Transaction('login', **kwargs) + self.trans = self.get_valid_transaction('login', **kwargs) op = getattr(self, cherrypy.request.method, self.GET) if callable(op): return op(*args, **kwargs) @@ -265,7 +264,7 @@ class Login(Page): def root(self, *args, **kwargs): if self.first_login: - trans = Transaction('login', **kwargs) + trans = self.get_valid_transaction('login', **kwargs) redirect = '%s/login/%s?%s' % (self.basepath, self.first_login.path, trans.get_GET_arg()) -- cgit