Ignore:
Timestamp:
07/06/06 15:10:33 (14 years ago)
Author:
pjkersha
Message:

setup.py: new version for testing with MOLES browse

NDG/SecurityCGI.py: fixes for use with MOLES Browse.

NDG/CredWallet.py: prevent infinite loop in reqAuthorisation - if an extAttCertList has been created and
access is denied for any of the ACs in the list DON'T recreate the list, instead increment to the next element
until the list is exhausted. Then if, none of the ACs are accepted return access denied exception.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/NDG/CredWallet.py

    r930 r1129  
    923923 
    924924 
    925         # Repeat authorisation attempts until succeed or means are exhausted         
     925        # Repeat authorisation attempts until succeed or means are exhausted 
    926926        while True: 
    927927             
     
    941941                # List has been emptied without authorisation succeeding - 
    942942                # give up 
    943                 raise CredWalletAuthorisationDenied(\ 
    944                     "Attempting to obtained a mapped certificate: " + \ 
    945                     "no external attribute certificates are available") 
    946  
    947  
     943                errMsg = "Attempting to obtained a mapped certificate: " + \ 
     944                    "no external attribute certificates are available" 
     945                     
     946                # Add the exception form the last call to the Attribute 
     947                # Authority if an error exists 
     948                try: 
     949                    errMsg += ": %s" % authorisationDenied 
     950                except NameError: 
     951                    pass 
     952 
     953                raise CredWalletAuthorisationDenied, errMsg 
     954                                                     
     955                 
    948956            # Request Authorisation from Attribute Authority 
    949957            try: 
     
    975983 
    976984 
     985                if isinstance(extAttCertList, list): 
     986                    # An list of attribute certificates from trusted hosts 
     987                    # is present continue cycling through this until one of 
     988                    # them is accepted and a mapped certificate can be derived 
     989                    continue 
     990                 
     991                 
    977992                #  Use the input required role and the AA's trusted host list 
    978993                # to identify attribute certificates from other hosts which 
Note: See TracChangeset for help on using the changeset viewer.