Changeset 1940 for TI12-security

Timestamp:

03/01/07 10:27:11 (13 years ago)

Author:

pjkersha

Message:

python/ndg.security.server/ndg/security/server/SessionMgr/init.py:
started integration of new MyProxyClient? class.

python/ndg.security.server/ndg/security/server/MyProxy.py:
Added new MyProxyClient? class and removed old code that mdae system calls
to MyProxy? executables.

python/ndg.security.test/ndg/security/test/MyProxy/myProxyProperties.xml and
python/conf/myProxyProperties.xml: added comments to the effect that elements
corresponding to environment variables must be removed in order for the
environment variable setting to take effect and not be overridden.

python/ndg.security.test/ndg/security/test/MyProxy/myProxyClientTest.cfg:
ownerCertFile and ownerKeyFile pick up a proxy cert / key stored from get
delegation test.

python/ndg.security.test/ndg/security/test/MyProxy/MyProxyClientTest.py:
fixes to test4ChangePassphrase and test3Info tests.
architecture/uml/ndg2-dews-security-beta.eap

Location:

TI12-security/trunk

Files:

• architecture/uml/ndg2-dews-security-beta.eap (modified) (previous)
• python/ndg.security.server/ndg/security/server/MyProxy.py (modified) (1 diff)
• python/ndg.security.server/ndg/security/server/SessionMgr/__init__.py (modified) (1 diff)
• python/ndg.security.test/ndg/security/test/MyProxy/MyProxyClientTest.py (modified) (2 diffs)

TI12-security/trunk/python/ndg.security.server/ndg/security/server/MyProxy.py

@@ -707 +707 @@
                 ownerKeyFile = keyFile
         
-        
         if not force:
             # Check credentials don't already exist

TI12-security/trunk/python/ndg.security.server/ndg/security/server/SessionMgr/__init__.py

@@ -602 +602 @@
                                 to choose to have a client or server side
                                 session using this keyword.
-        reqXMLtxt:              encrypted XML containing user credentials -
-                                user name, pass-phrase or proxy cert etc
-        reqKeys:                username and pass-phrase or the proxy"""
+        reqKeys:                username and pass-phrase OR proxy certificate
+                                OR session ID"""
         
 

TI12-security/trunk/python/ndg.security.test/ndg/security/test/MyProxy/MyProxyClientTest.py

@@ -95 +95 @@
         """test4ChangePassphrase: change pass-phrase protecting a given
         credential"""
-        passphrase = \
-            self.cfg['test4ChangePassphrase']['ownerpassphrase'] or \
-            getpass.getpass(prompt="\test4ChangePassphrase - pass-phrase: ")
+        try:
+            passphrase = self.cfg['test4ChangePassphrase']['passphrase'] or \
+            getpass.getpass(prompt="test4ChangePassphrase - pass-phrase: ")
             
-        newPassphrase = \
-        self.cfg['test4ChangePassphrase']['ownerpassphrase'] or \
-        getpass.getpass(prompt="\test4ChangePassphrase - new pass-phrase: ")
-
-        confirmNewPassphrase = \
-        self.cfg['test4ChangePassphrase']['ownerpassphrase'] or \
-            getpass.getpass(\
-                prompt="\test4ChangePassphrase - confirm new pass-phrase: ")
-
-        ownerPassphrase = (ownerPassphrase == 'None') and passphrase
+            if not self.cfg['test4ChangePassphrase']['newpassphrase']:
+                newPassphrase = getpass.getpass(\
+                        prompt="test4ChangePassphrase - new pass-phrase: ")
     
-        try:
+                confirmNewPassphrase = getpass.getpass(\
+                prompt="test4ChangePassphrase - confirm new pass-phrase: ")
+    
+                if newPassphrase != confirmNewPassphrase:
+                    self.fail("New and confirmed new password don't match")
+                    
+            ownerPassphrase = \
+                self.cfg['test4ChangePassphrase'].get('ownerpassphrase') or \
+                passphrase
+    
             self.clnt.changePassphrase(
                          self.cfg['test4ChangePassphrase']['username'],
@@ -128 +130 @@
         ownerPassphrase = self.cfg['test5Destroy']['ownerpassphrase'] or \
             getpass.getpass(prompt="\ntest5Destroy cred. owner pass-phrase: ")
-
-        ownerPassphrase = (ownerPassphrase == 'None') and None
 
         try: