Changeset 1940


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/MyProxy.py

    r1881 r1940  
    707707                ownerKeyFile = keyFile 
    708708         
    709          
    710709        if not force: 
    711710            # Check credentials don't already exist 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/SessionMgr/__init__.py

    r1773 r1940  
    602602                                to choose to have a client or server side 
    603603                                session using this keyword. 
    604         reqXMLtxt:              encrypted XML containing user credentials - 
    605                                 user name, pass-phrase or proxy cert etc 
    606         reqKeys:                username and pass-phrase or the proxy""" 
     604        reqKeys:                username and pass-phrase OR proxy certificate 
     605                                OR session ID""" 
    607606         
    608607 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/MyProxy/MyProxyClientTest.py

    r1881 r1940  
    9595        """test4ChangePassphrase: change pass-phrase protecting a given 
    9696        credential""" 
    97         passphrase = \ 
    98             self.cfg['test4ChangePassphrase']['ownerpassphrase'] or \ 
    99             getpass.getpass(prompt="\test4ChangePassphrase - pass-phrase: ") 
     97        try: 
     98            passphrase = self.cfg['test4ChangePassphrase']['passphrase'] or \ 
     99            getpass.getpass(prompt="test4ChangePassphrase - pass-phrase: ") 
    100100             
    101         newPassphrase = \ 
    102         self.cfg['test4ChangePassphrase']['ownerpassphrase'] or \ 
    103         getpass.getpass(prompt="\test4ChangePassphrase - new pass-phrase: ") 
    104  
    105         confirmNewPassphrase = \ 
    106         self.cfg['test4ChangePassphrase']['ownerpassphrase'] or \ 
    107             getpass.getpass(\ 
    108                 prompt="\test4ChangePassphrase - confirm new pass-phrase: ") 
    109  
    110         ownerPassphrase = (ownerPassphrase == 'None') and passphrase 
     101            if not self.cfg['test4ChangePassphrase']['newpassphrase']: 
     102                newPassphrase = getpass.getpass(\ 
     103                        prompt="test4ChangePassphrase - new pass-phrase: ") 
    111104     
    112         try: 
     105                confirmNewPassphrase = getpass.getpass(\ 
     106                prompt="test4ChangePassphrase - confirm new pass-phrase: ") 
     107     
     108                if newPassphrase != confirmNewPassphrase: 
     109                    self.fail("New and confirmed new password don't match") 
     110                     
     111            ownerPassphrase = \ 
     112                self.cfg['test4ChangePassphrase'].get('ownerpassphrase') or \ 
     113                passphrase 
     114     
    113115            self.clnt.changePassphrase( 
    114116                         self.cfg['test4ChangePassphrase']['username'], 
     
    128130        ownerPassphrase = self.cfg['test5Destroy']['ownerpassphrase'] or \ 
    129131            getpass.getpass(prompt="\ntest5Destroy cred. owner pass-phrase: ") 
    130  
    131         ownerPassphrase = (ownerPassphrase == 'None') and None 
    132132 
    133133        try: 
Note: See TracChangeset for help on using the changeset viewer.