Changeset 3240 for TI02-CSML/trunk

Timestamp:

17/01/08 12:07:13 (13 years ago)

Author:

domlowe

Message:

security info now added to csmldocs during scanning

Location:

TI02-CSML/trunk/csml

Files:

• csmllibs/csmlbuilder.py (modified) (4 diffs)
• csmlscan.py (modified) (1 diff)

TI02-CSML/trunk/csml/csmllibs/csmlbuilder.py

@@ -6 +6 @@
     #this class contains all the method calls to create and populate a csmldoc
     #it needs to be provided with several bits of information to be able to do this.
-    def __init__(self,datasetid, directory,csmlft, mapping, timedimension ,outputfile,printscreen,timestorage,spatialstorage,valuestorage, minaxes):
+    def __init__(self,datasetid, directory,csmlft, mapping, timedimension ,outputfile,printscreen,timestorage,spatialstorage,valuestorage, minaxes, secallow, secdeny):
         if datasetid is not None:
             self.datasetid = datasetid
@@ -23 +23 @@
         self.csml = None  # csml object holds the csml document in memory.
         self.ds_element = None #<Dataset> tag, root node.
+        self.secallow=secallow
+        self.secdeny=secdeny
          
     def build(self):
@@ -33 +35 @@
             print 'error: Cannot find a config file at this location.'
             sys.exit()
-            
+        self.addSecurity()
         self.createFeatureFileMap()
         if self.spatialstorage=='fileextract':
@@ -74 +76 @@
         #self.ds.description=csml.parser.Description(strGmlDescription)
     
-    def createCSML(self):
-        print "Create CSML"
-        #create an empty csml document and dataset tag
-        self.csml, self.ds_element = csml.csmllibs.csmlmeta.createDataset()
-        #add gml metadata elements
-        self.csml, self.ds_element = csml.csmllibs.csmlmeta.addGMLMetadata(self.csml, self.directory, self.ds_element)
-
+    def addSecurity(self):        
+        '''Adds NDG style AccessControlPolicy to the dataset based on info in config file'''
+        def _buildSimpleCondition(condition):
+            #builds the tag structure for a SimpleCondition
+            scond=csml.parser.SimpleCondition()
+            parts=condition.split(' ')
+            attauth=csml.parser.csString(parts[0])
+            role=csml.parser.csString(parts[1]) 
+            scond.attrauthRole=role
+            scond.dgAttributeAuthority=attauth
+            return scond
+        
+        acp=csml.parser.AccessControlPolicy()
+        if self.secallow:
+            for condition in self.secallow.split(','):
+                dgSecurityCondition=csml.parser.DgSecurityCondition()
+                dgSecurityCondition.effect=csml.parser.csString('allow')
+                dgSecurityCondition.addChildElem('simpleCondition', _buildSimpleCondition(condition))
+                acp.addChildElem('dgSecurityCondition', dgSecurityCondition)
+        if self.secdeny:
+            for condition in self.secallow.split(','):
+                dgSecurityCondition=csml.parser.DgSecurityCondition()
+                dgSecurityCondition.effect=csml.parser.csString('deny')
+                dgSecurityCondition.addChildElem('simpleCondition', _buildSimpleCondition(condition))
+                acp.addChildElem('dgSecurityCondition', dgSecurityCondition)
+        self.ds.accessControlPolicy=acp       
+        
     def createFeatureFileMap(self):
         print "Create FFMAP"

TI02-CSML/trunk/csml/csmlscan.py

@@ -202 +202 @@
     #build CSML document
     print ROOTDIRECTORY
-    csmldataset=csmllibs.csmlbuilder.csmlBuilder(DATASETID,ROOTDIRECTORY,FEATURETYPE,MAPPING,TIMEDIMENSION, OUTPUTFILE, PRINTSCREEN,TIMESTORAGE,SPATIALSTORAGE,VALUESTORAGE, MINAXES)
+    csmldataset=csmllibs.csmlbuilder.csmlBuilder(DATASETID,ROOTDIRECTORY,FEATURETYPE,MAPPING,TIMEDIMENSION, OUTPUTFILE, PRINTSCREEN,TIMESTORAGE,SPATIALSTORAGE,VALUESTORAGE, MINAXES, SEC_ALLOW, SEC_DENY)
     csmldataset.build()