Changeset 2733


Ignore:
Timestamp:
17/07/07 13:52:21 (12 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:

  • move to vers 0.8.2 for DEWS fix for M2Crypto DN parse bug fix

ndg.security.server/ndg/security/server/conf/sessionMgrProperties.xml:

  • fix to element xmlSigCertPPhrase -> xmlSigCertPwd
  • added defaults for Credential Repository dynamic class load

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

  • use '_dews' tag for DEWS release

Tests/urllib2Client.py: test code for using urllib2 to enable config of a
HTTP proxy. Add to repository to keep as record. Not needed for current
security release.

ndg.security.common/ndg/security/common/X509.py:

  • added workaround for bug with M2Crypto.X509.X509.as_text() - it doesn't

parse emailAddress fields correctly leaving them with a slash attached to the
previous comma separated field. e.g.

C=SG, ST=Singapore, O=BMTAP Pte Ltd, OU=Environmental Development,
CN=www.bmtap.com.sg/emailAddress=sjamsul.lakau@…


  • fixed X500DN.deserialise so that long field names are accepted.
Location:
TI12-security/trunk/python
Files:
12 edited

Legend:

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

    r2715 r2733  
    1717 
    1818[egg_info] 
    19 tag_build = _beta 
     19tag_build = _dews 
    2020tag_svn_revision = true 
    2121 
  • TI12-security/trunk/python/ndg.security.client/setup.py

    r2715 r2733  
    3030setup( 
    3131    name =                      'ndg_security_client', 
    32     version =                   '0.8.1', 
     32    version =                   '0.8.2', 
    3333    description =               'NERC DataGrid Security Utilities', 
    3434    long_description =          'Software for securing NDG resources', 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/X509.py

    r2679 r2733  
    513513    # * private * 
    514514    __shortNameLUT = {  'commonName':               'CN', 
    515                         'OrganisationalUnitName':   'OU', 
    516                         'Organisation':             'O', 
    517                         'CountryName':              'C', 
    518                         'EmailAddress':             'EMAILADDRESS', 
     515                        'organisationalUnitName':   'OU', 
     516                        'organisation':             'O', 
     517                        'countryName':              'C', 
     518                        'emailAddress':             'EMAILADDRESS', 
    519519                        'localityName':             'L', 
    520520                        'stateOrProvinceName':      'ST', 
     
    568568        if m2CryptoX509Name is not None: 
    569569            # the argument is an x509 dn in m2crypto format 
    570             self.deserialise(m2CryptoX509Name.as_text()) 
     570            # 
     571            # Hack required here because M2Crypto doesn't 
     572            # correctly separate emailAddress fields e.g. 
     573            # 
     574            # C=SG, ST=Singapore, O=BMTAP Pte Ltd,  
     575            # OU=Environmental Development,  
     576            # CN=www.bmtap.com.sg/emailAddress=sjamsul.lakau@bmtasia.com.sg 
     577            #                    ^ 
     578            # - The slash is left in place 
     579            # 
     580            # TODO: re-check this for future M2Crypto releases 
     581            dnTxt = ', '.join(m2CryptoX509Name.as_text().split('/'))             
     582            # End hack 
     583             
     584            self.deserialise(dnTxt) 
    571585             
    572586        elif dn is not None: 
     
    767781                 
    768782            # Copy matching DN fields 
    769             for i in parsedDN.items(): 
    770                 if not self.__dat.has_key(i[0]): 
    771                     raise X500DNError(\ 
    772                         "Invalid field \"%s\" in input DN string" % i[0]) 
    773  
    774                 self.__dat[i[0]] = i[1] 
     783            for key, val in parsedDN.items(): 
     784                if key not in self.__dat and key not in self.__shortNameLUT: 
     785                    raise X500DNError, \ 
     786                        "Invalid field \"%s\" in input DN string" % key 
     787 
     788                self.__dat[key] = val 
    775789 
    776790                 
  • TI12-security/trunk/python/ndg.security.common/setup.cfg

    r2715 r2733  
    1717 
    1818[egg_info] 
    19 tag_build = _beta 
     19tag_build = _dews 
    2020tag_svn_revision = true 
    2121 
  • TI12-security/trunk/python/ndg.security.common/setup.py

    r2721 r2733  
    5959setup( 
    6060    name =                      'ndg_security_common', 
    61     version =                   '0.8.1', 
     61    version =                   '0.8.2', 
    6262    description = \ 
    6363'''NERC DataGrid Security virtual package containing common utilities used 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/conf/sessionMgrProperties.xml

    r2530 r2733  
    6969        <xmlSigKeyFile></xmlSigKeyFile> 
    7070        <xmlSigCertFile></xmlSigCertFile> 
    71         <xmlSigCertPPhrase></xmlSigCertPPhrase> 
     71        <xmlSigCertPwd></xmlSigCertPwd> 
    7272    </simpleCACltProp> 
    7373        <!-- 
     
    8383    <credReposProp> 
    8484            <modFilePath></modFilePath> 
    85             <modName></modName> 
    86             <className></className> 
     85            <modName>ndg.security.common.CredWallet</modName> 
     86            <className>NullCredRepos</className> 
    8787            <propFile></propFile> 
    8888    </credReposProp> 
  • TI12-security/trunk/python/ndg.security.server/setup.cfg

    r2715 r2733  
    1515 
    1616[egg_info] 
    17 tag_build = _beta 
     17tag_build = _dews 
    1818tag_svn_revision = true 
    1919 
  • TI12-security/trunk/python/ndg.security.server/setup.py

    r2721 r2733  
    3535setup( 
    3636    name =                      'ndg_security_server', 
    37     version =                   '0.8.1', 
     37    version =                   '0.8.2', 
    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

    r2715 r2733  
    1010# version 1.0 or later. 
    1111[egg_info] 
    12 tag_build = _beta 
     12tag_build = _dews 
    1313tag_svn_revision = true 
    1414 
  • TI12-security/trunk/python/ndg.security.test/setup.py

    r2715 r2733  
    3333setup( 
    3434    name =                      'ndg_security_test', 
    35     version =                   '0.8.1', 
     35    version =                   '0.8.2', 
    3636    description =               'NERC DataGrid Security Unit tests', 
    3737    long_description =          'Unit tests client - server side', 
  • TI12-security/trunk/python/setup.cfg

    r2715 r2733  
    1919 
    2020[egg_info] 
    21 tag_build = _beta 
     21tag_build = _dews 
    2222tag_svn_revision = true 
    2323 
  • TI12-security/trunk/python/setup.py

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