Ignore:
Timestamp:
02/07/08 12:27:16 (14 years ago)
Author:
pjkersha
Message:

Fixes following update to NOCS deployment.

  • m2CryptoSSLUtility.HTTPSConnection now overrides putrequest in order to ensure that the URL path is string type. unicode type gives an error
  • added a unit test for BrowsePDP - gatekeeper for MOLES/CSML access control.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/authz/pdp/proftp.py

    r3897 r4035  
    7676                'acIssuer': ''} 
    7777        
    78     def __init__(self, cfg=None, **cfgKw): 
     78    def __init__(self, cfg=None, cfgSection='DEFAULT', **cfgKw): 
    7979        """Initialise settings for WS-Security and SSL for SOAP 
    8080        call to Session Manager 
     
    9393         
    9494        # Set from config file 
    95         if cfgFilePath: 
    96             self._readConfig() 
    97              
     95        # Set from config file 
     96        if isinstance(cfg, basestring): 
     97            self._cfg = SafeConfigParser() 
     98            self._readConfig(cfg) 
     99        else: 
     100            self._cfg = cfg 
     101                         
    98102        # Separate keywords into PDP and WS-Security specific items 
    99103        paramNames = cfgKw.keys() 
     
    107111 
    108112            
    109     def _readConfig(self, section='DEFAULT'): 
     113    def _readConfig(self, cfgFilePath): 
    110114        '''Read PDP configuration file''' 
    111         cfg = SafeConfigParser() 
    112         cfg.read(self.cfgFilePath) 
     115        self._cfg.read(cfgFilePath) 
     116 
     117 
     118    def _parseConfig(self, section='DEFAULT'): 
     119        '''Extract parameters from _cfg config object''' 
     120        log.debug("ProftpPDP._parseConfig ...") 
    113121         
    114122        # Copy directly into attribute of this object 
Note: See TracChangeset for help on using the changeset viewer.