diff options
| -rwxr-xr-x | ipsilon/login/common.py | 3 | ||||
| -rwxr-xr-x | ipsilon/root.py | 7 | ||||
| -rw-r--r-- | ipsilon/unauthorized.py | 28 | ||||
| -rwxr-xr-x | ipsilon/util/errors.py | 53 | ||||
| -rw-r--r-- | templates/badrequest.html | 12 | ||||
| -rw-r--r-- | templates/internalerror.html | 15 | ||||
| -rw-r--r-- | templates/unauthorized.html | 8 |
7 files changed, 92 insertions, 34 deletions
diff --git a/ipsilon/login/common.py b/ipsilon/login/common.py index 5879fda..4ffdd8a 100755 --- a/ipsilon/login/common.py +++ b/ipsilon/login/common.py @@ -56,9 +56,8 @@ class LoginManagerBase(PluginObject): # otherwise destroy session and return error if not ref: - ref = cherrypy.config.get('base.mount', "") + '/unauthorized' - # Just make sure we destroy the session session.logout(None) + raise cherrypy.HTTPError(401) raise cherrypy.HTTPRedirect(ref) diff --git a/ipsilon/root.py b/ipsilon/root.py index 88a15c6..19a47a4 100755 --- a/ipsilon/root.py +++ b/ipsilon/root.py @@ -18,10 +18,11 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from ipsilon.util.page import Page +from ipsilon.util import errors from ipsilon.login.common import Login from ipsilon.login.common import Logout from ipsilon.admin.common import Admin -from ipsilon.unauthorized import Unauthorized +import cherrypy sites = dict() @@ -36,7 +37,9 @@ class Root(Page): super(Root, self).__init__(sites[site]) # set up error pages - self.unauthorized = Unauthorized(self._site) + cherrypy.config['error_page.400'] = errors.Error_400(self._site) + cherrypy.config['error_page.401'] = errors.Error_401(self._site) + cherrypy.config['error_page.500'] = errors.Errors(self._site) # now set up the default login plugins self.login = Login(self._site) diff --git a/ipsilon/unauthorized.py b/ipsilon/unauthorized.py deleted file mode 100644 index 52125d4..0000000 --- a/ipsilon/unauthorized.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/python -# -# Copyright (C) 2014 Petr Vobornik <pvoborni@redhat.com> -# -# see file 'COPYING' for use and warranty information -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -from ipsilon.util.page import Page -import cherrypy - - -class Unauthorized(Page): - - def root(self): - cherrypy.response.status = "401 Unauthorized" - return self._template('unauthorized.html', title='Unauthorized') diff --git a/ipsilon/util/errors.py b/ipsilon/util/errors.py new file mode 100755 index 0000000..16b7c70 --- /dev/null +++ b/ipsilon/util/errors.py @@ -0,0 +1,53 @@ +#!/usr/bin/python +# +# Copyright (C) 2014 Simo Sorce <simo@redhat.com> +# +# see file 'COPYING' for use and warranty information +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +from ipsilon.util.page import Page +import cherrypy + +class Errors(Page): + + def __init__(self, *args, **kwargs): + super(Errors, self).__init__(*args, **kwargs) + + def _error_template(self, *args, **kwargs): + # pylint: disable=star-args + output_page = self._template(*args, **kwargs) + # for some reason cherrypy will choke if the output + # is a unicode object, so use str() here to please it + return str(output_page) + + def handler(self, status, message, traceback, version): + self._debug(repr([status, message, traceback, version])) + return self._error_template('internalerror.html', title='Internal Error') + + def __call__(self, status, message, traceback, version): + return self.handler(status, message, traceback, version) + + +class Error_400(Errors): + + def handler(self, status, message, traceback, version): + return self._error_template('badrequest.html', + title='Bad Request', message=message) + +class Error_401(Errors): + + def handler(self, status, message, traceback, version): + return self._error_template('unauthorized.html', + title='Unauthorized', message=message) diff --git a/templates/badrequest.html b/templates/badrequest.html new file mode 100644 index 0000000..25a2731 --- /dev/null +++ b/templates/badrequest.html @@ -0,0 +1,12 @@ +{% extends "master.html" %} +{% block main %} +<div class="col-sm-12"> + <h1>400 - Bad Request</h1> + {% if message: %} + <p>{{ message }}</p> + {% else %} + <p>Your client made a request that could not be understood.</p> + <p>Sorry!</p> + {% endif %} +</div> +{% endblock %} diff --git a/templates/internalerror.html b/templates/internalerror.html new file mode 100644 index 0000000..9682c14 --- /dev/null +++ b/templates/internalerror.html @@ -0,0 +1,15 @@ +{% extends "master.html" %} +{% block main %} +<div class="col-sm-12"> + <h1>500 - Internal Server Error</h1> + {% if message: %} + <p>{{ message }}</p> + {% else %} + <p>Ipsilon encountered an unexpected internal error while trying to + fulfill your request.</p> + {% endif %} + <p>Please retry again.</p> + <p>If the error persists, contact the server administrator to resolve + the problem.</p> +</div> +{% endblock %} diff --git a/templates/unauthorized.html b/templates/unauthorized.html index ee2f412..cdb34da 100644 --- a/templates/unauthorized.html +++ b/templates/unauthorized.html @@ -2,7 +2,11 @@ {% block main %} <div class="col-sm-12"> <h1>401 - Unauthorized</h1> - <p>Authentication was not successful</p> + {% if message: %} + <p>{{ message }}</p> + {% else %} + <p>Authentication was not successful</p> + {% endif %} <p><a href="{{ basepath }}/login" title="Login">Try to login again</a></p> </div> -{% endblock %}
\ No newline at end of file +{% endblock %} |