Restore ability to run from checkout

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

diff --git a/ipsilon/providers/saml2/admin.py b/ipsilon/providers/saml2/admin.py
index 4f33e1b..1c62cac 100755 (executable)
--- a/ipsilon/providers/saml2/admin.py
+++ b/ipsilon/providers/saml2/admin.py
@@ -23,6 +23,7 @@ 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]'
@@ -51,8 +52,8 @@ class NewSPAdminPage(Page):
     def POST(self, *args, **kwargs):
 
         if self.user.is_admin:
-            #TODO: allow authenticated user to create SPs on their own
-            #      set the owner in that case
+            # TODO: allow authenticated user to create SPs on their own
+            #       set the owner in that case
             name = None
             meta = None
             if 'content-type' not in cherrypy.request.headers:
@@ -73,11 +74,25 @@ class NewSPAdminPage(Page):
                         return self.form_new(message, message_type)
 
                     name = value
-                elif key == 'meta':
+                elif key == 'metatext':
+                    if len(value) > 0:
+                        meta = value
+                elif key == 'metafile':
                     if hasattr(value, 'content_type'):
                         meta = value.fullvalue()
                     else:
                         self._debug("Invalid format for 'meta'")
+                elif key == 'metaurl':
+                    if len(value) > 0:
+                        try:
+                            r = requests.get(value)
+                            r.raise_for_status()
+                            meta = r.content
+                        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"
+                            return self.form_new(message, message_type)
 
             if name and meta:
                 try:
@@ -122,14 +137,14 @@ class SPAdminPage(Page):
         self.backurl = parent.url
         self.url = '%s/sp/%s' % (parent.url, sp.name)
 
-    def form_standard(self, message=None, message_type=None):
+    def form_standard(self, message=None, message_type=None, newurl=None):
         return self._template('admin/providers/saml2_sp.html',
                               message=message,
                               message_type=message_type,
                               title=self.title,
                               name='saml2_sp_%s_form' % self.sp.name,
                               backurl=self.backurl, action=self.url,
-                              data=self.sp)
+                              data=self.sp, newurl=newurl)
 
     def GET(self, *args, **kwargs):
         return self.form_standard()
@@ -245,14 +260,15 @@ class SPAdminPage(Page):
                 self.sp.save_properties()
                 if 'rename' in results:
                     rename = results['rename']
+                    self.url = '%s/sp/%s' % (self.parent.url, rename[1])
                     self.parent.rename_sp(rename[0], rename[1])
-                message = "Properties succssfully changed"
+                message = "Properties successfully changed"
                 message_type = "success"
             except Exception:  # pylint: disable=broad-except
                 message = "Failed to save data!"
                 message_type = "error"
 
-        return self.form_standard(message, message_type)
+        return self.form_standard(message, message_type, self.url)
 
     def delete(self):
         self.parent.del_sp(self.sp.name)
@@ -293,12 +309,13 @@ class AdminPage(Page):
     def mount(self, page):
         self.menu = page.menu
         self.url = '%s/%s' % (page.url, self.name)
-        for p in self.cfg.idp.get_providers():
-            try:
-                sp = ServiceProvider(self.cfg, p)
-                self.add_sp(sp.name, sp)
-            except Exception, e:  # pylint: disable=broad-except
-                self._debug("Failed to find provider %s: %s" % (p, str(e)))
+        if self.cfg.idp:
+            for p in self.cfg.idp.get_providers():
+                try:
+                    sp = ServiceProvider(self.cfg, p)
+                    self.add_sp(sp.name, sp)
+                except Exception, e:  # pylint: disable=broad-except
+                    self._debug("Failed to find provider %s: %s" % (p, str(e)))
         self.add_subtree('new', NewSPAdminPage(self._site, self))
         page.add_subtree(self.name, self)