Changeset 7858


Ignore:
Timestamp:
28/01/11 14:24:21 (8 years ago)
Author:
pjkersha
Message:

Incomplete - task 21: Fix Yadis for 1.5.x branch to include Attribute Service and MyProxy? entries

  • Fixed and re-ran unit tests and authz_lite integration tests, releasing 1.5.9
Location:
TI12-security/branches/ndg-security-1.5.x
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/branches/ndg-security-1.5.x/ndg_security/setup.py

    r7632 r7858  
    4242setup( 
    4343    name =                      'ndg_security', 
    44     version =                   '1.5.8', 
     44    version =                   '1.5.9', 
    4545    description =               'NERC DataGrid Security Utilities', 
    4646    long_description =          _longDescription, 
  • TI12-security/branches/ndg-security-1.5.x/ndg_security_client/setup.py

    r7632 r7858  
    4444setup( 
    4545    name =                      'ndg_security_client', 
    46     version =                   '1.5.8', 
     46    version =                   '1.5.9', 
    4747    description =               'NERC DataGrid Security Client side interface', 
    4848    long_description =          _longDescription, 
  • TI12-security/branches/ndg-security-1.5.x/ndg_security_common/setup.py

    r7632 r7858  
    5353setup( 
    5454    name =                      'ndg_security_common', 
    55     version =                   '1.5.8', 
     55    version =                   '1.5.9', 
    5656    description =           'NERC DataGrid Security package containing common ' 
    5757                            'utilities used by both server and client ' 
  • TI12-security/branches/ndg-security-1.5.x/ndg_security_server/ndg/security/server/wsgi/openid/provider/renderinginterface/genshi/__init__.py

    r7119 r7858  
    6969    MAIN_PAGE_TMPL_NAME = 'main.html' 
    7070    ERROR_PAGE_TMPL_NAME = 'error.html' 
     71    SERVER_YADIS_TMPL_NAME = 'serveryadis.xml' 
     72    YADIS_TMPL_NAME = 'yadis.xml' 
    7173     
    7274    # Approve and reject submit HTML input types for the Relying Party Approval  
     
    265267                      doc="Genshi TemplateLoader instance")   
    266268           
    267     def _render(self, templateName, c=None, **kw): 
     269    def _render(self, templateName, method='html', doctype='html', c=None, **kw): 
    268270        '''Wrapper for Genshi template rendering 
    269271        @type templateName: basestring 
     
    282284         
    283285        tmpl = self.loader.load(templateName) 
    284         rendering = tmpl.generate(**kw).render('html', doctype='html') 
     286        rendering = tmpl.generate(**kw).render(method=method, doctype=doctype) 
    285287         
    286288        return rendering 
     
    311313                         user_url=user_url) 
    312314         
    313         response = RenderingInterface.tmplYadis % yadisDict 
     315        response = self._render(self.__class__.YADIS_TMPL_NAME,  
     316                                method='xml', 
     317                                doctype=None, 
     318                                **yadisDict) 
    314319      
    315320        start_response('200 OK', 
     
    317322                        ('Content-length', str(len(response)))]) 
    318323        return response 
     324     
     325    def serverYadis(self, environ, start_response): 
     326        '''Render Yadis info for ID Select mode request - Override base  
     327        implementation to enable custom XRDS document setting 
     328         
     329        @type environ: dict 
     330        @param environ: dictionary of environment variables 
     331        @type start_response: callable 
     332        @param start_response: WSGI start response function.  Should be called 
     333        from this method to set the response code and HTTP header content 
     334        @rtype: basestring 
     335        @return: WSGI response 
     336        ''' 
     337        endpoint_url = self.urls['url_openidserver'] 
     338        _dict = { 
     339            'openid20type': discover.OPENID_IDP_2_0_TYPE, 
     340            'endpoint_url': endpoint_url 
     341        } 
     342         
     343        response = self._render(self.__class__.SERVER_YADIS_TMPL_NAME,  
     344                                method='xml', 
     345                                doctype=None, 
     346                                **_dict) 
     347              
     348        start_response("200 OK", 
     349                       [('Content-type', 'application/xrds+xml'), 
     350                        ('Content-length', str(len(response)))]) 
     351        return response  
     352     
    319353  
    320354    def login(self, environ, start_response, success_to=None, fail_to=None,  
  • TI12-security/branches/ndg-security-1.5.x/ndg_security_server/setup.py

    r7632 r7858  
    6060setup( 
    6161    name =                      'ndg_security_server', 
    62     version =                   '1.5.8', 
     62    version =                   '1.5.9', 
    6363    description =               'Server side components for running NERC DataGrid ' 
    6464                            'Security Services', 
  • TI12-security/branches/ndg-security-1.5.x/ndg_security_test/ndg/security/test/config/attributeauthority/sitea/attributeCertificateLog/ac.xml

    r7632 r7858  
    99        <userId>testuser</userId> 
    1010        <validity> 
    11             <notBefore>2010 10 19 13 20 55</notBefore>  
    12             <notAfter>2010 10 19 21 20 55</notAfter>  
     11            <notBefore>2011 01 28 14 21 24</notBefore>  
     12            <notAfter>2011 01 28 22 21 24</notAfter>  
    1313        </validity> 
    1414        <attributes> 
     
    3333        <provenance>original</provenance>  
    3434    </acInfo> 
    35 <ds:Signature><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces PrefixList="ds"></ec:InclusiveNamespaces></ds:CanonicalizationMethod><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"></ds:SignatureMethod><ds:Reference URI=""><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"></ds:Transform><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces PrefixList="xmlns"></ec:InclusiveNamespaces></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></ds:DigestMethod><ds:DigestValue>Q9Gt6n4Ld95cXaCW2InNpvnNkmY=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>Jop1//dO80HVOEIJhJRMUMabB178236kGR6HwhcUTS9VgdW6H1i18/pDquJnwO2JC+L6Z0DFkDtk 
    36 c0WJs9m3TsNg0z/Aw2EYALgbwgyspY1Ig6XWYwCybQnEO8M4slU0Tch8s5lBP4tzAyge7qvzeB1s 
    37 9RMrnAAA9ve0kcor0YU=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIB+jCCAWOgAwIBAgIBFDANBgkqhkiG9w0BAQQFADAzMQwwCgYDVQQKEwNOREcx 
     35<ds:Signature><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces PrefixList="ds"></ec:InclusiveNamespaces></ds:CanonicalizationMethod><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"></ds:SignatureMethod><ds:Reference URI=""><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"></ds:Transform><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces PrefixList="xmlns"></ec:InclusiveNamespaces></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></ds:DigestMethod><ds:DigestValue>0pBr99hzyxTSKn+QFX+ktja+K+0=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>j4rZ2LXEQkH6i8r/a1i5FIkLe4p7dy3gFEzl4A8znm06+s3I8/AgYVDm0xZINAfBnd5AWRtrxLPb 
     36QZ7vPeCahkaePlz+Nbr3LVq03MI2EOIXIhtjhYHMoL9LSlDxfnUX638qpzqA8Qk2ALCThvVmPgFG 
     37Ek4RnkXLaXGL/DGSwGM=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIB+jCCAWOgAwIBAgIBFDANBgkqhkiG9w0BAQQFADAzMQwwCgYDVQQKEwNOREcx 
    3838ETAPBgNVBAsTCFNlY3VyaXR5MRAwDgYDVQQDEwdUZXN0IENBMB4XDTEwMDYyOTEw 
    3939NTQxOFoXDTExMDYyOTEwNTQxOFowPDEMMAoGA1UEChMDTkRHMQ8wDQYDVQQLEwZT 
  • TI12-security/branches/ndg-security-1.5.x/ndg_security_test/setup.py

    r7632 r7858  
    1919setup( 
    2020    name =                      'ndg_security_test', 
    21     version =                   '1.5.8', 
     21    version =                   '1.5.9', 
    2222    description =               'NERC DataGrid Security Unit tests', 
    2323    long_description =          'Unit tests client - server side', 
Note: See TracChangeset for help on using the changeset viewer.