Changeset 6441 for TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test

Timestamp:

29/01/10 16:33:44 (11 years ago)

Author:

pjkersha

Message:

• Added more help links to the OpenID interfaces
• tidied up the static content settings for authz_lite integration test
• Moved version to 1.5 in readiness for new release.

Location:

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/authz_lite

Files:

• openidprovider/js (deleted)
• openidprovider/layout (deleted)
• public (moved) (moved from TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/authz_lite/openidrelyingparty/public)
• public/js (copied) (copied from TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/authz_lite/openidrelyingparty/public/js)
• public/layout/default.css (copied) (copied from TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/authz_lite/openidrelyingparty/public/layout/default.css)
• securityservices.ini (modified) (4 diffs)

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/authz_lite/securityservices.ini

@@ -35 +35 @@
 port = %(portNum)s
 
-# Provider borrows content from RP static content dir so the cascade is not
-# needed(!)
+# Uncomment and replace OpenIDProviderApp with OpenIDProviderFilterApp in the
+# pipeline below if the RelyingParty filter is removed.  The RelyingParty
+# provides static content to both it and the Provider in this configuration.
+# See the staticContentDir setting in the OpenIDRelyingPartyFilter section
 #[filter-app:OpenIDProviderFilterApp]
 #use = egg:Paste#httpexceptions
@@ -46 +48 @@
 #use = egg:Paste#cascade
 #app1 = OpenIDProviderStaticContent
-#app2 = OpenIDProviderApp
 #catch = 404
 #
@@ -123 +124 @@
 
 openid.relyingparty.baseURL = %(authkit.openid.baseurl)s
+
+# Uncomment to restrict sign in to a whitelist of trusted OpenID Providers.
 #openid.relyingparty.idpWhitelistConfigFilePath = %(here)s/openidrelyingparty/ssl-idp-validator.xml
+
 openid.relyingparty.signinInterfaceMiddlewareClass = ndg.security.server.wsgi.openid.relyingparty.signin_interface.genshi.GenshiSigninTemplate
-openid.relyingparty.signinInterface.staticContentRootDir = %(here)s/openidrelyingparty/public
+
+# Nb. in this configuration, this directory is provider static content for both 
+# this filter and the OpenID Provider app downstream in the WSGI stack.
+openid.relyingparty.signinInterface.staticContentRootDir = %(here)s/public
+
 openid.relyingparty.signinInterface.baseURL = %(openid.relyingparty.baseURL)s
 openid.relyingparty.signinInterface.initialOpenID = %(openIDProviderIDSelectURI)s
@@ -133 +141 @@
 #openid.relyingparty.signinInterface.leftLink = http://ndg.nerc.ac.uk/
 #openid.relyingparty.signinInterface.leftImage = %(openid.relyingparty.signinInterface.baseURL)s/layout/ndg_logo_circle.gif
+
+# This setting will accept HTML mark-up
 openid.relyingparty.signinInterface.footerText = This site is for test purposes only.   <a class="FooterLink" href="http://openid.net/what/" target="_blank"><small>What is OpenID?</small></a>
 openid.relyingparty.signinInterface.rightLink = http://ceda.ac.uk/