[java-centralized-discovery COMMIT] /branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Mar 12 10:25:07 2012
New Revision: 2209

URL: http://svn.shibboleth.net/view/java-centralized-discovery?rev=2209&view=rev
Log:
SDSJ-106 add manually configured certificate filtering and validUntil filtering.

Modified:
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java?rev=2209&r1=2208&r2=2209&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java Mon Mar 12 10:25:07 2012
@@ -19,8 +19,11 @@
 
 import java.io.File;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
@@ -40,6 +43,7 @@
 import org.opensaml.saml2.metadata.OrganizationName;
 import org.opensaml.saml2.metadata.RoleDescriptor;
 import org.opensaml.saml2.metadata.SPSSODescriptor;
+import org.opensaml.saml2.metadata.provider.AbstractObservableMetadataProvider;
 import org.opensaml.saml2.metadata.provider.FileBackedHTTPMetadataProvider;
 import org.opensaml.saml2.metadata.provider.FilesystemMetadataProvider;
 import org.opensaml.saml2.metadata.provider.MetadataFilter;
@@ -47,8 +51,24 @@
 import org.opensaml.saml2.metadata.provider.MetadataProvider;
 import org.opensaml.saml2.metadata.provider.MetadataProviderException;
 import org.opensaml.saml2.metadata.provider.ObservableMetadataProvider;
+import org.opensaml.saml2.metadata.provider.RequiredValidUntilFilter;
+import org.opensaml.saml2.metadata.provider.SignatureValidationFilter;
 import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.parse.ParserPool;
+import org.opensaml.xml.security.credential.Credential;
+import org.opensaml.xml.security.credential.StaticCredentialResolver;
+import org.opensaml.xml.security.keyinfo.BasicProviderKeyInfoCredentialResolver;
+import org.opensaml.xml.security.keyinfo.KeyInfoCredentialResolver;
+import org.opensaml.xml.security.keyinfo.KeyInfoProvider;
+import org.opensaml.xml.security.keyinfo.provider.DSAKeyValueProvider;
+import org.opensaml.xml.security.keyinfo.provider.InlineX509DataProvider;
+import org.opensaml.xml.security.keyinfo.provider.RSAKeyValueProvider;
+import org.opensaml.xml.security.x509.BasicX509Credential;
+import org.opensaml.xml.security.x509.X509Util;
+import org.opensaml.xml.signature.SignatureTrustEngine;
+import org.opensaml.xml.signature.impl.ExplicitKeySignatureTrustEngine;
+import org.opensaml.xml.util.DatatypeHelper;
+import org.opensaml.xml.util.XMLHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;
@@ -66,7 +86,7 @@
  * SP.
  * 
  * This class is opaque outside this file. The three static methods getSitesLists, searchForMatchingOrigins and
- * lookupIdP provide mechansims for accessing collections of IdPSiteSets.
+ * lookupIdP provide mechanisms for accessing collections of IdPSiteSets.
  * 
  */
 
@@ -99,129 +119,265 @@
     /**
      * Create a new IdPSiteSet as described by the supplied XML segment.
      * 
-     * @param el - configuration details.
+     * @param element - configuration details.
      * @param parserPool - the parsers we initialized above.
      * @param warnOnBadBinding if we just warn or give an error if an SP has bad entry points.
      * @throws ShibbolethConfigurationException - if something goes wrong.
      */
-    protected IdPSiteSet(Element el, ParserPool parserPool, boolean warnOnBadBinding)
+    protected IdPSiteSet(Element element, ParserPool parserPool, boolean warnOnBadBinding)
             throws ShibbolethConfigurationException {
 
-        String spoolSpace;
-        String delayString;
-
-        this.identifier = el.getAttribute("identifier");
-        this.displayName = el.getAttribute("displayName");
-        location = el.getAttribute("url");
-        if (null == location || location.length() == 0) {
+        identifier = element.getAttribute("identifier");
+        displayName = element.getAttribute("displayName");
+        location = DatatypeHelper.safeTrimOrNullString(element.getAttribute("url"));
+        if (null == location) {
             //
             // Sigh for a few releases this was documented as URI
             //
-            location = el.getAttribute("url");
-        }
-        spoolSpace = el.getAttribute("backingFile");
-        delayString = el.getAttribute("timeout");
+            location = element.getAttribute("url");
+        }
 
         //

[... 379 lines stripped ...]