Changeset 6981 for TI12-security/trunk/MyProxyClient

Timestamp:

11/06/10 11:41:41 (11 years ago)

Author:

pjkersha

Message:

MyProxy? Client 1.1.2 release

• Fix getTrustRoots method - create CA dir path if it doesn't already exist

Location:

TI12-security/trunk/MyProxyClient

Files:

• MyProxyClient.egg-info (deleted)
• build (deleted)
• dist (deleted)
• documentation.zip (deleted)
• myproxy/client.py (modified) (2 diffs)
• myproxy/test/3d41aba9.0 (deleted)
• myproxy/test/localhost.crt (modified) (2 diffs)
• myproxy/test/ndg-test-ca.crt (deleted)
• myproxy/test/proxy.crt (deleted)
• myproxy/test/proxy.key (deleted)
• myproxy/test/test_myproxyclient.py (modified) (4 diffs)
• setup.py (modified) (1 diff)

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

@@ -29 +29 @@
 import re
 import traceback
+import errno
 
 from OpenSSL import crypto, SSL
@@ -1473 +1474 @@
         
         if writeToCACertDir:
+            # Create the CA directory path if doesn't already exist
+            try:
+                os.makedirs(self.caCertDir)
+            except OSError, e:
+                # Ignore if the path already exists
+                if e.errno != errno.EEXIST:
+                    raise
+                
             for fileName, fileContents in filesDict.items():
                 filePath = os.path.join(self.caCertDir, fileName)

TI12-security/trunk/MyProxyClient/myproxy/test/localhost.crt

@@ -2 +2 @@
     Data:
         Version: 3 (0x2)
-        Serial Number: 263 (0x107)
+        Serial Number: 2 (0x2)
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: O=NDG, OU=BADC, CN=Test CA
+        Issuer: O=NDG, OU=Security, CN=Test CA
         Validity
-            Not Before: Jun  9 09:28:37 2009 GMT
-            Not After : Jun  9 09:28:37 2010 GMT
-        Subject: C=UK, ST=Oxfordshire, O=BADC, OU=Security, CN=localhost
+            Not Before: Jun 11 09:04:56 2010 GMT
+            Not After : Jun 11 09:04:56 2011 GMT
+        Subject: O=NDG, OU=Security, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -36 +36 @@
                 SSL Client, SSL Server, S/MIME, Object Signing
     Signature Algorithm: md5WithRSAEncryption
-        8b:8c:45:03:bb:90:4a:70:54:28:69:b7:02:3e:50:95:12:10:
-        ef:c7:d4:48:c2:56:be:7a:4d:0a:6e:28:9f:07:4d:71:8c:01:
-        fc:e0:e0:dd:6e:ef:5a:d7:b0:0c:df:14:be:af:e4:20:11:4c:
-        ca:9b:4b:ae:ce:4b:0f:1f:46:b0:57:74:e0:86:ff:94:b2:27:
-        0b:2a:7b:e9:09:d5:2b:72:14:fe:99:5c:66:12:87:31:2f:e0:
-        7b:5c:47:b5:52:09:bb:18:09:d8:0a:c2:95:8e:bf:23:e6:ac:
-        0d:ea:48:19:c8:11:e6:8f:da:10:d2:cd:a2:de:72:e7:b1:75:
-        c0:d8
+        70:9e:28:be:0e:7e:b2:af:0b:95:e9:60:ea:1b:51:bc:02:76:
+        f3:67:69:47:ba:99:a1:4e:0f:2f:cb:2c:e8:ac:0e:20:b8:dd:
+        e0:70:9f:d0:5b:a6:5f:cd:42:3f:a6:aa:98:ef:f8:39:4a:ac:
+        79:8d:71:79:a4:98:19:00:e4:87:34:e6:c4:f6:8d:b5:d2:c3:
+        cf:45:77:e7:54:c9:3a:81:b6:47:da:ce:71:ba:79:4c:e2:d5:
+        40:44:b1:55:b6:a7:7b:57:31:43:fb:8c:58:f3:83:d3:68:e2:
+        5c:a4:30:2c:cc:c2:b0:e5:3f:84:18:2b:34:f6:39:50:a0:61:
+        13:28
 -----BEGIN CERTIFICATE-----
-MIICmDCCAgGgAwIBAgICAQcwDQYJKoZIhvcNAQEEBQAwLzEMMAoGA1UEChMDTkRH
-MQ0wCwYDVQQLEwRCQURDMRAwDgYDVQQDEwdUZXN0IENBMB4XDTA5MDYwOTA5Mjgz
-N1oXDTEwMDYwOTA5MjgzN1owWTELMAkGA1UEBhMCVUsxFDASBgNVBAgTC094Zm9y
-ZHNoaXJlMQ0wCwYDVQQKEwRCQURDMREwDwYDVQQLEwhTZWN1cml0eTESMBAGA1UE
-AxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwOCU
-wunA35Y2uk0OP7xBUXtP/tiCR1L4Nlc1FTuDd7qEqqNI8AMLWrcxQI0/hwWeBsZy
-H8p97XM80HZNOzKJ5x9bhCe/i3IJKtRAjSzEwyNobPRiVajgLorItF+/4RjXaqYa
-kG3mgxcQOpW12g1EP9/7bMWevx0EXxwWzp73nYH4/spDgl9ryHAX+OjzdNn7rBSv
-mY/9863ifo3zvYkV8DnqUXwpgYy8umNraeDBRi8nk4OFvou7qrh2w+yK9lDhw5Ce
-Rx0ZaEBiWROL6+iJZCDso7fnso+Y8mS0qm7Q8XP86u0ZGWeYEfWVynYLx0M1PFMj
-tWewtSZZ0cU+StFw3QIDAQABoxUwEzARBglghkgBhvhCAQEEBAMCBPAwDQYJKoZI
-hvcNAQEEBQADgYEAi4xFA7uQSnBUKGm3Aj5QlRIQ78fUSMJWvnpNCm4onwdNcYwB
-/ODg3W7vWtewDN8Uvq/kIBFMyptLrs5LDx9GsFd04Ib/lLInCyp76QnVK3IU/plc
-ZhKHMS/ge1xHtVIJuxgJ2ArClY6/I+asDepIGcgR5o/aENLNot5y57F1wNg=
+MIICdzCCAeCgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAzMQwwCgYDVQQKEwNOREcx
+ETAPBgNVBAsTCFNlY3VyaXR5MRAwDgYDVQQDEwdUZXN0IENBMB4XDTEwMDYxMTA5
+MDQ1NloXDTExMDYxMTA5MDQ1NlowNTEMMAoGA1UEChMDTkRHMREwDwYDVQQLEwhT
+ZWN1cml0eTESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAwOCUwunA35Y2uk0OP7xBUXtP/tiCR1L4Nlc1FTuDd7qEqqNI
+8AMLWrcxQI0/hwWeBsZyH8p97XM80HZNOzKJ5x9bhCe/i3IJKtRAjSzEwyNobPRi
+VajgLorItF+/4RjXaqYakG3mgxcQOpW12g1EP9/7bMWevx0EXxwWzp73nYH4/spD
+gl9ryHAX+OjzdNn7rBSvmY/9863ifo3zvYkV8DnqUXwpgYy8umNraeDBRi8nk4OF
+vou7qrh2w+yK9lDhw5CeRx0ZaEBiWROL6+iJZCDso7fnso+Y8mS0qm7Q8XP86u0Z
+GWeYEfWVynYLx0M1PFMjtWewtSZZ0cU+StFw3QIDAQABoxUwEzARBglghkgBhvhC
+AQEEBAMCBPAwDQYJKoZIhvcNAQEEBQADgYEAcJ4ovg5+sq8Llelg6htRvAJ282dp
+R7qZoU4PL8ss6KwOILjd4HCf0FumX81CP6aqmO/4OUqseY1xeaSYGQDkhzTmxPaN
+tdLDz0V351TJOoG2R9rOcbp5TOLVQESxVbane1cxQ/uMWPOD02jiXKQwLMzCsOU/
+hBgrNPY5UKBhEyg=
 -----END CERTIFICATE-----

TI12-security/trunk/MyProxyClient/myproxy/test/test_myproxyclient.py

@@ -15 +15 @@
 import unittest
 import os
-import sys
 from getpass import getpass
-import traceback
 from os import path
 
@@ -237 +235 @@
     HOSTCERT_FILENAME = 'localhost.crt'
     HOSTCERT_FILEPATH = mkPath(HOSTCERT_FILENAME)
-    HOSTCERT_DN = '/C=UK/ST=Oxfordshire/O=BADC/OU=Security/CN=localhost'
+    HOSTCERT_DN = '/O=NDG/OU=Security/CN=localhost'
     
     def test01EnvironmentVarsSet(self):
@@ -307 +305 @@
                 del os.environ[MyProxyClient.MYPROXY_SERVER_DN_ENVVARNAME]
         
+            serverName = os.environ.get(MyProxyClient.MYPROXY_SERVER_ENVVARNAME)
+            if serverName is not None:
+                del os.environ[MyProxyClient.MYPROXY_SERVER_ENVVARNAME]
+                
             client = MyProxyClient()
              
@@ -340 +342 @@
             
         finally:
-            if serverDN:
+            if serverDN is not None:
                 os.environ[MyProxyClient.MYPROXY_SERVER_DN_ENVVARNAME
                            ] = serverDN
+            
+            if serverName is not None:
+                os.environ[MyProxyClient.MYPROXY_SERVER_ENVVARNAME
+                           ] = serverName
+                
                                         
 if __name__ == "__main__":

TI12-security/trunk/MyProxyClient/setup.py

@@ -28 +28 @@
 setup(
     name =              'MyProxyClient',
-    version =           '1.1.1',
+    version =           '1.1.2',
     description =       'MyProxy Client',
     long_description =  '''