From 7f9f89853d155bdf31fd5a85b7cf6280c0901785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 22 Sep 2016 09:25:59 +0200 Subject: [PATCH] Properly handle embed/non-embed error renders for some SDK exceptions. --- pillar/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pillar/__init__.py b/pillar/__init__.py index 2608450d..3506ec3e 100644 --- a/pillar/__init__.py +++ b/pillar/__init__.py @@ -331,14 +331,15 @@ class PillarServer(Eve): return flask.redirect(flask.url_for('users.login')) def handle_sdk_forbidden(self, error): - from flask import render_template self.log.info('Forwarding ForbiddenAccess exception to client: %s', error, exc_info=True) - return render_template('errors/403_embed.html'), 403 + error.code = 403 + return self.pillar_error_handler(error) def handle_sdk_resource_not_found(self, error): - from flask import render_template self.log.info('Forwarding ResourceNotFound exception to client: %s', error, exc_info=True) - return render_template('errors/404.html'), 404 + + error.code = 404 + return self.pillar_error_handler(error) def handle_sdk_resource_invalid(self, error): self.log.info('Forwarding ResourceInvalid exception to client: %s', error, exc_info=True)