Changeset 4146

Timestamp:

28/08/08 11:28:28 (12 years ago)

Author:

pjkersha

Message:

Fixes to server setup.py for inclusion of none .py pylons container files for egg.

Location:

TI12-security/trunk/python

Files:

• Tests/m2Crypto/httpsTest.py (modified) (2 diffs)
• Tests/m2Crypto/test_sslClntAuthN.py (added)
• ndg.security.server/ndg/security/server/pylons/development.ini (modified) (1 diff)
• ndg.security.server/ndg/security/server/wsgi/openid_provider.py (modified) (1 diff)
• ndg.security.server/setup.py (modified) (1 diff)

TI12-security/trunk/python/Tests/m2Crypto/httpsTest.py

@@ -2 +2 @@
 from M2Crypto.httpslib import HTTPSConnection
 
-#hostname = 'gabriel.badc.rl.ac.uk'
-hostname = 'grid.bodc.nerc.ac.uk'
-path = '/ndg/SessionManager'
+hostname = 'gabriel.badc.rl.ac.uk'
+#hostname = 'grid.bodc.nerc.ac.uk'
+path = '/openid'
 #
 #body = '''<SOAP-ENV:Envelope 
@@ -23 +23 @@
 
 con = HTTPSConnection(hostname)
-con.putrequest('POST', path)
+con.putrequest('GET', path)
 con.endheaders()
 resp = con.getresponse()

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

@@ -72 +72 @@
 openid_provider.path.mainpage=/openid
 openid_provider.session_middleware=beaker.session 
-openid_provider.base_url=http://localhost:8200
+#openid_provider.base_url=http://localhost:8200
 openid_provider.base_url=https://gabriel.badc.rl.ac.uk
 #openid_provider.consumer_store_dirpath=./

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

@@ -267 +267 @@
                 # Display text indicating that this is an endpoint.
                 response = self.do_mainpage(environ, start_response)
-                
+            
             # Check mode is one of "checkid_immediate", "checkid_setup"
-            if oidRequest.mode in server.BROWSER_REQUEST_MODES:
+            elif oidRequest.mode in server.BROWSER_REQUEST_MODES:
                 response = self._handleCheckIDRequest(oidRequest)
             else:

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

@@ -97 +97 @@
         'ndg.security.server.sso.sso': ['public/*.*', 'public/layout/*.*'],
         'ndg.security.server.sso.sso.templates.ndg.security': ['*.kid']},
+        'ndg.security.server.pylons': ['*.ini', '*.cfg', '*.txt'],
+        'ndg.security.server.pylons.container': ['public/*.*', 'public/layout/*.*'],
+        'ndg.security.server.pylons.container.templates.ndg.security': ['*.kid']},
     entry_points =           _entryPoints,
     test_suite =                    'ndg.security.test',