Changeset 783

Timestamp:

13/04/06 17:19:14 (14 years ago)

Author:

lawrence

Message:

Scaffolding for connecting the browse portal to NDG security.

(Also includes a placeholder for putting the browse history by
using an xpath expression inside an elementtree of the output
from the xslt).

Location:

TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi

Files:

• browseCGI.py (modified) (3 diffs)
• secure.py (added)

TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi/browseCGI.py

@@ -8 +8 @@
 import ElementTree
 from insecure import *
+from collections import deque # python 2.4
+from secure import *
 
 def EvaluateCredentials(ac,securityMetadata):
@@ -13 +15 @@
         return 1
 
+class RingBuffer(deque):
+    #deque is a python 2.4 class!
+    #credit http://www.onlamp.com/pub/a/python/excerpt/pythonckbk_chap1/index1.html
+    def __init__(self, size_max):
+        deque.__init__(self)
+        self.size_max = size_max
+    def append(self, datum):
+        deque.append(self, datum)
+        if len(self) > self.size_max:
+            self.popleft( )
+    def tolist(self):
+        return list(self)
+
 class BrowseSession:
         ''' Holds the browse history and contact details for the NDG session manager '''
-        def __init__(self,cookie):
+        def __init__(self,cookie,url):
                 '''Instantiate and get security environment'''
+                # we should have two cookies, the NDG security cookie, and our browse history cookie!
                 self.cookie=cookie
-                self.history=[]
+                self.history=RingBuffer(10)
+                self.ndgGate=gateway2NDGsession(cookie,url)
+                self.__loadBrowseHistory()
+        def __loadBrowseHistory(self):
+                ''' get the string of URI values out of the cookie (if it's there)'''
+                try:
+                        strHistory=self.cookie['BrowseHistory'].value
+                except:
+                        strHistory='[]'
+                for uri in strHistory[1:-1].split(','): self.addToHistory(uri)
         def addToHistory(self,uri):
                 ''' Add a URI to the session history'''
                 self.history.append(uri)
+        def getHistory(self):
+                ''' Return a list of the items in the history '''
+                return self.history.tolist()
         def getCredentials(self):
                 '''Obtain the attribute certificate from the wallet '''
@@ -69 +97 @@
                 self.cookie=self.env.get('HTTP_COOKIE',None)
 
-                self.session=BrowseSession(self.cookie)
+                self.session=BrowseSession(self.cookie,self.path)
                 
                 #Handle authorisation