Changeset 2641

Timestamp:

23/06/07 19:33:10 (14 years ago)

Author:

lawrence

Message:

Fixed major bug in xmlHandler2, and retrieve now
respects CSML security. CSML documents are large
so need to put caching in place.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models

Files:

• ndgRetrieve.py (modified) (3 diffs)
• ndgSecurity.py (added)
• xmlHandler2.py (modified) (11 diffs)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/ndgRetrieve.py

@@ -2 +2 @@
 import cgi,time
 from Utilities import myConfig
+from ndgSecurity import HandleSecurity
+
 debug=1
-def ndgRetrieve(uri,config,logger=0,requestor='test',format=''):
+def ndgRetrieve(uri,config,logger=0,requestor='test',format='',securityTokens=None):
     
     ''' Given an ndgObject, uri, retrieve it, with security in place '''
     
     
-    def getws(config,uri):
+    def getws(config,uri,):
         ''' Get a ws connection to the local exist database '''
         # The logic here is that
@@ -71 +73 @@
         pass
     elif uri.schema =='NDG-A0':
-        pass        
-            
-    
+        
+        s=x.tree.find('{http://ndg.nerc.ac.uk/csml}AccessControlPolicy/{http://ndg.nerc.ac.uk/csml}dgSecurityCondition')
+        if s is not None:
+            status,message=HandleSecurity(s,securityTokens)
+            if not status: return 0,'<p> Access Denied </p><p>%s</p>'%message
     return 1,x
     
@@ -139 +143 @@
         status,xml=ndgRetrieve(uri,self.c)
         if status: s=str(xml)
-        print s
+        
+    
+    def testSecurityCSML(self):
+        ''' Make sure that CSML security is respected '''
+        securityTokens=None
+        self.setup()
+        doc='badc.nerc.ac.uk__NDG-A0__AfEj15o6'
+        uri=ndgObject.ndgObject(doc)
+        status,xml=ndgRetrieve(uri,self.c)
+        self.assertEqual(status,0)
+        
         
         

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/xmlHandler2.py

@@ -41 +41 @@
             self.tree=ET.parse(xmlf).getroot()
         except SyntaxError:
-            self.__fixXML()
+            self.xmls=self.__fixXML(self.xmls)
             xmlf=StringIO.StringIO(self.xmls.encode('utf-8'))
             self.tree=ET.parse(xmlf).getroot()
@@ -53 +53 @@
         # or bettter yet, use iterparse in the first place, but that seemed slow.
         
-        print self.xmls[0:19]
+
         if self.xmls[0:19]=='<?xml version="1.0"':
             self.root=1
@@ -85 +85 @@
         def span(x,c): return '<span class="%s">%s</span>'%(c,x)
         def div(x,c): return '<div class="%s">%s</div>'%(c,x)
+        def fix(x): 
+            if x is None: return ''
+            return x
         def et2html(elem):    
             strAttrib=''
             for att in elem.attrib:
                 strAttrib+=' %s="%s"'%(span(att,'xmlAttrTyp'),span(elem.attrib[att],'xmlAttrVal'))
-            result='%s%s%s%s%s'%(lt,span(elem.tag,"xmlElemTag"),strAttrib,gt,elem.tail)
+            result='%s%s%s%s%s'%(lt,span(elem.tag,"xmlElemTag"),strAttrib,gt,fix(elem.text))
             children=len(elem)
             if children:
                 for item in elem:
                     result+=et2html(item)
-                result+='%s%s/%s%s'%(lt,span(elem.tag,'xmlElemTag'),gt,elem.tail)
+                result+='%s%s/%s%s'%(fix(elem.tail),lt,span(elem.tag,'xmlElemTag'),gt)
             else:
                 result+='%s/%s%s'%(lt,span(elem.tag,'xmlElemTag'),gt)
@@ -103 +106 @@
         if self.root:h='%s%s %s="%s" %s="%s"%s'%(
             lt,'?xml',span('version','xmlAttrTyp'),'1.0',span('encoding','xmlAttrTyp'),'utf-8',gt)
+        ss=self.__fixXML(ss)
         if self.realns=={}: return h+ss
-        return self.__fixns(h,ss)
-          
+        return h+self.__nsfixpretty(ss,span)
+          
+    def __nsfixpretty(self,s,span):
+        ''' Yet another careful fix '''
+        for ns in self.realns:
+            r='{%s}'%ns
+            if self.realns[ns]=='default':
+                s=s.replace(r,'')
+            else:
+                s=s.replace(r,'%s:'%self.realns[ns])
+        if self.realns=={}: return s
+        # at this point we have no namespace list at the top
+        rightArrow=s.find('</span>') # this is just after the tag, where we do want the namespace list
+        nslist={} 
+        for ns in self.realns: nslist[self.realns[ns]]=ns
+        r=' %s="%s"'%(span('xmlns','xmlAttrTyp'),span(nslist['default'],'xmlAttrVal'))
+        for ns in nslist:
+            if ns<>'default': r+=' %s="%s"'%(span('xmlns:%s'%ns,'xmlAttrTyp'),span(nslist[ns],'xmlAttrVal'))
+        return s[:rightArrow]+r+s[rightArrow:]
+        
     def __updatens(self):
         ''' Update the element tree namespace map with our own map '''
-        # *c*ElementTree doesn't have this update method (or at 
-        # least I can't find it), so you have to import ElementTree and call it on 
-        # that, then it all mysteriously works in cElementTree... 
-        
+        # *c*ElementTree doesn't have this update method (or at
+        # least I can't find it), so you have to import ElementTree and call it on
+        # that, then it all mysteriously works in cElementTree...
+
         pET._namespace_map.update(self.realns)
 
@@ -126 +148 @@
         
     def __fixns(self,h,ss):
-        ''' Fix the namespaces '''
+        ''' Fix the namespaces after ET has produced a string '''
         ss=ss.replace('default:','')
         for ns in self.realns:
@@ -137 +159 @@
         nslist={}
         for ns in self.realns: nslist[self.realns[ns]]=ns
-        r='xmlns:"%s"'%nslist['default']
+        r='xmlns="%s"'%nslist['default']
         for ns in nslist:
             if ns<>'default': r+=' xmlns:%s="%s"'%(ns,nslist[ns])
         h+=ss[:rightArrow]+r+ss[rightArrow:]
         return h
-        
      
-    def __fixXML(self):
+    def __fixXML(self,s):
         #first those nasty ampersands
-        self.xmls=re.sub(r'&(?!\w+;)', '&amp;', self.xmls)
+        s=re.sub(r'&(?!\w+;)', '&amp;', s)
         #and now orphan > < signs
         if self.r1 is None:
             self.r1=re.compile('<([^>]*(<|$))')
             self.r2=re.compile('((^|>)[^<]*)>')
-        s=self.xmls
         old=''
         while s != old:
@@ -157 +177 @@
             s=self.r1.sub(r'&lt;\1',s)
             s=self.r2.sub(r'\1&gt;',s)
-        self.xmls=s 
+        return s
       
           
@@ -171 +191 @@
                 <Dataset xmlns:swe="http://www.opengis.net/swe" xmlns:gml="http://www.opengis.net/gml"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:moles="http://ndg.nerc.ac.uk/moles"
-                 xmlns:om="http://www.opengis.net/om" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://ndg.nerc.ac.uk/csml"
+                 xmlns:om="http://www.opengis.net/om" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://ndg.nerc.ac.uk/csml" 
                  id="FGPfF9i0"><CSMLFeatureCollection gml:id="AfEj15o6"/><om:blah>blahvalue</om:blah><foo>foovalue</foo></Dataset>'''
                  
@@ -187 +207 @@
             self.setup()
             x=xmlHandler(self.ss,string=1)
-            self.assertEqual('<?xml version="1.0" encoding="utf-8"><Dataset id="FGPfF9i0" xmlns:"http://ndg.nerc.ac.uk/csml" xmlns:om="http://www.opengis.net/om" xmlns:gml="http://www.opengis.net/gml" xmlns:swe="http://www.opengis.net/swe" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:moles="http://ndg.nerc.ac.uk/moles"><CSMLFeatureCollection gml:id="AfEj15o6"  /><om:blah >blahvalue</om:blah><foo>foovalue</foo></Dataset>',str(x))
+            self.assertEqual('<?xml version="1.0" encoding="utf-8"><Dataset id="FGPfF9i0" xmlns="http://ndg.nerc.ac.uk/csml" xmlns:om="http://www.opengis.net/om" xmlns:gml="http://www.opengis.net/gml" xmlns:swe="http://www.opengis.net/swe" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:moles="http://ndg.nerc.ac.uk/moles"><CSMLFeatureCollection gml:id="AfEj15o6"  /><om:blah >blahvalue</om:blah><foo>foovalue</foo></Dataset>',str(x))
             
         def testorphans(self):
@@ -211 +231 @@
             s='<?xml version="1.0" encoding="utf-8"?><data><element>stuff</element></data>'
             x=xmlHandler(s,string=1)
-            h=x.tohtml()
-            print h
+            h=x.tohtml() # only testing the mechanics, not the result
+            
             
         #turn off the test
@@ -222 +242 @@
             
             
+        def testDIF(self):
+            s='''<DIF xmlns="http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><Entry_ID>badc.nerc.ac.uk__DIF__dataent_11738019833217179</Entry_ID></DIF>'''
+            x=xmlHandler(s,string=1)
+            print x.realns
+            print str(x)
+            h=x.tohtml()
+            print h
+            
     unittest.main()