[java-shib-common COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 11 11:51:06 2013
New Revision: 1053

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1053&view=rev
Log:
JXT-98: support for configuring PKIX policy checking in the PKIX trust engine

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/CertPathPKIXValidationOptionsBeanDefinitionParser.java
    branches/REL_1/src/main/resources/schema/shibboleth-2.0-security.xsd

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/doc/RELEASE-NOTES.txt?rev=1053&r1=1052&r2=1053&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Mon Feb 11 11:51:06 2013
@@ -1,8 +1,9 @@
 Changes in Release 1.4.0
 =============================================
+[SC-183] - Inappropriate 'RuleReference elements within an AND rule are not supported' error
 [SIDP-559] - Attribute queries are ignoring input designators
-[SC-183] - Inappropriate 'RuleReference elements within an AND rule are not supported' error
 [JOST-200] - Reduce memory usage of unit tests
+[JXT-98] -  Add support for configuring PKIX policy checking in the PKIX trust engine 
 
 Changes in Release 1.3.6
 =============================================

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/CertPathPKIXValidationOptionsBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/CertPathPKIXValidationOptionsBeanDefinitionParser.java?rev=1053&r1=1052&r2=1053&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/CertPathPKIXValidationOptionsBeanDefinitionParser.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/CertPathPKIXValidationOptionsBeanDefinitionParser.java Mon Feb 11 11:51:06 2013
@@ -17,9 +17,13 @@
 
 package edu.internet2.middleware.shibboleth.common.config.security;
 
+import java.util.HashSet;
+import java.util.List;
+
 import javax.xml.namespace.QName;
 
 import org.opensaml.xml.security.x509.CertPathPKIXValidationOptions;
+import org.opensaml.xml.util.DatatypeHelper;
 import org.opensaml.xml.util.XMLHelper;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.w3c.dom.Attr;
@@ -30,7 +34,8 @@
 public class CertPathPKIXValidationOptionsBeanDefinitionParser extends PKIXValidationOptionsBeanDefinitionParser {
     
     /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "CertPathValidationOptionsType");
+    public static final QName SCHEMA_TYPE =
+            new QName(SecurityNamespaceHandler.NAMESPACE, "CertPathValidationOptionsType");
     
     /** {@inheritDoc} */
     protected Class getBeanClass(Element element) {
@@ -56,6 +61,23 @@
             builder.addPropertyValue("revocationEnabled", XMLHelper.getAttributeValueAsBoolean(attr));
         }
         
+        if (element.hasAttributeNS(null, "policyMappingInhibit")) {
+            Attr attr = element.getAttributeNodeNS(null, "policyMappingInhibit");
+            builder.addPropertyValue("policyMappingInhibit", XMLHelper.getAttributeValueAsBoolean(attr));
+        }
+        
+        if (element.hasAttributeNS(null, "anyPolicyInhibit")) {
+            Attr attr = element.getAttributeNodeNS(null, "anyPolicyInhibit");
+            builder.addPropertyValue("anyPolicyInhibit", XMLHelper.getAttributeValueAsBoolean(attr));
+        }
+
+        List<Element>childElems = XMLHelper.getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE,
+                "PolicyOID");
+        HashSet<String> initialPolicies = new HashSet<String>(childElems.size());
+        for (Element nameElem : childElems) {
+            initialPolicies.add(DatatypeHelper.safeTrimOrNullString(nameElem.getTextContent()));
+        }
+        builder.addPropertyValue("initialPolicies", initialPolicies);
     }
 
 }

Modified: branches/REL_1/src/main/resources/schema/shibboleth-2.0-security.xsd
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/resources/schema/shibboleth-2.0-security.xsd?rev=1053&r1=1052&r2=1053&view=diff
==============================================================================
--- branches/REL_1/src/main/resources/schema/shibboleth-2.0-security.xsd (original)
+++ branches/REL_1/src/main/resources/schema/shibboleth-2.0-security.xsd Mon Feb 11 11:51:06 2013
@@ -332,6 +332,18 @@
         </annotation>
         <complexContent>
             <extension base="sec:ValidationOptionsType">
+                <sequence>
+                    <element name="PolicyOID" type="string" minOccurs="0" maxOccurs="unbounded">
+                        <annotation>

[... 38 lines stripped ...]