Changeset 5791


Ignore:
Timestamp:
02/10/09 11:11:52 (10 years ago)
Author:
pjkersha
Message:

Updates and fix for new ndg3beta release:

  • Change Attribute Authority SAML interface issuer format to saml.saml2.core.Issuer.X509_SUBJECT as agreed with Luca for ESG. Updated unit tests.
  • Fix Attribute Authority clockSkew attribute initialisation - create as a deltatime not a float.
Location:
TI12-security/trunk/python
Files:
1 deleted
3 edited

Legend:

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

    r5771 r5791  
    138138        'attCertLifetime':              -1, 
    139139        'attCertNotBeforeOff':          0., 
    140         'clockSkew':                    0., 
     140        'clockSkew':                    timedelta(seconds=0.), 
    141141        'attCertFileName':              '', 
    142142        'attCertFileLogCnt':            0, 
     
    11021102         
    11031103        elif attributeQuery.subject.nameID.format != "urn:esg:openid": 
    1104             log.error('SAML Attribute Query subject format is "%r"; expecting ' 
    1105                       '"%s"' % (attributeQuery.subject.nameID.format, 
     1104            log.error('SAML Attribute Query subject format is %r; expecting ' 
     1105                      '%r' % (attributeQuery.subject.nameID.format, 
    11061106                                "urn:esg:openid")) 
    11071107            samlResponse.status.statusCode.value = StatusCode.REQUESTER_URI 
     
    11101110            return samlResponse 
    11111111         
    1112         elif attributeQuery.issuer.format != "urn:esg:issuer": 
    1113             log.error('SAML Attribute Query issuer format is "%r"; expecting ' 
    1114                       '"%s"' % (attributeQuery.issuer.format, 
    1115                                 "urn:esg:issuer")) 
     1112        elif attributeQuery.issuer.format not in Issuer.X509_SUBJECT: 
     1113            log.error('SAML Attribute Query issuer format is %r; expecting ' 
     1114                      '%r' % (attributeQuery.issuer.format, 
     1115                                Issuer.X509_SUBJECT)) 
    11161116            samlResponse.status.statusCode.value = StatusCode.REQUESTER_URI 
    11171117            samlResponse.status.statusMessage.value = \ 
  • TI12-security/trunk/python/ndg_security_server/ndg/security/server/wsgi/openid/provider/authninterface/__init__.py

    r5786 r5791  
    99__contact__ = "Philip.Kershaw@stfc.ac.uk" 
    1010__revision__ = '$Id$' 
     11import logging 
     12log = logging.getLogger(__name__) 
    1113 
    1214class AuthNInterfaceError(Exception): 
  • TI12-security/trunk/python/ndg_security_test/ndg/security/test/unit/wsgi/saml/test_soapattributeinterface.py

    r5663 r5791  
    6666         
    6767        attributeQuery.issuer = Issuer() 
    68         attributeQuery.issuer.format = "urn:esg:issuer" 
     68        attributeQuery.issuer.format = Issuer.X509_SUBJECT 
    6969        attributeQuery.issuer.value = issuer 
    7070                         
Note: See TracChangeset for help on using the changeset viewer.