Changeset 4126
- Timestamp:
- 18/08/08 09:16:40 (12 years ago)
- Location:
- TI12-security/trunk/python/ndg.security.server/ndg/security/server
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TI12-security/trunk/python/ndg.security.server/ndg/security/server/pylons/development.ini
r4125 r4126 12 12 13 13 # Layout 14 server = http://localhost: 500014 server = http://localhost:8200 15 15 LeftLogo = %(server)s/layout/NERC_Logo.gif 16 16 LeftAlt = Natural Environment Research Council … … 25 25 use = egg:Paste#http 26 26 host = 0.0.0.0 27 port = 500027 port = 8200 28 28 29 29 [app:main] … … 71 71 openid_provider.path.mainpage=/openid 72 72 openid_provider.session_middleware=beaker.session 73 openid_provider.base_url=http://localhost: 500073 openid_provider.base_url=http://localhost:8200 74 74 openid_provider.consumer_store_dirpath=./ 75 75 openid_provider.charset=None -
TI12-security/trunk/python/ndg.security.server/ndg/security/server/wsgi/openid_provider.py
r4125 r4126 221 221 return response 222 222 223 tmplYadis = """\224 <?xml version="1.0" encoding="UTF-8"?>225 <xrds:XRDS226 xmlns:xrds="xri://$xrds"227 xmlns="xri://$xrd*($v*2.0)">228 <XRD>229 230 <Service priority="0">231 <Type>%(openid20type)s</Type>232 <Type>%(openid10type)s</Type>233 <URI>%(endpoint_url)s</URI>234 <LocalID>%(user_url)s</LocalID>235 </Service>236 237 </XRD>238 </xrds:XRDS>"""239 223 240 224 def do_yadis(self, environ, start_response): 241 225 """Generate Yadis document""" 242 243 username = self.path.split('/')[-1] 244 245 endpoint_url = self.urls['url_openidserver'] 246 user_url = self.urls['url_id'] + '/' + username 247 248 yadisDict = dict(openid20type=discover.OPENID_2_0_TYPE, 249 openid10type=discover.OPENID_1_0_TYPE, 250 endpoint_url=endpoint_url, 251 user_url=user_url) 252 253 response = OpenIDProviderMiddleware.tmplYadis % yadisDict 226 response = self._renderer.renderYadis(environ) 254 227 255 228 start_response('200 OK', 256 [('Content-type', 'application/xrds+xml' +self.charset),257 ('Content-length', str(len(response)))])229 [('Content-type', 'application/xrds+xml'+self.charset), 230 ('Content-length', str(len(response)))]) 258 231 return response 259 232 … … 580 553 ''' % (ident, msg)) 581 554 555 tmplYadis = """\ 556 <?xml version="1.0" encoding="UTF-8"?> 557 <xrds:XRDS 558 xmlns:xrds="xri://$xrds" 559 xmlns="xri://$xrd*($v*2.0)"> 560 <XRD> 561 562 <Service priority="0"> 563 <Type>%(openid20type)s</Type> 564 <Type>%(openid10type)s</Type> 565 <URI>%(endpoint_url)s</URI> 566 <LocalID>%(user_url)s</LocalID> 567 </Service> 568 569 </XRD> 570 </xrds:XRDS>""" 571 572 def renderYadis(self, environ): 573 """Render Yadis document""" 574 username = environ['PATH_INFO'].rstrip('/').split('/')[-1] 575 576 endpoint_url = self.urls['url_openidserver'] 577 user_url = self.urls['url_id'] + '/' + username 578 579 yadisDict = dict(openid20type=discover.OPENID_2_0_TYPE, 580 openid10type=discover.OPENID_1_0_TYPE, 581 endpoint_url=endpoint_url, 582 user_url=user_url) 583 584 return RenderingInterface.tmplYadis % yadisDict 585 582 586 583 587 def renderLogin(self, environ, success_to=None, fail_to=None):
Note: See TracChangeset
for help on using the changeset viewer.