Fix warning

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

diff --git a/ipsilon/providers/saml2/provider.py b/ipsilon/providers/saml2/provider.py
index 6339450..8b7f04e 100755 (executable)
--- a/ipsilon/providers/saml2/provider.py
+++ b/ipsilon/providers/saml2/provider.py
@@ -18,23 +18,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from ipsilon.providers.common import ProviderException
+from ipsilon.tools.saml2metadata import SAML2_NAMEID_MAP
 import cherrypy
 import lasso
 
 
-NAMEID_MAP = {
-    'email': lasso.SAML2_NAME_IDENTIFIER_FORMAT_EMAIL,
-    'encrypted': lasso.SAML2_NAME_IDENTIFIER_FORMAT_ENCRYPTED,
-    'entity': lasso.SAML2_NAME_IDENTIFIER_FORMAT_ENTITY,
-    'kerberos': lasso.SAML2_NAME_IDENTIFIER_FORMAT_KERBEROS,
-    'persistent': lasso.SAML2_NAME_IDENTIFIER_FORMAT_PERSISTENT,
-    'transient': lasso.SAML2_NAME_IDENTIFIER_FORMAT_TRANSIENT,
-    'unspecified': lasso.SAML2_NAME_IDENTIFIER_FORMAT_UNSPECIFIED,
-    'windows': lasso.SAML2_NAME_IDENTIFIER_FORMAT_WINDOWS,
-    'x509': lasso.SAML2_NAME_IDENTIFIER_FORMAT_X509,
-}
-
-
 class InvalidProviderId(ProviderException):
 
     def __init__(self, code):
@@ -45,8 +33,8 @@ class InvalidProviderId(ProviderException):
 
 class NameIdNotAllowed(Exception):
 
-    def __init__(self):
-        message = 'The specified Name ID is not allowed'
+    def __init__(self, nid):
+        message = 'Name ID [%s] is not allowed' % nid
         super(NameIdNotAllowed, self).__init__(message)
         self.message = message
 
@@ -64,6 +52,7 @@ class ServiceProvider(object):
         idval = data.keys()[0]
         data = self.cfg.get_data(idval=idval)
         self._properties = data[idval]
+        self._staging = dict()
 
     @property
     def provider_id(self):
@@ -73,13 +62,35 @@ class ServiceProvider(object):
     def name(self):
         return self._properties['name']
 
+    @name.setter
+    def name(self, value):
+        self._staging['name'] = value
+
+    @property
+    def owner(self):
+        if 'owner' in self._properties:
+            return self._properties['owner']
+        else:
+            return ''
+
+    @owner.setter
+    def owner(self, value):
+        self._staging['owner'] = value
+
     @property
-    def allowed_namedids(self):
-        if 'allowed nameid' in self._properties:
-            return self._properties['allowed nameid']
+    def allowed_nameids(self):
+        if 'allowed nameids' in self._properties:
+            allowed = self._properties['allowed nameids']
+            return [x.strip() for x in allowed.split(',')]
         else:
             return self.cfg.default_allowed_nameids
 
+    @allowed_nameids.setter
+    def allowed_nameids(self, value):
+        if type(value) is not list:
+            raise ValueError("Must be a list")
+        self._staging['allowed nameids'] = ','.join(value)
+
     @property
     def default_nameid(self):
         if 'default nameid' in self._properties:
@@ -87,20 +98,43 @@ class ServiceProvider(object):
         else:
             return self.cfg.default_nameid
 
+    @default_nameid.setter
+    def default_nameid(self, value):
+        self._staging['default nameid'] = value
+
+    def save_properties(self):
+        data = self.cfg.get_data(name='id', value=self.provider_id)
+        if len(data) != 1:
+            raise InvalidProviderId('Could not find SP data')
+        idval = data.keys()[0]
+        data = dict()
+        data[idval] = self._staging
+        self.cfg.save_data(data)
+        data = self.cfg.get_data(idval=idval)
+        self._properties = data[idval]
+        self._staging = dict()
+
     def get_valid_nameid(self, nip):
         self._debug('Requested NameId [%s]' % (nip.format,))
         if nip.format is None:
-            return NAMEID_MAP[self.default_nameid]
+            return SAML2_NAMEID_MAP[self.default_nameid]
         elif nip.format == lasso.SAML2_NAME_IDENTIFIER_FORMAT_UNSPECIFIED:
-            return NAMEID_MAP[self.default_nameid]
+            return SAML2_NAMEID_MAP[self.default_nameid]
         else:
-            allowed = self.allowed_namedids
+            allowed = self.allowed_nameids
             self._debug('Allowed NameIds %s' % (repr(allowed)))
             for nameid in allowed:
-                if nip.format == NAMEID_MAP[nameid]:
+                if nip.format == SAML2_NAMEID_MAP[nameid]:
                     return nip.format
         raise NameIdNotAllowed(nip.format)
 
+    def permanently_delete(self):
+        data = self.cfg.get_data(name='id', value=self.provider_id)
+        if len(data) != 1:
+            raise InvalidProviderId('Could not find SP data')
+        idval = data.keys()[0]
+        self.cfg.del_datum(idval)
+
     def _debug(self, fact):
         if cherrypy.config.get('debug', False):
             cherrypy.log(fact)
@@ -110,6 +144,14 @@ class ServiceProvider(object):
             return username.split('@', 1)[0]
         return username
 
+    def is_valid_nameid(self, value):
+        if value in SAML2_NAMEID_MAP:
+            return True
+        return False
+
+    def valid_nameids(self):
+        return SAML2_NAMEID_MAP.keys()
+
 
 class ServiceProviderCreator(object):