Changeset 7365

Timestamp:

25/08/10 16:41:20 (10 years ago)

Author:

pjkersha

Message:

Incomplete - task 2: XACML-Security Integration

• added identifier URN constants

Location:

TI12-security/trunk/ndg_xacml/ndg/xacml/core

Files:

• __init__.py (modified) (1 diff)
• action.py (modified) (1 diff)
• apply.py (modified) (1 diff)
• attributedesignator.py (modified) (1 diff)
• environment.py (modified) (1 diff)
• resource.py (modified) (1 diff)
• rule.py (modified) (1 diff)
• subject.py (modified) (1 diff)

TI12-security/trunk/ndg_xacml/ndg/xacml/core/__init__.py

@@ -152 +152 @@
         """
         return self.__matches
+    
+    
+XACML_1_0_PREFIX = "urn:oasis:names:tc:xacml:1.0:"
+
+class Identifiers(object):
+    """XACML Identifiers"""
+    class Subject(object):
+        """XAMCL Subject Identifiers"""
+        AUTHN_LOCALITY_DNS_NAME = XACML_1_0_PREFIX + \
+            "subject:authn-locality:dns-name"
+        AUTHN_LOCALITY_IP_ADDRESS = XACML_1_0_PREFIX + \
+            "subject:authn-locality:ip-address"
+        AUTHN_METHOD = XACML_1_0_PREFIX + "subject:authentication-method"
+        AUTHN_TIME = XACML_1_0_PREFIX + "subject:authentication-time"
+        KEY_INFO = XACML_1_0_PREFIX + "subject:key-info"
+        REQUEST_TIME = XACML_1_0_PREFIX + "subject:request-time"
+        SESSION_START_TIME = XACML_1_0_PREFIX + "subject:session-start-time"
+        SUBJECT_ID = XACML_1_0_PREFIX + "subject:subject-id"
+        SUBJECT_ID_QUALIFIER = XACML_1_0_PREFIX + "subject:subject-id-qualifier"
+        
+    class SubjectCategory(object):
+        """XACML Subject Category Identifiers"""
+        ACCESS_SUBJECT = XACML_1_0_PREFIX + "subject-category:access-subject"
+        CODEBASE = XACML_1_0_PREFIX + "subject-category:codebase"
+        INTERMEDIARY_SUBJECT = XACML_1_0_PREFIX + \
+            "subject-category:intermediary-subject"
+        RECIPIENT_SUBJECT = XACML_1_0_PREFIX + \
+            "subject-category:recipient-subject"
+        REQUESTING_MACHINE = XACML_1_0_PREFIX + \
+            "subject-category:requesting-machine"
+        
+    class Resource(object):
+        """XACML Resource Identifiers"""
+        RESOURCE_LOCATION = XACML_1_0_PREFIX + "resource:resource-location"
+        RESOURCE_ID = XACML_1_0_PREFIX + "resource:resource-id"
+        SIMPLE_FILE_NAME = XACML_1_0_PREFIX + "resource:simple-file-name"
+        
+    class Action(object):
+        """XACML Action Identifiers"""
+        ACTION_ID = XACML_1_0_PREFIX + "action:action-id"
+        IMPLIED_ACTION = XACML_1_0_PREFIX + "action:implied-action"
+     
+    class Environment(object):
+        """XACML Environment Identifiers"""
+        CURRENT_TIME = XACML_1_0_PREFIX + "environment:current-time"
+        CURRENT_DATE = XACML_1_0_PREFIX + "environment:current-date"
+        CURRENT_DATETIME = XACML_1_0_PREFIX + "environment:current-dateTime"
+
+
+

TI12-security/trunk/ndg_xacml/ndg/xacml/core/action.py

@@ -26 +26 @@
     MATCH_TYPE = ActionMatch
     ELEMENT_LOCAL_NAME = 'Action'
-    
+    ID = "urn:oasis:names:tc:xacml:1.0:action:action-id"
     __slots__ = ()
     

TI12-security/trunk/ndg_xacml/ndg/xacml/core/apply.py

@@ -191 +191 @@
         """ 
         
-        # Marshall inputs
+        # Marshal inputs
         funcInputs = [None]*len(self.expressions)
 

TI12-security/trunk/ndg_xacml/ndg/xacml/core/attributedesignator.py

@@ -200 +200 @@
                                            for attrVal in attributeValues 
                                            if attrVal not in attributeValueBag]
+                    else:
+                        filtAttributeValues = attributeValues
                         
                     attributeValueBag.extend(filtAttributeValues)

TI12-security/trunk/ndg_xacml/ndg/xacml/core/environment.py

@@ -25 +25 @@
     MATCH_TYPE = EnvironmentMatch
     ELEMENT_LOCAL_NAME = 'Environment'
-    
+    CURRENT_DATE_URI = "urn:oasis:names:tc:xacml:1.0:environment:current-date"
     __slots__ = ()
     

TI12-security/trunk/ndg_xacml/ndg/xacml/core/resource.py

@@ -25 +25 @@
     MATCH_TYPE = ResourceMatch
     ELEMENT_LOCAL_NAME = 'Resource'
-    
+    ID = "urn:oasis:names:tc:xacml:1.0:resource:resource-id"
     __slots__ = ()
     

TI12-security/trunk/ndg_xacml/ndg/xacml/core/rule.py

@@ -393 +393 @@
             return decision
         
-        except Exception:
+        except Exception, e:
             log.error('Error occurred evaluating rule %r, returning '
                       'Indeterminate result to caller: %s',

TI12-security/trunk/ndg_xacml/ndg/xacml/core/subject.py

@@ -25 +25 @@
     MATCH_TYPE = SubjectMatch
     ELEMENT_LOCAL_NAME = 'Subject'
-    
+    ID = "urn:oasis:names:tc:xacml:1.0:subject:subject-id"
     __slots__ = ()