Print exceptions when saving data fails in admin UI

[cascardo/ipsilon.git] / ipsilon / providers / saml2 / admin.py

diff --git a/ipsilon/providers/saml2/admin.py b/ipsilon/providers/saml2/admin.py
old mode 100755 (executable)
new mode 100644 (file)
index dae4a47..d5a5bdf
--- a/ipsilon/providers/saml2/admin.py
+++ b/ipsilon/providers/saml2/admin.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
 # Copyright (C) 2014  Simo Sorce <simo@redhat.com>
 #
 # see file 'COPYING' for use and warranty information
@@ -19,16 +17,15 @@
 
 import cherrypy
 from ipsilon.admin.common import AdminPage
+from ipsilon.admin.common import ADMIN_STATUS_OK
+from ipsilon.admin.common import ADMIN_STATUS_ERROR
+from ipsilon.admin.common import ADMIN_STATUS_WARN
 from ipsilon.providers.saml2.provider import ServiceProvider
 from ipsilon.providers.saml2.provider import ServiceProviderCreator
 from ipsilon.providers.saml2.provider import InvalidProviderId
-import re
 import requests
 
 
-VALID_IN_NAME = r'[^\ a-zA-Z0-9]'
-
-
 class NewSPAdminPage(AdminPage):
 
     def __init__(self, site, parent):
@@ -59,7 +56,7 @@ class NewSPAdminPage(AdminPage):
             if 'content-type' not in cherrypy.request.headers:
                 self._debug("Invalid request, missing content-type")
                 message = "Malformed request"
-                message_type = "error"
+                message_type = ADMIN_STATUS_ERROR
                 return self.form_new(message, message_type)
             ctype = cherrypy.request.headers['content-type'].split(';')[0]
             if ctype != 'multipart/form-data':
@@ -67,12 +64,6 @@ class NewSPAdminPage(AdminPage):
                             cherrypy.request.content_type,))
             for key, value in kwargs.iteritems():
                 if key == 'name':
-                    if re.search(VALID_IN_NAME, value):
-                        message = "Invalid name!" \
-                                  " Use only numbers and letters"
-                        message_type = "error"
-                        return self.form_new(message, message_type)
-
                     name = value
                 elif key == 'metatext':
                     if len(value) > 0:
@@ -91,7 +82,7 @@ class NewSPAdminPage(AdminPage):
                         except Exception, e:  # pylint: disable=broad-except
                             self._debug("Failed to fetch metadata: " + repr(e))
                             message = "Failed to fetch metadata: " + repr(e)
-                            message_type = "error"
+                            message_type = ADMIN_STATUS_ERROR
                             return self.form_new(message, message_type)
 
             if name and meta:
@@ -100,21 +91,21 @@ class NewSPAdminPage(AdminPage):
                     sp = spc.create_from_buffer(name, meta)
                     sp_page = self.parent.add_sp(name, sp)
                     message = "SP Successfully added"
-                    message_type = "success"
+                    message_type = ADMIN_STATUS_OK
                     return sp_page.form_standard(message, message_type)
                 except InvalidProviderId, e:
                     message = str(e)
-                    message_type = "error"
+                    message_type = ADMIN_STATUS_ERROR
                 except Exception, e:  # pylint: disable=broad-except
                     self._debug(repr(e))
                     message = "Failed to create Service Provider!"
-                    message_type = "error"
+                    message_type = ADMIN_STATUS_ERROR
             else:
                 message = "A name and a metadata file must be provided"
-                message_type = "error"
+                message_type = ADMIN_STATUS_ERROR
         else:
             message = "Unauthorized"
-            message_type = "error"
+            message_type = ADMIN_STATUS_ERROR
 
         return self.form_new(message, message_type)
 
@@ -155,7 +146,7 @@ class SPAdminPage(AdminPage):
             return False
 
         if self.user.is_admin or self.user.name == self.sp.owner:
-            if re.search(VALID_IN_NAME, value):
+            if not self.sp.is_valid_name(value):
                 err = "Invalid name! Use only numbers and letters"
                 raise InvalidValueFormat(err)
 
@@ -235,16 +226,16 @@ class SPAdminPage(AdminPage):
 
         except InvalidValueFormat, e:
             message = str(e)
-            message_type = "warning"
+            message_type = ADMIN_STATUS_WARN
             return self.form_standard(message, message_type)
         except UnauthorizedUser, e:
             message = str(e)
-            message_type = "error"
+            message_type = ADMIN_STATUS_ERROR
             return self.form_standard(message, message_type)
         except Exception, e:  # pylint: disable=broad-except
             self._debug("Error: %s" % repr(e))
             message = "Internal Error"
-            message_type = "error"
+            message_type = ADMIN_STATUS_ERROR
             return self.form_standard(message, message_type)
 
         if len(results) > 0:
@@ -263,10 +254,11 @@ class SPAdminPage(AdminPage):
                     self.url = '%s/sp/%s' % (self.parent.url, rename[1])
                     self.parent.rename_sp(rename[0], rename[1])
                 message = "Properties successfully changed"
-                message_type = "success"
-            except Exception:  # pylint: disable=broad-except
+                message_type = ADMIN_STATUS_OK
+            except Exception, e:  # pylint: disable=broad-except
+                self.error('Failed to save data: %s' % e)
                 message = "Failed to save data!"
-                message_type = "error"
+                message_type = ADMIN_STATUS_ERROR
 
         return self.form_standard(message, message_type, self.url)