Changeset 7708

Timestamp:

05/11/10 12:15:26 (9 years ago)

Author:

pjkersha

Message:

2.1.0

ESGF Group/Role? AttributeValue? integrated into SAML Attribute Queries and XACML Policy. This will enable queries to the PCMDI attribute service for CMIP5 roles.

Location:

TI12-security/trunk/NDGSecurity/python

Files:

• Tests/esg_integration/test_attributeserviceclient.cfg (modified) (1 diff)
• ndg_security/setup.cfg (modified) (1 diff)
• ndg_security/setup.py (modified) (1 diff)
• ndg_security_client/setup.cfg (modified) (1 diff)
• ndg_security_client/setup.py (modified) (1 diff)
• ndg_security_common/setup.cfg (modified) (1 diff)
• ndg_security_common/setup.py (modified) (2 diffs)
• ndg_security_common_utils_openid_dbinterface/setup.cfg (modified) (1 diff)
• ndg_security_server/ndg/security/server/wsgi/openid/relyingparty/__init__.py (modified) (1 diff)
• ndg_security_server/ndg/security/server/xacml/pip/saml_pip.py (modified) (2 diffs)
• ndg_security_server/setup.cfg (modified) (1 diff)
• ndg_security_server/setup.py (modified) (1 diff)
• ndg_security_test/ndg/security/test/integration/full_system/securedapp.ini (modified) (1 diff)
• ndg_security_test/ndg/security/test/integration/full_system/securityservices.ini (modified) (1 diff)
• ndg_security_test/setup.cfg (modified) (1 diff)
• ndg_security_test/setup.py (modified) (2 diffs)

TI12-security/trunk/NDGSecurity/python/Tests/esg_integration/test_attributeserviceclient.cfg

@@ -64 +64 @@
 
 # SSL Context Proxy settings
-attributeQuery.sslCACertDir = %(here)s/esg_trusted_certificates
+#attributeQuery.sslCACertDir = %(here)s/esg_trusted_certificates
 #attributeQuery.sslCertFilePath = %(here)s/pki/test.crt
 #attributeQuery.sslPriKeyFilePath = %(here)s/pki/test.key

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

@@ -18 +18 @@
 
 [egg_info]
-tag_build = rc1 
+#tag_build = rc1 
 #tag_svn_revision = true
 

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

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

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

@@ -16 +16 @@
 
 [egg_info]
-tag_build = rc1 
+#tag_build = rc1 
 #tag_svn_revision = true
 

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

@@ -46 +46 @@
 setup(
     name =                      'ndg_security_client',
-    version =                   '2.0.1',
+    version =                   '2.1.0',
     description =               'NERC DataGrid Security Client side interface',
     long_description =          _longDescription,

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

@@ -16 +16 @@
 
 [egg_info]
-tag_build = rc1 
+#tag_build = rc1 
 #tag_svn_revision = true
 

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

@@ -18 +18 @@
 from setuptools import setup, find_packages
 
-import os, sys
+import sys
 
 # Packages needed for NDG Security
 # Note commented out ones fail with PyPI - use explicit link instead
-# TODO: subdivide these into server and client specific and comon dependencies
 _pkgDependencies = [
     'M2Crypto',
@@ -59 +58 @@
 setup(
     name =                      'ndg_security_common',
-    version =                   '2.0.1',
+    version =                   '2.1.0',
     description =           'NERC DataGrid Security package containing common '
                             'utilities used by both server and client '

TI12-security/trunk/NDGSecurity/python/ndg_security_common_utils_openid_dbinterface/setup.cfg

@@ -9 +9 @@
 # BSD - See LICENCE file for details
 [egg_info]
-#tag_build = rc1
+##tag_build = rc1
 #tag_svn_revision = true
 

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/wsgi/openid/relyingparty/__init__.py

@@ -125 +125 @@
                                    objectType=SigninInterface, 
                                    classArgs=(app, global_conf),
-                                   classProperties=classProperties)            
+                                   classProperties=classProperties)
             
             # Delete sign in interface middleware settings

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

@@ -452 +452 @@
         # Check for cached attributes for this subject (i.e. user)        
         # If none found send a query to the attribute authority
+        assertions = None
+        attributeIdFoundInCache = False
         if self.cacheSessions:
             attributeIdFoundInCache = False
@@ -466 +468 @@
                                 attributeIdFoundInCache = True
                                 break
-        else:
-            attributeIdFoundInCache = False
             
         if not attributeIdFoundInCache:

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

@@ -15 +15 @@
 
 [egg_info]
-tag_build = rc1 
+#tag_build = rc1 
 #tag_svn_revision = true
 

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

@@ -66 +66 @@
 setup(
     name =                      'ndg_security_server',
-    version =                   '2.0.1',
+    version =                   '2.1.0',
     description =               'Server side components for running NERC DataGrid '
                             'Security Services',

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/full_system/securedapp.ini

@@ -148 +148 @@
 
 [formatter_generic]
-format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s:%(lineno)s] %(message)s
+format = %(asctime)s.%(msecs)03d %(levelname)-7.7s [%(name)s:%(lineno)s] %(message)s
 datefmt = %Y-%m-%d-%H:%M:%S
 

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

@@ -505 +505 @@
 
 [formatter_generic]
-format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s:%(lineno)s] %(message)s
+format = %(asctime)s.%(msecs)03d %(levelname)-7.7s [%(name)s:%(lineno)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
 

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

@@ -9 +9 @@
 # BSD - See LICENCE file for details
 [egg_info]
-tag_build = rc1 
+#tag_build = rc1 
 #tag_svn_revision = true
 

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

@@ -15 +15 @@
 use_setuptools()
 from setuptools import setup, find_packages
-import os
-   
+  
 _longDescription = """\
 Unit and integration tests package for NDG Security
@@ -43 +42 @@
 setup(
     name =                      'ndg_security_test',
-    version =                   '2.0.1',
+    version =                   '2.1.0',
     description =               'NERC DataGrid Security Unit and Integration tests',
     long_description =          _longDescription,