Changeset 740

Timestamp:

31/03/06 14:58:55 (15 years ago)

Author:

pjkersha

Message:

Session.py:

• SessionMgr?.reqAuthorisation() - if aaPubKey keyword is not set, call the Attribute Authority

WS to retrieve the public key.

CredWallet?.py: corrected refs to SessionMgrError? -> CredWalletError?.

Location:

TI12-security/trunk/python/NDG

Files:

• CredWallet.py (modified) (4 diffs)
• Session.py (modified) (3 diffs)

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

@@ -548 +548 @@
                     
                 except IOError, (errNo, errMsg):
-                    raise SessionMgrError(\
+                    raise CredWalletError(\
                         "Writing public key to temporary file: %s" % errMsg)
                                                           
                 except Exception, e:
-                    raise SessionMgrError(\
+                    raise CredWalletError(\
                         "Retrieving Attribute Authority public key: "+ str(e))
 
@@ -722 +722 @@
                     
                 except IOError, (errNo, errMsg):
-                    raise SessionMgrError(\
+                    raise CredWalletError(\
                         "Writing public key to temporary file: %s" % errMsg)
                                                           
                 except Exception, e:
-                    raise SessionMgrError(\
+                    raise CredWalletError(\
                         "Retrieving Attribute Authority public key: "+ str(e))
 
@@ -1076 +1076 @@
                                                       tempFile.name)
         except Exception, e:
-            raise SessionMgrError("Error retrieving from URI " + \
+            raise CredWalletError("Error retrieving from URI " + \
                                   "\"%s\": %s" % (uri, str(e)))
     
@@ -1082 +1082 @@
         # 404 error would come back as 'text/html'
         if 'text/plain' not in httpResp['Content-type']:
-            raise SessionMgrError("Error retrieving from URI " + \
+            raise CredWalletError("Error retrieving from URI " + \
                                   "\"%s\": expecting \"plain/text\"" % uri)
             

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

@@ -49 +49 @@
 # Tools for interfacing with SessionMgr WS
 from NDG.SessionMgrIO import *
+
+# SessionMgr.reqAuthorisation - getPubKey WS call.  Don't import 
+# AttAuthorityIO's namespace as it would conflict with SessionMgrIO's
+from NDG import AttAuthorityIO
 
 # Use client package to allow reidrection of authorisation requests
@@ -839 +843 @@
 
 
-        # Make a temporary file to hold Attribute Authority Public Key.  The
-        # Credential Wallet needs this to encrypt requests to the Attribute
-        # Authority
+        if 'aaPubKey' not in reqKeys:
+            # Get public key using WS
+            try:
+                aaSrv = ServiceProxy(reqKeys['aaWSDL'], use_wsdl=True)
+                
+                pubKeyReq = AttAuthorityIO.PubKeyReq()
+                resp = aaSrv.getPubKey(pubKeyReq=pubKeyReq())
+                
+                pubKeyResp = AttAuthorityIO.PubKeyResp(\
+                                                   xmlTxt=resp['pubKeyResp'])
+        
+                if 'errMsg' in pubKeyResp and pubKeyResp['errMsg']:
+                    raise Exception(pubKeyResp['errMsg'])
+                
+                reqKeys['aaPubKey'] = pubKeyResp['pubKey']
+                
+            except Exception, e:
+                raise SessionMgrError(\
+                    "Retrieving Attribute Authority public key: "+ str(e))
+                                
+                                                        
+        # Make a temporary file to hold Attribute Authority Public Key.  
+        # The Credential Wallet needs this to encrypt requests to the 
+        # Attribute Authority
         try:
             aaPubKeyTmpFile = tempfile.NamedTemporaryFile()
@@ -847 +872 @@
             aaKeys['aaPubKeyFilePath'] = aaPubKeyTmpFile.name
             
+        except IOError, (errNo, errMsg):
+            raise SessionMgrError("Making temporary file for Attribute " + \
+                                  "Authority public key: %s" % errMsg)
+                
         except Exception, e:
             raise SessionMgrError("Making temporary file for Attribute " + \
                                   "Authority public key: %s" % str(e))
-                                  
+
                                               
         # User's Credential Wallet carries out authorisation request to the