Changeset 6628

Timestamp:

24/02/10 14:22:35 (11 years ago)

Author:

pjkersha

Message:

Merged changes up to 6557 from trunk ready for 1.5.1 release.

Location:

TI12-security/trunk/NDGSecurity/python

Files:

• .project (modified) (1 diff)
• .pydevproject (modified) (1 diff)
• ndg_security/setup.py (modified) (1 diff)
• ndg_security_client/setup.py (modified) (1 diff)
• ndg_security_common/setup.py (modified) (1 diff)
• ndg_security_server/ndg/security/server/wsgi/authn.py (modified) (1 diff)
• ndg_security_server/setup.py (modified) (1 diff)
• ndg_security_test/setup.py (modified) (1 diff)

TI12-security/trunk/NDGSecurity/python/.project

@@ -4 +4 @@
         <comment></comment>
         <projects>
-                <project>ndg_security_saml</project>
         </projects>
         <buildSpec>

TI12-security/trunk/NDGSecurity/python/.pydevproject

@@ -5 +5 @@
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/ndg_security_python/ndg_security_client</path>
-<path>/ndg_security_python/ndg_security_common</path>
-<path>/ndg_security_python/ndg_security_server</path>
-</pydev_pathproperty>
-<pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
-<path>/home/pjkersha/workspace/AuthKit/trunk</path>
-<path>/home/pjkersha/workspace/ndg_saml</path>
-</pydev_pathproperty>
 </pydev_project>

TI12-security/trunk/NDGSecurity/python/ndg_security/setup.py

@@ -42 +42 @@
 setup(
     name =                      'ndg_security',
-    version =                   '1.5',
+    version =                   '1.5.1',
     description =               'NERC DataGrid Security Utilities',
     long_description =          _longDescription,

TI12-security/trunk/NDGSecurity/python/ndg_security_client/setup.py

@@ -44 +44 @@
 setup(
     name =                      'ndg_security_client',
-    version =                   '1.5',
+    version =                   '1.5.1',
     description =               'NERC DataGrid Security Client side interface',
     long_description =          _longDescription,

TI12-security/trunk/NDGSecurity/python/ndg_security_common/setup.py

@@ -69 +69 @@
 setup(
     name =                      'ndg_security_common',
-    version =                   '1.5',
+    version =                   '1.5.1',
     description =           'NERC DataGrid Security package containing common '
                             'utilities used by both server and client '

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/wsgi/authn.py

@@ -335 +335 @@
                                      "AuthKitSSLAuthnMiddleware upstream of "
                                      "this middleware")   
-    
+    _sslAuthnSucceeded = lambda self: self.environ.get(
+                    AuthKitSSLAuthnMiddleware.AUTHN_SUCCEEDED_ENVIRON_KEYNAME,
+                    False)
+        
+    sslAuthnSucceeded = property(fget=_sslAuthnSucceeded,
+                                 doc="Boolean indicating SSL authentication "
+                                     "has succeeded in "
+                                     "AuthKitSSLAuthnMiddleware upstream of "
+                                     "this middleware")
+        
     @NDGSecurityMiddlewareBase.initCall
     def __call__(self, environ, start_response):

TI12-security/trunk/NDGSecurity/python/ndg_security_server/setup.py

@@ -64 +64 @@
 setup(
     name =                      'ndg_security_server',
-    version =                   '1.5',
+    version =                   '1.5.1',
     description =               'Server side components for running NERC DataGrid '
                             'Security Services',

TI12-security/trunk/NDGSecurity/python/ndg_security_test/setup.py

@@ -20 +20 @@
 setup(
     name =                      'ndg_security_test',
-    version =                   '1.5',
+    version =                   '1.5.1',
     description =               'NERC DataGrid Security Unit tests',
     long_description =          'Unit tests client - server side',