Ignore:
Timestamp:
16/03/10 08:37:55 (11 years ago)
Author:
pjkersha
Message:
  • Working Credential Wallet refactored for Python 2.6
  • Pruned out more old code: ZSI and Twisted SAOP/WSDL wrappers, Session Manager and WS-Security, Test 'Site B' Attribute Authority - for testing role mapping.
  • Started XACML package ElementTree based parser.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/attributeauthority.py

    r6721 r6730  
    3838from ndg.security.common.saml_utils.esg import EsgSamlNamespaces 
    3939from ndg.security.common.X509 import X500DN 
    40 from ndg.security.common.utils import TypedList 
     40from ndg.security.common.utils import TypedList, RestrictedKeyNamesDict 
    4141from ndg.security.common.utils.classfactory import instantiateClass 
    4242from ndg.security.common.utils.configfileparsers import ( 
     
    9393    ISSUER_NAME_OPTNAME = 'issuerName' 
    9494    ASSERTION_LIFETIME_OPTNAME = 'assertionLifetime' 
    95     DN_SEPARATOR_OPTNAME = 'dnSeparator' 
    9695     
    9796    ATTRIBUTE_INTERFACE_OPTPREFIX = 'attributeInterface' 
     
    113112        ISSUER_NAME_OPTNAME:            '', 
    114113        ASSERTION_LIFETIME_OPTNAME:     -1, 
    115         DN_SEPARATOR_OPTNAME:           '/', 
    116114        ATTRIBUTE_INTERFACE_OPTPREFIX:  ATTRIBUTE_INTERFACE_PROPERTY_DEFAULTS 
    117115    } 
     
    119117    __slots__ = ( 
    120118        '__assertionLifetime',  
    121         '__dnSeparator', 
    122119        '__propFilePath', 
    123120        '__propFileSection', 
     
    133130        # Initial config file property based attributes 
    134131        self.__assertionLifetime = None 
    135         self.__dnSeparator = None 
    136132         
    137133        self.__propFilePath = None         
     
    139135        self.__propPrefix = '' 
    140136         
    141         self.__attributeInterfaceCfg = {} 
     137        self.__attributeInterfaceCfg = RestrictedKeyNamesDict( 
     138                    AttributeAuthority.ATTRIBUTE_INTERFACE_PROPERTY_DEFAULTS) 
    142139         
    143140    def __getstate__(self): 
     
    189186                                     doc="Settings for Attribute Interface " 
    190187                                         "initialisation") 
    191      
    192     def _get_dnSeparator(self): 
    193         return self.__dnSeparator 
    194      
    195     def _set_dnSeparator(self, value): 
    196         if not isinstance(value, basestring): 
    197             raise TypeError('Expecting string type for "dnSeparator"; got ' 
    198                             '%r' % type(value)) 
    199         self.__dnSeparator = value 
    200           
    201     dnSeparator = property(fget=_get_dnSeparator,  
    202                            fset=_set_dnSeparator, 
    203                            doc="Distinguished Name separator character used " 
    204                                "with X.509 Certificate issuer certificate") 
    205188 
    206189    def setPropFilePath(self, val=None): 
Note: See TracChangeset for help on using the changeset viewer.