Changeset 7064 for TI12-security/trunk/NDG_XACML/ndg/xacml/core/functions/__init__.py

Timestamp:

23/06/10 16:41:37 (11 years ago)

Author:

pjkersha

Message:

Incomplete - task 2: XACML-Security Integration

• added and and function and placeholders fro xpath-node-* functions

File:

• TI12-security/trunk/NDG_XACML/ndg/xacml/core/functions/__init__.py (modified) (3 diffs, 1 prop)

TI12-security/trunk/NDG_XACML/ndg/xacml/core/functions/__init__.py

@@ -9 +9 @@
 __license__ = "BSD - see LICENSE file in top-level directory"
 __contact__ = "Philip.Kershaw@stfc.ac.uk"
-__revision__ = "$Id: $"
+__revision__ = "$Id$"
 from abc import ABCMeta, abstractmethod
 from datetime import datetime, timedelta
@@ -356 +356 @@
             # name in order to make an implementation of a class to handle it
             functionName = identifier.split(self.__class__.URN_SEP)[-1]
+            if functionName == 'xpath-node-match':
+                pass
             typePart = functionName.split(self.__class__.FUNCTION_NS_SUFFIX)[0]
             
+            # Attempt to infer from the function name the associated type
             typeName = typePart[0].upper() + typePart[1:]
-            typeURI = AttributeValue.IDENTIFIER_PREFIX + typePart
+            
+            # Remove any hyphens converting to camel case
+            if '-' in typeName:
+                typeName = ''.join([i[0].upper() + i[1:]
+                                    for i in typeName.split('-')])
+                
+            typeURI = AttributeValue.TYPE_URI_MAP.get(typeName)
+            if typeURI is None:
+                # Ugly hack to allow for XPath node functions
+                if typePart == 'xpath-node':
+                    typeURI = AttributeValue.TYPE_URI_MAP['String']
+                else:
+                    raise TypeError('No AttributeValue.TYPE_URI_MAP entry for '
+                                    '%r type' % typePart) 
+                
             _type = attributeValueClassFactory(typeURI)
             if _type is None:
@@ -474 +491 @@
                 if len(functionNameParts) == 1:
                     moduleName = functionNameParts[0]
+                    
+                elif functionName.startswith('xpath-node'):
+                    # Ugly hack for xpath-node functions
+                    moduleName = functionNameParts[-1].lower()
                 else:
                     moduleName = '_'.join(functionNameParts[1:]).lower()