Changeset 7858

Timestamp:

28/01/11 14:24:21 (10 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:

• ndg_security/setup.py (modified) (1 diff)
• ndg_security_client/setup.py (modified) (1 diff)
• ndg_security_common/setup.py (modified) (1 diff)
• ndg_security_server/ndg/security/server/wsgi/openid/provider/renderinginterface/genshi/__init__.py (modified) (5 diffs)
• ndg_security_server/ndg/security/server/wsgi/openid/provider/renderinginterface/genshi/templates/serveryadis.xml (added)
• ndg_security_server/ndg/security/server/wsgi/openid/provider/renderinginterface/genshi/templates/yadis.xml (added)
• ndg_security_server/setup.py (modified) (1 diff)
• ndg_security_test/ndg/security/test/config/attributeauthority/sitea/attributeCertificateLog/ac.xml (modified) (2 diffs)
• ndg_security_test/setup.py (modified) (1 diff)

TI12-security/branches/ndg-security-1.5.x/ndg_security/setup.py

@@ -42 +42 @@
 setup(
     name =                      'ndg_security',
-    version =                   '1.5.8',
+    version =                   '1.5.9',
     description =               'NERC DataGrid Security Utilities',
     long_description =          _longDescription,

TI12-security/branches/ndg-security-1.5.x/ndg_security_client/setup.py

@@ -44 +44 @@
 setup(
     name =                      'ndg_security_client',
-    version =                   '1.5.8',
+    version =                   '1.5.9',
     description =               'NERC DataGrid Security Client side interface',
     long_description =          _longDescription,

TI12-security/branches/ndg-security-1.5.x/ndg_security_common/setup.py

@@ -53 +53 @@
 setup(
     name =                      'ndg_security_common',
-    version =                   '1.5.8',
+    version =                   '1.5.9',
     description =           'NERC DataGrid Security package containing common '
                             '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

@@ -69 +69 @@
     MAIN_PAGE_TMPL_NAME = 'main.html'
     ERROR_PAGE_TMPL_NAME = 'error.html'
+    SERVER_YADIS_TMPL_NAME = 'serveryadis.xml'
+    YADIS_TMPL_NAME = 'yadis.xml'
     
     # Approve and reject submit HTML input types for the Relying Party Approval 
@@ -265 +267 @@
                       doc="Genshi TemplateLoader instance")  
           
-    def _render(self, templateName, c=None, **kw):
+    def _render(self, templateName, method='html', doctype='html', c=None, **kw):
         '''Wrapper for Genshi template rendering
         @type templateName: basestring
@@ -282 +284 @@
         
         tmpl = self.loader.load(templateName)
-        rendering = tmpl.generate(**kw).render('html', doctype='html')
+        rendering = tmpl.generate(**kw).render(method=method, doctype=doctype)
         
         return rendering
@@ -311 +313 @@
                          user_url=user_url)
         
-        response = RenderingInterface.tmplYadis % yadisDict
+        response = self._render(self.__class__.YADIS_TMPL_NAME, 
+                                method='xml',
+                                doctype=None,
+                                **yadisDict)
      
         start_response('200 OK',
@@ -317 +322 @@
                         ('Content-length', str(len(response)))])
         return response
+    
+    def serverYadis(self, environ, start_response):
+        '''Render Yadis info for ID Select mode request - Override base 
+        implementation to enable custom XRDS document setting
+        
+        @type environ: dict
+        @param environ: dictionary of environment variables
+        @type start_response: callable
+        @param start_response: WSGI start response function.  Should be called
+        from this method to set the response code and HTTP header content
+        @rtype: basestring
+        @return: WSGI response
+        '''
+        endpoint_url = self.urls['url_openidserver']
+        _dict = {
+            'openid20type': discover.OPENID_IDP_2_0_TYPE,
+            'endpoint_url': endpoint_url
+        }
+        
+        response = self._render(self.__class__.SERVER_YADIS_TMPL_NAME, 
+                                method='xml',
+                                doctype=None,
+                                **_dict)
+             
+        start_response("200 OK",
+                       [('Content-type', 'application/xrds+xml'),
+                        ('Content-length', str(len(response)))])
+        return response 
+    
  
     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

@@ -60 +60 @@
 setup(
     name =                      'ndg_security_server',
-    version =                   '1.5.8',
+    version =                   '1.5.9',
     description =               'Server side components for running NERC DataGrid '
                             'Security Services',

TI12-security/branches/ndg-security-1.5.x/ndg_security_test/ndg/security/test/config/attributeauthority/sitea/attributeCertificateLog/ac.xml

@@ -9 +9 @@
         <userId>testuser</userId>
         <validity>
-            <notBefore>2010 10 19 13 20 55</notBefore> 
-            <notAfter>2010 10 19 21 20 55</notAfter> 
+            <notBefore>2011 01 28 14 21 24</notBefore> 
+            <notAfter>2011 01 28 22 21 24</notAfter> 
         </validity>
         <attributes>
@@ -33 +33 @@
         <provenance>original</provenance> 
     </acInfo>
-<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
-c0WJs9m3TsNg0z/Aw2EYALgbwgyspY1Ig6XWYwCybQnEO8M4slU0Tch8s5lBP4tzAyge7qvzeB1s
-9RMrnAAA9ve0kcor0YU=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIB+jCCAWOgAwIBAgIBFDANBgkqhkiG9w0BAQQFADAzMQwwCgYDVQQKEwNOREcx
+<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
+QZ7vPeCahkaePlz+Nbr3LVq03MI2EOIXIhtjhYHMoL9LSlDxfnUX638qpzqA8Qk2ALCThvVmPgFG
+Ek4RnkXLaXGL/DGSwGM=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIB+jCCAWOgAwIBAgIBFDANBgkqhkiG9w0BAQQFADAzMQwwCgYDVQQKEwNOREcx
 ETAPBgNVBAsTCFNlY3VyaXR5MRAwDgYDVQQDEwdUZXN0IENBMB4XDTEwMDYyOTEw
 NTQxOFoXDTExMDYyOTEwNTQxOFowPDEMMAoGA1UEChMDTkRHMQ8wDQYDVQQLEwZT

TI12-security/branches/ndg-security-1.5.x/ndg_security_test/setup.py

@@ -19 +19 @@
 setup(
     name =                      'ndg_security_test',
-    version =                   '1.5.8',
+    version =                   '1.5.9',
     description =               'NERC DataGrid Security Unit tests',
     long_description =          'Unit tests client - server side',