Changeset 6107 for TI12-security/trunk/python/MyProxyClient

Timestamp:

11/12/09 15:23:40 (11 years ago)

Author:

pjkersha

Message:

• Updated OpenID RP sign-in template for CEDA look and feel.
• Changes to MyProxyClient.logon to enable externally input certificate request and key pair. This will enable the proposed  HTTP based proxy interface to MyProxy?.

Location:

TI12-security/trunk/python/MyProxyClient

Files:

• myproxy/client.py (modified) (1 diff)
• test/myProxyClient.cfg (modified) (2 diffs)
• test/ndg-glue-ca.crt (added)

TI12-security/trunk/python/MyProxyClient/myproxy/client.py

@@ -1069 +1069 @@
         # - private key
         # - rest of cert chain
-        pemKey = key.as_pem(cipher=None)
-        creds = [pemCerts[0], pemKey]
-        creds.extend(pemCerts[1:])
+        if keys is not None:
+            pemKey = keys.as_pem(cipher=None)
+            creds = [pemCerts[0], pemKey]
+            creds.extend(pemCerts[1:])
+        else:
+            creds = pemCerts
         
         return tuple(creds)
-        
 
     def getDelegation(self, *arg, **kw):

TI12-security/trunk/python/MyProxyClient/test/myProxyClient.cfg

@@ -12 +12 @@
 # Delete this element and take setting from MYPROXY_SERVER environment 
 # variable if required
-#hostname=localhost
+hostname=localhost
 
 # Delete this element to take default setting 7512 or read 
@@ -43 +43 @@
 proxyCertLifetime=64800
 
-caCertFilePath=$MYPROXYCLIENT_UNITTEST_DIR/ndg-test-ca.crt
+#caCertFilePath=$MYPROXYCLIENT_UNITTEST_DIR/ndg-test-ca.crt
+caCertFilePath=$MYPROXYCLIENT_UNITTEST_DIR/ndg-glue-ca.crt