Changeset 4126

Timestamp:

18/08/08 09:16:40 (12 years ago)

Author:

pjkersha

Message:

ndg.security.server.wsgi.openid_provider: move Yadis rendering into RenderingInterface? class.

Location:

TI12-security/trunk/python/ndg.security.server/ndg/security/server

Files:

• pylons/development.ini (modified) (3 diffs)
• wsgi/openid_provider.py (modified) (2 diffs)

TI12-security/trunk/python/ndg.security.server/ndg/security/server/pylons/development.ini

@@ -12 +12 @@
 
 # Layout
-server = http://localhost:5000
+server = http://localhost:8200
 LeftLogo = %(server)s/layout/NERC_Logo.gif
 LeftAlt = Natural Environment Research Council
@@ -25 +25 @@
 use = egg:Paste#http
 host = 0.0.0.0
-port = 5000
+port = 8200
 
 [app:main]
@@ -71 +71 @@
 openid_provider.path.mainpage=/openid
 openid_provider.session_middleware=beaker.session 
-openid_provider.base_url=http://localhost:5000
+openid_provider.base_url=http://localhost:8200
 openid_provider.consumer_store_dirpath=./
 openid_provider.charset=None

TI12-security/trunk/python/ndg.security.server/ndg/security/server/wsgi/openid_provider.py

@@ -221 +221 @@
         return response
 
-    tmplYadis = """\
-<?xml version="1.0" encoding="UTF-8"?>
-<xrds:XRDS
-    xmlns:xrds="xri://$xrds"
-    xmlns="xri://$xrd*($v*2.0)">
-  <XRD>
-
-    <Service priority="0">
-      <Type>%(openid20type)s</Type>
-      <Type>%(openid10type)s</Type>
-      <URI>%(endpoint_url)s</URI>
-      <LocalID>%(user_url)s</LocalID>
-    </Service>
-
-  </XRD>
-</xrds:XRDS>"""
 
     def do_yadis(self, environ, start_response):
         """Generate Yadis document"""
-
-        username = self.path.split('/')[-1]
-        
-        endpoint_url = self.urls['url_openidserver']
-        user_url = self.urls['url_id'] + '/' + username
-        
-        yadisDict = dict(openid20type=discover.OPENID_2_0_TYPE, 
-                         openid10type=discover.OPENID_1_0_TYPE,
-                         endpoint_url=endpoint_url, 
-                         user_url=user_url)
-        
-        response = OpenIDProviderMiddleware.tmplYadis % yadisDict
+        response = self._renderer.renderYadis(environ)
      
         start_response('200 OK',
-                    [('Content-type', 'application/xrds+xml' + self.charset),
-                     ('Content-length', str(len(response)))])
+                       [('Content-type', 'application/xrds+xml'+self.charset),
+                        ('Content-length', str(len(response)))])
         return response
 
@@ -580 +553 @@
                                 ''' % (ident, msg))
         
+    tmplYadis = """\
+<?xml version="1.0" encoding="UTF-8"?>
+<xrds:XRDS
+    xmlns:xrds="xri://$xrds"
+    xmlns="xri://$xrd*($v*2.0)">
+  <XRD>
+
+    <Service priority="0">
+      <Type>%(openid20type)s</Type>
+      <Type>%(openid10type)s</Type>
+      <URI>%(endpoint_url)s</URI>
+      <LocalID>%(user_url)s</LocalID>
+    </Service>
+
+  </XRD>
+</xrds:XRDS>"""    
+    
+    def renderYadis(self, environ):
+        """Render Yadis document"""
+        username = environ['PATH_INFO'].rstrip('/').split('/')[-1]
+        
+        endpoint_url = self.urls['url_openidserver']
+        user_url = self.urls['url_id'] + '/' + username
+        
+        yadisDict = dict(openid20type=discover.OPENID_2_0_TYPE, 
+                         openid10type=discover.OPENID_1_0_TYPE,
+                         endpoint_url=endpoint_url, 
+                         user_url=user_url)
+        
+        return RenderingInterface.tmplYadis % yadisDict
+
         
     def renderLogin(self, environ, success_to=None, fail_to=None):