Changeset 7822

Timestamp:

17/01/11 16:26:46 (10 years ago)

Author:

pjkersha

Message:

Incomplete - task 16: NDG Security 2.x.x - incl. updated Paster templates

• fix for Yadis template substitutions
• updated svn:keywords: Id property

Location:

TI12-security/trunk/NDGSecurity/python

Files:

• Tests/esg_integration/test_attributeserviceclient.cfg (modified) (1 prop)
• Tests/esg_integration/test_attributeserviceclient.py (modified) (1 prop)
• Tests/oauth2/__init__.py (modified) (1 prop)
• Tests/oauth2/sign_request.py (modified) (1 prop)
• Tests/pyopenssl/test_ssl.py (modified) (1 prop)
• Tests/query_arg_test/test_query_arg.py (modified) (1 prop)
• ndg_security_server/ndg/security/server/paster_templates/Makefile (modified) (2 diffs, 1 prop)
• ndg_security_server/ndg/security/server/paster_templates/attributeservice/attribute-service.ini_tmpl (modified) (1 prop)
• ndg_security_server/ndg/security/server/paster_templates/attributeservice/pki/ca/d573507a.0 (modified) (1 prop)
• ndg_security_server/ndg/security/server/paster_templates/attributeservice/pki/localhost.crt (modified) (1 prop)
• ndg_security_server/ndg/security/server/paster_templates/attributeservice/pki/localhost.key (modified) (1 prop)
• ndg_security_server/ndg/security/server/paster_templates/attributeservice/user.db (modified) (1 prop) (previous)
• ndg_security_server/ndg/security/server/paster_templates/authorisationservice/authorisation-service.ini_tmpl (modified) (1 prop)
• ndg_security_server/ndg/security/server/paster_templates/authorisationservice/pip-mapping.txt (modified) (1 prop)
• ndg_security_server/ndg/security/server/paster_templates/authorisationservice/pki/ca/d573507a.0 (modified) (1 prop)
• ndg_security_server/ndg/security/server/paster_templates/authorisationservice/pki/localhost.crt (modified) (1 prop)
• ndg_security_server/ndg/security/server/paster_templates/authorisationservice/pki/localhost.key (modified) (1 prop)
• ndg_security_server/ndg/security/server/paster_templates/authorisationservice/policy.xml (modified) (1 prop)
• ndg_security_server/ndg/security/server/paster_templates/openidprovider/templates/serveryadis.xml_tmpl (modified) (1 diff)
• ndg_security_server/ndg/security/server/paster_templates/openidprovider/templates/yadis.xml_tmpl (modified) (1 diff)
• ndg_security_server/ndg/security/server/paster_templates/services/openidprovider/templates/serveryadis.xml_tmpl (modified) (1 diff)
• ndg_security_server/ndg/security/server/paster_templates/services/openidprovider/templates/yadis.xml_tmpl (modified) (1 diff)
• ndg_security_server/ndg/security/server/paster_templates/template.py (modified) (7 diffs)
• ndg_security_server/ndg/security/server/wsgi/authz/pep.py (modified) (1 prop)
• ndg_security_server/ndg/security/server/wsgi/client_proxy/__init__.py (modified) (1 prop)
• ndg_security_server/ndg/security/server/wsgi/client_proxy/middleware.py (modified) (1 prop)
• ndg_security_server/ndg/security/server/wsgi/openid/provider/renderinginterface/genshi/templates/serveryadis.xml (modified) (1 prop)
• ndg_security_server/ndg/security/server/wsgi/openid/provider/renderinginterface/genshi/templates/yadis.xml (modified) (1 prop)
• ndg_security_server/ndg/security/server/xacml/esgf_ext.py (modified) (1 prop)
• ndg_security_server/ndg/security/server/xacml/pip/__init__.py (modified) (1 diff, 1 prop)
• ndg_security_server/ndg/security/server/xacml/pip/saml_pip.py (modified) (1 prop)
• ndg_security_test/ndg/security/test/config/authorisationservice/authorisation-service.ini (modified) (1 prop)
• ndg_security_test/ndg/security/test/config/authorisationservice/pip-mapping.txt (modified) (1 prop)
• ndg_security_test/ndg/security/test/config/authorisationservice/pki/ca/d573507a.0 (modified) (1 prop)
• ndg_security_test/ndg/security/test/config/authorisationservice/pki/localhost.crt (modified) (1 prop)
• ndg_security_test/ndg/security/test/config/authorisationservice/pki/localhost.key (modified) (1 prop)
• ndg_security_test/ndg/security/test/config/authorisationservice/policy.xml (modified) (1 prop)
• ndg_security_test/ndg/security/test/config/pki/ca/d573507a.0 (modified) (1 prop)
• ndg_security_test/ndg/security/test/config/pki/localhost-cert.der (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/config/pki/localhost-key.der (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/integration/full_system/openidprovider/templates/__init__.py (modified) (1 diff, 1 prop)
• ndg_security_test/ndg/security/test/integration/full_system/openidprovider/templates/base.html (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/full_system/openidprovider/templates/decide.html (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/full_system/openidprovider/templates/error.html (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/full_system/openidprovider/templates/identity.html (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/full_system/openidprovider/templates/login.html (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/full_system/openidprovider/templates/main.html (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/full_system/openidprovider/templates/serveryadis.xml (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/full_system/openidprovider/templates/yadis.xml (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/full_system/pip-mapping.txt (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/full_system/policy.xml (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/attributeexchange.csv (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file/6 (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file/6/61 (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file/6/61/61e06269640f244062ea3b4f81ef656a.cache (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file/c (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file/c/c3 (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file/c/c3/c3a46e80ce1be95c3ffeefef10f6ceae.cache (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file_lock (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file_lock/0 (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file_lock/0/08 (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file_lock/0/08/08198994654d86de63ab5c9834b72b5ff15b5eab.lock (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file_lock/8 (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file_lock/8/89 (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/beaker/sessions/container_file_lock/8/89/8967fba3028abbe035ce45613299c7b7f4394633.lock (added)
• ndg_security_test/ndg/security/test/integration/openidprovider/openidrelyingparty.ini (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/openidrelyingparty.py (modified) (1 diff, 1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/public/js/toggleDiv.js (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/public/layout/CEDA_RightButton60.png (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/integration/openidprovider/public/layout/NERC_Logo.gif (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/integration/openidprovider/public/layout/NERC_Logo_Swindon.gif (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/integration/openidprovider/public/layout/badc logo_sm.jpg (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/integration/openidprovider/public/layout/badc_logo4ndg.jpg (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/integration/openidprovider/public/layout/default.css (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/public/layout/icons/help.png (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/integration/openidprovider/public/layout/ndg_logo_circle.gif (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/integration/openidprovider/public/layout/neodc_logo4ndg.jpg (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/integration/openidprovider/public/layout/openid-inputicon.gif (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/integration/openidprovider/public/layout/stfc-circle-sm.gif (modified) (1 prop) (previous)
• ndg_security_test/ndg/security/test/integration/openidprovider/templates/__init__.py (modified) (1 diff, 1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/templates/base.html (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/templates/decide.html (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/templates/error.html (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/templates/identity.html (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/templates/login.html (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/templates/main.html (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/templates/serveryadis.xml (modified) (1 prop)
• ndg_security_test/ndg/security/test/integration/openidprovider/templates/yadis.xml (modified) (1 prop)
• ndg_security_test/ndg/security/test/unit/authz/xacml/__init__.py (modified) (1 prop)
• ndg_security_test/ndg/security/test/unit/authz/xacml/pip-mapping.txt (modified) (1 prop)
• ndg_security_test/ndg/security/test/unit/authz/xacml/saml_ctx_handler.cfg (modified) (1 prop)
• ndg_security_test/ndg/security/test/unit/authz/xacml/saml_pip.cfg (modified) (1 prop)
• ndg_security_test/ndg/security/test/unit/authz/xacml/test_saml_ctx_handler.py (modified) (1 prop)
• ndg_security_test/ndg/security/test/unit/authz/xacml/test_saml_pip.py (modified) (1 prop)
• ndg_security_test/ndg/security/test/unit/paster_templates/__init__.py (modified) (1 prop)
• ndg_security_test/ndg/security/test/unit/paster_templates/test_paster_templates.py (modified) (1 prop)
• ndg_security_test/ndg/security/test/unit/wsgi/authz/request-filter.xml (modified) (1 prop)
• ndg_security_test/ndg/security/test/unit/wsgi/client_proxy/__init__.py (modified) (1 prop)
• ndg_security_test/ndg/security/test/unit/wsgi/client_proxy/test_client_proxy.py (modified) (1 prop)

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/paster_templates/Makefile

@@ -88 +88 @@
         @-echo Removing unneeded XRD entries ...
         sed -r -e /'<Service priority=\"(1|19|30|20)\">'/,/'<XRD>'/d \
-        -e s/'<XRD>'/'%%\{extraXrdEntries}\n    <XRD>'/ \
+        -e s/'<XRD>'/'%%\{serveryadisExtraXrdEntries}\n    <XRD>'/ \
                 ${SERVICE_OP_SERVER_YADIS_TMPL_FILEPATH_TMP} > \
                 ${SERVICE_OP_SERVER_YADIS_TMPL_FILEPATH}
         rm -f ${SERVICE_OP_SERVER_YADIS_TMPL_FILEPATH_TMP}
         sed -r -e /'<Service priority=\"(1|19|30|20)\">'/,/'<XRD>'/d \
-        -e s/'<XRD>'/'%%\{extraXrdEntries}\n    <XRD>'/ \
+        -e s/'<XRD>'/'%%\{yadisExtraXrdEntries}\n    <XRD>'/ \
                 ${SERVICE_OP_YADIS_TMPL_FILEPATH_TMP} > \
                 ${SERVICE_OP_YADIS_TMPL_FILEPATH}
@@ -239 +239 @@
         @-echo Making substitutions for Yadis templates ...
         sed -r -e /'<Service priority=\"(1|19|30|20)\">'/,/'<XRD>'/d \
-        -e s/'<XRD>'/'%%\{extraXrdEntries}\n    <XRD>'/ \
+        -e s/'<XRD>'/'%%\{serveryadisExtraXrdEntries}\n    <XRD>'/ \
                 ${OP_SERVER_YADIS_TMPL_FILEPATH_TMP} > \
                 ${OP_SERVER_YADIS_TMPL_FILEPATH}
         rm -f ${OP_SERVER_YADIS_TMPL_FILEPATH_TMP}
         sed -r -e /'<Service priority=\"(1|19|30|20)\">'/,/'<XRD>'/d \
-        -e s/'<XRD>'/'%%\{extraXrdEntries}\n    <XRD>'/ \
+        -e s/'<XRD>'/'%%\{yadisExtraXrdEntries}\n    <XRD>'/ \
                 ${OP_YADIS_TMPL_FILEPATH_TMP} > \
                 ${OP_YADIS_TMPL_FILEPATH}

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/paster_templates/openidprovider/templates/serveryadis.xml_tmpl

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">
-    %%{extraXrdEntries}
+    %%{serveryadisExtraXrdEntries}
     <XRD>
         <Service priority="0">

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/paster_templates/openidprovider/templates/yadis.xml_tmpl

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">
-    %%{extraXrdEntries}
+    %%{yadisExtraXrdEntries}
     <XRD>
         <Service priority="0">

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/paster_templates/services/openidprovider/templates/serveryadis.xml_tmpl

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">
-    %%{extraXrdEntries}
+    %%{serveryadisExtraXrdEntries}
     <XRD>
         <Service priority="0">

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/paster_templates/services/openidprovider/templates/yadis.xml_tmpl

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">
-    %%{extraXrdEntries}
+    %%{yadisExtraXrdEntries}
     <XRD>
         <Service priority="0">

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/paster_templates/template.py

@@ -36 +36 @@
     delimiter = "%%"
 
-_MYPROXY_SERVER_LOCALID_XRD_ENTRY_TMPL = """<XRD>
+
+"""@var _MYPROXY_SERVER_LOCALID_XRD_ENTRY_TMPL: Yadis XRDS entry for a MyProxy
+server endpoint.  This entry also include a localID $user_url which the OpenID
+Provider application code will fill out at runtime.
+@type _MYPROXY_SERVER_LOCALID_XRD_ENTRY_TMPL: ndg.security.server.paster_templates.template.DoublePercentTemplate
+"""
+_MYPROXY_SERVER_LOCALID_XRD_ENTRY_TMPL = DoublePercentTemplate("""<XRD>
         <Service priority="10">
             <Type>urn:esg:security:myproxy-service</Type>
@@ -43 +49 @@
         </Service>
     </XRD>
+""")
+
+"""@var _ATTRIBUTE_SERVICE_LOCALID_XRD_ENTRY_TMPL: Yadis XRDS entry for an
+Attribute Service endpoint.  This entry also include a localID $user_url which 
+the OpenID Provider application code will fill out at runtime.
+@type _ATTRIBUTE_SERVICE_LOCALID_XRD_ENTRY_TMPL: ndg.security.server.paster_templates.template.DoublePercentTemplate
 """
-
-_ATTRIBUTE_SERVICE_LOCALID_XRD_ENTRY_TMPL = """<XRD>
+_ATTRIBUTE_SERVICE_LOCALID_XRD_ENTRY_TMPL = DoublePercentTemplate("""<XRD>
         <Service priority="20">
             <Type>urn:esg:security:attribute-service</Type>
@@ -53 +64 @@
         </Service>
     </XRD>
+""")
+
+"""@var _MYPROXY_SERVER_NONLOCALID_XRD_ENTRY_TMPL: Yadis XRDS entry for a 
+MyProxy server endpoint.  No localID entry is included as this template is for 
+use with the serveryadis.xml_tmpl which applies to requests where the specific 
+identity is not provided.
+@type _MYPROXY_SERVER_NONLOCALID_XRD_ENTRY_TMPL: ndg.security.server.paster_templates.template.DoublePercentTemplate
 """
-
-_MYPROXY_SERVER_NONLOCALID_XRD_ENTRY_TMPL = """<XRD>
+_MYPROXY_SERVER_NONLOCALID_XRD_ENTRY_TMPL = DoublePercentTemplate("""<XRD>
         <Service priority="10">
             <Type>urn:esg:security:myproxy-service</Type>
@@ -61 +78 @@
         </Service>
     </XRD>
+""")
+
+"""@var _ATTRIBUTE_SERVICE_NONLOCALID_XRD_ENTRY_TMPL: Yadis XRDS entry for an
+Attribute Service endpoint.  No localID entry is included as this template is 
+for use with the serveryadis.xml_tmpl which applies to requests where the 
+specific identity is not provided.
+@type _ATTRIBUTE_SERVICE_NONLOCALID_XRD_ENTRY_TMPL: ndg.security.server.paster_templates.template.DoublePercentTemplate
 """
-
-_ATTRIBUTE_SERVICE_NONLOCALID_XRD_ENTRY_TMPL = """<XRD>
+_ATTRIBUTE_SERVICE_NONLOCALID_XRD_ENTRY_TMPL = DoublePercentTemplate("""<XRD>
         <Service priority="20">
             <Type>urn:esg:security:attribute-service</Type>
@@ -69 +92 @@
         </Service>
     </XRD>
-"""
+""")
 
 
@@ -193 +216 @@
     def pre(self, command, output_dir, vars):
         '''Extend to enable substitutions for OpenID Provider Yadis templates'''  
-        vars['extraXrdEntries'] = ''
+        
+        vars['yadisExtraXrdEntries'] = ''
+        vars['serveryadisExtraXrdEntries'] = ''
         
         attributeServiceURI = vars['baseURI'] + vars[
                                 'attributeServiceMountPoint'].lstrip('/')
         
+        # Attribute Service entry added if flag was set
         if vars['includeAttributeServiceInYadis']:
-            attributeServiceEntryTmpl = DoublePercentTemplate(
-                            self.__class__.ATTRIBUTE_SERVICE_XRD_ENTRY_TMPL)
-            vars['extraXrdEntries'] += attributeServiceEntryTmpl.substitute(
-                            attributeServiceURI=attributeServiceURI)
+            # yadis.xml_tmpl entry
+            vars['yadisExtraXrdEntries'
+                 ] += _ATTRIBUTE_SERVICE_LOCALID_XRD_ENTRY_TMPL.substitute(
+                        attributeServiceURI=attributeServiceURI)
+
+            # serveryadis.xml_tmpl entry
+            vars['serveryadisExtraXrdEntries'
+                 ] += _ATTRIBUTE_SERVICE_NONLOCALID_XRD_ENTRY_TMPL.substitute(
+                        attributeServiceURI=attributeServiceURI)
 
         del vars['includeAttributeServiceInYadis']
+        
+        # MyProxy Server entry added if an endpoint was specified
         if vars['myproxyServerURI']:
-            myProxyServerEntryTmpl = DoublePercentTemplate(
-                            self.__class__.MYPROXY_SERVER_XRD_ENTRY_TMPL)
-            vars['extraXrdEntries'] += myProxyServerEntryTmpl.substitute(
-                            myproxyServerURI=vars['myproxyServerURI'])
-        
+            # yadis.xml_tmpl entry
+            vars['yadisExtraXrdEntries'
+                 ] += _MYPROXY_SERVER_LOCALID_XRD_ENTRY_TMPL.substitute(
+                            myproxyServerURI=vars['myproxyServerURI'])        
+            
+            vars['serveryadisExtraXrdEntries'
+                 ] += _MYPROXY_SERVER_NONLOCALID_XRD_ENTRY_TMPL.substitute(
+                        myproxyServerURI=vars['myproxyServerURI'])
         del vars['myproxyServerURI']   
+        
         super(ServicesTemplate, self).pre(command, output_dir, vars)
 
@@ -359 +396 @@
         vars['serveryadisExtraXrdEntries'] = ''
         
+        # Attribute Service entry added if an endpoint was specified
         if vars['attributeServiceURI']:
-            attributeServiceEntryTmpl = DoublePercentTemplate(
-                            self.__class__.MYPROXY_SERVER_LOCALID_XRD_ENTRY_TMPL)
-            vars['extraXrdEntries'] += attributeServiceEntryTmpl.substitute(
-                            attributeServiceURI=vars['attributeServiceURI'])
+            # yadis.xml_tmpl entry
+            vars['yadisExtraXrdEntries'
+                 ] += _ATTRIBUTE_SERVICE_LOCALID_XRD_ENTRY_TMPL.substitute(
+                        attributeServiceURI=vars['attributeServiceURI'])
+
+            # serveryadis.xml_tmpl entry
+            vars['serveryadisExtraXrdEntries'
+                 ] += _ATTRIBUTE_SERVICE_NONLOCALID_XRD_ENTRY_TMPL.substitute(
+                        attributeServiceURI=vars['attributeServiceURI'])
 
         del vars['attributeServiceURI']
+        
         if vars['myproxyServerURI']:
-            myProxyServerEntryTmpl = DoublePercentTemplate(
-                            self.__class__.MYPROXY_SERVER_XRD_ENTRY_TMPL)
-            vars['extraXrdEntries'] += myProxyServerEntryTmpl.substitute(
-                            myproxyServerURI=vars['myproxyServerURI'])
-        
-        del vars['myproxyServerURI']   
+            # yadis.xml_tmpl entry
+            vars['yadisExtraXrdEntries'
+                 ] += _MYPROXY_SERVER_LOCALID_XRD_ENTRY_TMPL.substitute(
+                            myproxyServerURI=vars['myproxyServerURI'])        
+            
+            vars['serveryadisExtraXrdEntries'
+                 ] += _MYPROXY_SERVER_NONLOCALID_XRD_ENTRY_TMPL.substitute(
+                        myproxyServerURI=vars['myproxyServerURI'])
+                         
+        del vars['myproxyServerURI']  
+         
         super(OpenIDProviderTemplate, self).pre(command, output_dir, vars)
 

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/xacml/pip/__init__.py

@@ -6 +6 @@
 __license__ = "BSD - see LICENSE file in top-level directory"
 __contact__ = "Philip.Kershaw@stfc.ac.uk"
-__revision__ = '$Id: $'
+__revision__ = '$Id$'

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/full_system/openidprovider/templates/__init__.py

@@ -8 +8 @@
 __license__ = "BSD - see LICENSE file in top-level directory"
 __contact__ = "Philip.Kershaw@stfc.ac.uk"
-__revision__ = '$Id: __init__.py 7077 2010-06-24 15:38:19Z pjkersha $'
+__revision__ = '$Id$'

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/openidprovider/openidrelyingparty.py

@@ -10 +10 @@
 __license__ = "BSD - See top-level directory for LICENSE file"
 __contact__ = "Philip.Kershaw@stfc.ac.uk"
-__revision__ = "$Id: securedapp.py 7077 2010-06-24 15:38:19Z pjkersha $"
+__revision__ = "$Id$"
 from os import path
 import optparse

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/openidprovider/templates/__init__.py

@@ -8 +8 @@
 __license__ = "BSD - see LICENSE file in top-level directory"
 __contact__ = "Philip.Kershaw@stfc.ac.uk"
-__revision__ = '$Id: __init__.py 7077 2010-06-24 15:38:19Z pjkersha $'
+__revision__ = '$Id$'