Ignore:
Timestamp:
30/01/07 17:40:54 (14 years ago)
Author:
pjkersha
Message:

python/www/html/attAuthority.wsdl,
python/ndg.security.server/ndg/security/server/AttAuthority/AttAuthority_services_server.py,
python/ndg.security.common/ndg/security/common/AttAuthority/AttAuthority_services_types.py,
python/ndg.security.common/ndg/security/common/AttAuthority/AttAuthority_services.py,
python/www/html/sessionMgr.wsdl,
python/ndg.security.server/ndg/security/server/SessionMgr/SessionMgr_services_server.p
y,
python/ndg.security.common/ndg/security/common/SessionMgr/SessionMgr_services.py,
python/ndg.security.common/ndg/security/common/SessionMgr/SessionMgr_services_types.py:
Make separate schema for the two services - urn:ndg:security:attAuthority and
urn:ndg:security:sessionMgr otherwise getAttCert and getAttCertResponse declarations
get mixed up between the two in the ZSI code.

python/ndg.security.server/ndg/security/server/SessionMgr/server-config.tac:
replace get_element_* and set_element_* with attributes references instead e.g.
request.get_element_username() -> request.Username

python/ndg.security.server/ndg/security/server/SessionMgr/init.py:

  • rename encrypt and decrypt static UserSession? methods encodeSessionMgrURI and

decodeSessionMgrURI respectively. The encryption key is now optional and isn't applied
if omitted. This means that Session Manager URI in the cookie can be base 64 encoded only
and not encrypted.

  • getAttCert - simplified use of keywords in input and call to CredWallet?.getAttCert
  • fixes to redirectAttCertReq for correct SessionMgrClient? call - needs test

python/ndg.security.common/ndg/security/common/CredWallet.py:

  • fix AttAuthorityClient? import
  • remove clnt* properties - use proxy settings instead for signing requests to AA
  • fixes to getAttCert and getAttCert calls
File:
1 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/SessionMgr/SessionMgrClientTest.py

    r2076 r2079  
    153153        print "\n\t" + self.test6CookieGetAttCert.__doc__         
    154154        self.test2CookieConnect() 
    155         attCert, statusCode, extAttCertList = self.clnt.getAttCert(\ 
     155         
     156        attCert, statusCode, msg, extAttCertList = self.clnt.getAttCert(\ 
    156157            sessID=self.sessCookie.sessionID,  
    157             attAuthorityURI=self.cfg['test6CookieGetAttCert']['aauri'], 
    158             encrSessionMgrURI=self.sessCookie.encrSessionMgrURI) 
     158            encrSessionMgrURI=self.sessCookie.encrSessionMgrURI, 
     159            attAuthorityURI=self.cfg['test6CookieGetAttCert']['aauri']) 
    159160         
    160161        print "Attribute Certificate:\n%s" % attCert   
    161         print "User access: %s" % statusCode 
     162        print "Status: %s" % statusCode 
     163        print "Message: %s" % msg 
    162164        print "External Attribute Certificate List:\n%s" % extAttCertList 
    163165 
     
    173175            self.cfg['test6aCookieGetAttCertWithExtAttCertList']['aauri'] 
    174176             
    175         attCert, statusCode, extAttCertList = self.clnt.reqAuthorisation(\ 
     177        attCert, statusCode, msg, extAttCertList = self.clnt.getAttCert(\ 
    176178                        sessID=self.sessCookie.sessionID,  
     179                        encrSessionMgrURI=self.sessCookie.encrSessionMgrURI, 
    177180                        attAuthorityURI=aaURI, 
    178                         encrSessionMgrURI=self.sessCookie.encrSessionMgrURI, 
    179181                        extAttCertList=['AC1', 'AC2', 'AC3']) 
    180182           
    181183        print "Attribute Certificate:\n%s" % attCert   
    182         print "User authorisation: %s" % statusCode 
     184        print "Status: %s" % statusCode 
     185        print "Message: %s" % msg 
    183186        print "External Attribute Certificate List:\n%s" % extAttCertList 
    184187 
     
    194197         
    195198        aaURI = self.cfg['test7ProxyCertGetAttCert']['aauri'] 
    196         attCert, statusCode, extAttCertList = self.clnt.reqAuthorisation(\ 
     199        attCert, statusCode, msg, extAttCertList = self.clnt.getAttCert(\ 
    197200                                                 proxyCert=self.proxyCert, 
    198201                                                 attAuthorityURI=aaURI) 
    199202           
    200203        print "Attribute Certificate:\n%s" % attCert   
    201         print "User authorisation: %s" % statusCode 
     204        print "Status: %s" % statusCode 
     205        print "Message: %s" % msg 
    202206        print "External Attribute Certificate List:\n%s" % extAttCertList 
    203207 
Note: See TracChangeset for help on using the changeset viewer.