Changeset 968

Timestamp:

19/05/06 18:40:30 (15 years ago)

Author:

pjkersha

Message:

Tests/GatekeeperClientTest?.py: test Gatekeeper WS client.

Tests/AttAuthorityClientTest?.py: renamed methods so that called automatically when script is
invoked with no args.

Tests/SecurityClientTest?.py: set user to 'laurence' in order to get ACs with more roles set.

bin/LogServer.py: typo fix logs -> log

bin/GatekeeperServer.py: working version

NDG/TestGatekeeperResrc.py: test harness for Gatekeeper resource interface

NDG/gatekeeper_services_server.py: working but logic for returning matching roles needs fixing.

NDG/GatekeeperClient.py: client interface class to Gatekeeper WS.

NDG/Gatekeeper.py: working version

NDG/gatekeeper_services.py: regenerated following changes to WSDL.

Location:

TI12-security/trunk/python

Files:

• NDG/Gatekeeper.py (modified) (6 diffs)
• NDG/GatekeeperClient.py (added)
• NDG/TestGatekeeperResrc.py (added)
• NDG/gatekeeper_services.py (added)
• NDG/gatekeeper_services_server.py (added)
• Tests/AttAuthorityClientTest.py (modified) (5 diffs)
• Tests/GatekeeperClientTest.py (added)
• Tests/SecurityClientTest.py (modified) (2 diffs)
• bin/GatekeeperServer.py (added)
• bin/LogServer.py (modified) (1 diff)

TI12-security/trunk/python/NDG/Gatekeeper.py

@@ -18 +18 @@
 # Alter system path for dynamic import of resource interface class
 import sys
+
+# Expand environment vars in paths
+import os
 
 from AttCert import *
@@ -38 +41 @@
     Certificate can access a given resource."""
     
-    __validKeys = ( 'resrcURI',
+    __validKeys = ( 'resrcID',
                     'resrcModFilePath',
                     'resrcModName',
@@ -100 +103 @@
         # Check class inherits from GatekeeperResrc abstract base class
         if not issubclass(resrcClass, GatekeeperResrc):
-            raise GatekeeperError(\
-                "Resource URI interface class %s must be derived from " + \
-                "GatekeeperResrc" % self.__prop['resrcClassName'])
+            raise GatekeeperError, \
+                "Resource interface class %s must be derived from " % \
+                self.__prop['resrcClassName'] + "GatekeeperResrc"
 
 
@@ -140 +143 @@
                                 
         # Copy properties from file as dictionary
-        self.__prop = dict([(elem.tag, elem.text) for elem in elems])
+        #
+        # Nb. # Allow for environment variables in paths
+        self.__prop.update(dict([(elem.tag, 
+                                  os.path.expandvars(elem.text.strip())) \
+                                 for elem in elems if elem.text is not None]))
 
 
@@ -169 +176 @@
             # Check signature of AttCert
             try:
-                attCert.isValid(raiseExcep=True, 
+                input.isValid(raiseExcep=True, 
                             certFilePathList=self.__prop['caCertFilePath'])                            
             except Exception, e:
-                raise GateKeeperError, "Access denied for input: %s" % str(e)
+                raise GatekeeperError, "Access denied for input: %s" % str(e)
             
             return input.getRoles()
@@ -241 +248 @@
 
 #_____________________________________________________________________________
-class GatekeeperResrcError(GateKeeperError):
+class GatekeeperResrcError(GatekeeperError):
     """Exception handling for NDG Gatekeeper Resource interface class
     class."""

TI12-security/trunk/python/Tests/AttAuthorityClientTest.py

@@ -40 +40 @@
     
     
-    def getPubKeyTest(self):
+    def testGetPubKey(self):
         try:
             # Request an attribute certificate from an Attribute Authority 
@@ -59 +59 @@
 
 
-    def getTrustedHostInfoTest(self):
+    def testGetTrustedHostInfo(self):
         
         try:
@@ -67 +67 @@
 
 
-    def reqAuthorisationTest(self):        
+    def testReqAuthorisation(self):        
         """Request authorisation from NDG Attribute Authority Web Service."""
     
@@ -105 +105 @@
                 
             except IOError, ioErr:
-                raise "Error reading attribute certificate file \"%s\": %s" % \
+                raise "Error reading attribute certificate file \"%s\": %s" %\
                                         (ioErr.filename, ioErr.strerror)
         else:
@@ -130 +130 @@
         map = map(attAuthorityClientTestCase,
                   (
-                    "getTrustedHostInfoTest",
-                    "reqAuthorisationTest",
-                    "getPubKeyTest",
+                    "testGetTrustedHostInfo",
+                    "testReqAuthorisation",
+                    "testGetPubKey",
                   ))
         unittest.TestSuite.__init__(self, map)

TI12-security/trunk/python/Tests/SecurityClientTest.py

@@ -85 +85 @@
     def cookieConnectTest(self):
         
-        userName = 'pjkersha'
+        userName = 'lawrence'
         try:
             # Connect as if acting as a browser client - a cookie is returned
@@ -101 +101 @@
     def proxyCertConnectTest(self):
         
-        userName = 'pjkersha'
+        userName = 'lawrence'
         
         try:

TI12-security/trunk/python/bin/LogServer.py

@@ -89 +89 @@
                       dest="logFilePath",
                       help=\
-                "file path for log file to log to - default is $NDG_DIR/logs")
+                "file path for log file to log to - default is $NDG_DIR/log")
 
     parser.add_option("-d",