Changeset 2735


Ignore:
Timestamp:
18/07/07 09:10:53 (14 years ago)
Author:
pjkersha
Message:

setup.py,
ndg.security.client/setup.py,
ndg.security.server/setup.py,
ndg.security.test/setup.py,
ndg.security.common/setup.py:

  • incremented to 0.8.3 for latest NDG beta release.

setup.cfg,
ndg.security.client/setup.cfg,
ndg.security.server/setup.cfg,
ndg.security.test/setup.cfg,
ndg.security.common/setup.cfg:

  • changed back to _beta release for DEWS

ndg.security.common/ndg/security/common/openssl.py:

  • OpenSSLConfig._filtOptVal - only apply CA dir substitution for $dir if CA

dir is set.

Location:
TI12-security/trunk/python
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • TI12-security/trunk/python/ndg.security.client/setup.cfg

    r2733 r2735  
    1717 
    1818[egg_info] 
    19 tag_build = _dews 
     19tag_build = _beta 
    2020tag_svn_revision = true 
    2121 

  • TI12-security/trunk/python/ndg.security.client/setup.py

    r2733 r2735  
    3030setup( 
    3131    name =                      'ndg_security_client', 
    32     version =                   '0.8.2', 
     32    version =                   '0.8.3', 
    3333    description =               'NERC DataGrid Security Utilities', 
    3434    long_description =          'Software for securing NDG resources', 

  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/openssl.py

    r2731 r2735  
    4444 
    4545     
    46     def __init__(self, filePath=None): 
     46    def __init__(self, filePath=None, caDir=None): 
    4747        """Initial OpenSSL configuration optionally setting a file path to 
    4848        read from 
    … …  
    5757 
    5858        # Set-up CA directory 
    59         if not os.environ.get('HOME'): 
    60             raise OpenSSLConfigError, 'Environment variable "HOME" is not set' 
    61          
    62         self.__caDir = os.path.join(os.environ['HOME'], self.__gridCASubDir) 
     59        self.setCADir(caDir) 
    6360 
    6461             
    … …  
    9693 
    9794             
    98     def __setCADir(self, caDir): 
     95    def setCADir(self, caDir): 
    9996        """Set property method 
    10097        @type caDir: string 
    10198        @param caDir: path for OpenSSL configuration file""" 
    102         if filePath is not None: 
     99        if caDir is None: 
     100            # Try to set default from 'HOME' env variable 
     101            homeDir = os.environ.get('HOME') 
     102            if homeDir: 
     103                self.__caDir = os.path.join(os.environ['HOME'],  
     104                                            self.__gridCASubDir) 
     105            else: 
     106                self.__caDir = None 
     107        else: 
    103108            if not isinstance(caDir, basestring): 
    104109                raise OpenSSLConfigError, \ 
    … …  
    124129 
    125130    caDir = property(fget=__getCADir, 
    126                      fset=__setCADir, 
     131                     fset=setCADir, 
    127132                     doc="directory path for CA configuration files") 
    128133 
    … …  
    196201        @type optVal: string 
    197202        @param optVal: option value""" 
    198         return self.__class__._caDirPat.sub(self.__caDir, 
    199                                             optVal.split('#')[0].strip()) 
    200  
     203        filtVal = optVal.split('#')[0].strip() 
     204        if self.__caDir: 
     205            # Replace $dir with CA directory path 
     206            return self.__class__._caDirPat.sub(self.__caDir, filtVal) 
     207        else: 
     208            # Leave $dir in place as no CA directory has been set 
     209            return filtVal 
     210         
    201211 
    202212    def readfp(self, fp): 

  • TI12-security/trunk/python/ndg.security.common/setup.cfg

    r2733 r2735  
    1717 
    1818[egg_info] 
    19 tag_build = _dews 
     19tag_build = _beta 
    2020tag_svn_revision = true 
    2121 

  • TI12-security/trunk/python/ndg.security.common/setup.py

    r2733 r2735  
    5959setup( 
    6060    name =                      'ndg_security_common', 
    61     version =                   '0.8.2', 
     61    version =                   '0.8.3', 
    6262    description = \ 
    6363'''NERC DataGrid Security virtual package containing common utilities used 

  • TI12-security/trunk/python/ndg.security.server/setup.cfg

    r2733 r2735  
    1515 
    1616[egg_info] 
    17 tag_build = _dews 
     17tag_build = _beta 
    1818tag_svn_revision = true 
    1919 

  • TI12-security/trunk/python/ndg.security.server/setup.py

    r2733 r2735  
    3535setup( 
    3636    name =                      'ndg_security_server', 
    37     version =                   '0.8.2', 
     37    version =                   '0.8.3', 
    3838    description =               'NERC DataGrid Security Services', 
    3939    long_description =          'Server side component for securing NDG resources', 

  • TI12-security/trunk/python/ndg.security.test/setup.cfg

    r2733 r2735  
    1010# version 1.0 or later. 
    1111[egg_info] 
    12 tag_build = _dews 
     12tag_build = _beta 
    1313tag_svn_revision = true 
    1414 

  • TI12-security/trunk/python/ndg.security.test/setup.py

    r2733 r2735  
    3333setup( 
    3434    name =                      'ndg_security_test', 
    35     version =                   '0.8.2', 
     35    version =                   '0.8.3', 
    3636    description =               'NERC DataGrid Security Unit tests', 
    3737    long_description =          'Unit tests client - server side', 

  • TI12-security/trunk/python/setup.cfg

    r2733 r2735  
    1919 
    2020[egg_info] 
    21 tag_build = _dews 
     21tag_build = _beta 
    2222tag_svn_revision = true 
    2323 

  • TI12-security/trunk/python/setup.py

    r2733 r2735  
    2525setup( 
    2626    name =                      'ndg_security', 
    27     version =                   '0.8.2', 
     27    version =                   '0.8.3', 
    2828    description =               'NERC DataGrid Security Utilities', 
    2929    long_description =          'Software for securing NDG resources', 
Note: See TracChangeset for help on using the changeset viewer.