Changeset 7858
- Timestamp:
- 28/01/11 14:24:21 (10 years ago)
- 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 42 42 setup( 43 43 name = 'ndg_security', 44 version = '1.5. 8',44 version = '1.5.9', 45 45 description = 'NERC DataGrid Security Utilities', 46 46 long_description = _longDescription, -
TI12-security/branches/ndg-security-1.5.x/ndg_security_client/setup.py
r7632 r7858 44 44 setup( 45 45 name = 'ndg_security_client', 46 version = '1.5. 8',46 version = '1.5.9', 47 47 description = 'NERC DataGrid Security Client side interface', 48 48 long_description = _longDescription, -
TI12-security/branches/ndg-security-1.5.x/ndg_security_common/setup.py
r7632 r7858 53 53 setup( 54 54 name = 'ndg_security_common', 55 version = '1.5. 8',55 version = '1.5.9', 56 56 description = 'NERC DataGrid Security package containing common ' 57 57 '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 69 69 MAIN_PAGE_TMPL_NAME = 'main.html' 70 70 ERROR_PAGE_TMPL_NAME = 'error.html' 71 SERVER_YADIS_TMPL_NAME = 'serveryadis.xml' 72 YADIS_TMPL_NAME = 'yadis.xml' 71 73 72 74 # Approve and reject submit HTML input types for the Relying Party Approval … … 265 267 doc="Genshi TemplateLoader instance") 266 268 267 def _render(self, templateName, c=None, **kw):269 def _render(self, templateName, method='html', doctype='html', c=None, **kw): 268 270 '''Wrapper for Genshi template rendering 269 271 @type templateName: basestring … … 282 284 283 285 tmpl = self.loader.load(templateName) 284 rendering = tmpl.generate(**kw).render( 'html', doctype='html')286 rendering = tmpl.generate(**kw).render(method=method, doctype=doctype) 285 287 286 288 return rendering … … 311 313 user_url=user_url) 312 314 313 response = RenderingInterface.tmplYadis % yadisDict 315 response = self._render(self.__class__.YADIS_TMPL_NAME, 316 method='xml', 317 doctype=None, 318 **yadisDict) 314 319 315 320 start_response('200 OK', … … 317 322 ('Content-length', str(len(response)))]) 318 323 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 319 353 320 354 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 60 60 setup( 61 61 name = 'ndg_security_server', 62 version = '1.5. 8',62 version = '1.5.9', 63 63 description = 'Server side components for running NERC DataGrid ' 64 64 'Security Services', -
TI12-security/branches/ndg-security-1.5.x/ndg_security_test/ndg/security/test/config/attributeauthority/sitea/attributeCertificateLog/ac.xml
r7632 r7858 9 9 <userId>testuser</userId> 10 10 <validity> 11 <notBefore>201 0 10 19 13 20 55</notBefore>12 <notAfter>201 0 10 19 21 20 55</notAfter>11 <notBefore>2011 01 28 14 21 24</notBefore> 12 <notAfter>2011 01 28 22 21 24</notAfter> 13 13 </validity> 14 14 <attributes> … … 33 33 <provenance>original</provenance> 34 34 </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+L6Z0DFkDtk36 c0WJs9m3TsNg0z/Aw2EYALgbwgyspY1Ig6XWYwCybQnEO8M4slU0Tch8s5lBP4tzAyge7qvzeB1s 37 9RMrnAAA9ve0kcor0YU=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIB+jCCAWOgAwIBAgIBFDANBgkqhkiG9w0BAQQFADAzMQwwCgYDVQQKEwNOREcx35 <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 36 QZ7vPeCahkaePlz+Nbr3LVq03MI2EOIXIhtjhYHMoL9LSlDxfnUX638qpzqA8Qk2ALCThvVmPgFG 37 Ek4RnkXLaXGL/DGSwGM=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIB+jCCAWOgAwIBAgIBFDANBgkqhkiG9w0BAQQFADAzMQwwCgYDVQQKEwNOREcx 38 38 ETAPBgNVBAsTCFNlY3VyaXR5MRAwDgYDVQQDEwdUZXN0IENBMB4XDTEwMDYyOTEw 39 39 NTQxOFoXDTExMDYyOTEwNTQxOFowPDEMMAoGA1UEChMDTkRHMQ8wDQYDVQQLEwZT -
TI12-security/branches/ndg-security-1.5.x/ndg_security_test/setup.py
r7632 r7858 19 19 setup( 20 20 name = 'ndg_security_test', 21 version = '1.5. 8',21 version = '1.5.9', 22 22 description = 'NERC DataGrid Security Unit tests', 23 23 long_description = 'Unit tests client - server side',
Note: See TracChangeset
for help on using the changeset viewer.