[java-centralized-discovery COMMIT] in /branches/REL_1/src: installer/resources/wayfconfig.xml main/java/edu/internet...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Mar 12 17:01:31 2012
New Revision: 2210

URL: http://svn.shibboleth.net/view/java-centralized-discovery?rev=2210&view=rev
Log:
SDSJ-106 Add a slew of new configuration parameters to the MetadatProvider to bring us up to date with more recent OpenSAML

Modified:
    branches/REL_1/src/installer/resources/wayfconfig.xml
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java

Modified: branches/REL_1/src/installer/resources/wayfconfig.xml
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/src/installer/resources/wayfconfig.xml?rev=2210&r1=2209&r2=2210&view=diff
==============================================================================
--- branches/REL_1/src/installer/resources/wayfconfig.xml (original)
+++ branches/REL_1/src/installer/resources/wayfconfig.xml Mon Mar 12 17:01:31 2012
@@ -53,10 +53,7 @@
             </SearchIgnore>
         </Default>
         
-<!-- The MetadataProvider is in a similar syntax to that used to
-     configure an IdP.  This means that plugins for the IdP can be
-     used interchangably between the IdP and WAYF.
-
+<!-- 
      The identifier element is used to uniquely distinguish the
      metadata in a Federation element below
      
@@ -88,6 +85,9 @@
                 identifier="White"
                 type="edu.internet2.middleware.shibboleth.metadata.provider.XMLMetadata"
                 backingFile="$DS_HOME$/metadata/whitelist_store.xml"
+                maxValidityInterval = "P7D"
+                certicateFile="$DS_HOME$/metadata/federation.pem"
+                maxValidityInterval = "P7D"    
                 url="http://metadata.ukfederation.org.uk/ukfederation-test.xml">
 
           <Filter identifier="false" 

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=2210&r1=2209&r2=2210&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 17:01:31 2012
@@ -33,8 +33,14 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
+import java.util.Timer;
 import java.util.TreeMap;
 
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.auth.AuthScope;
 import org.opensaml.saml2.metadata.EntitiesDescriptor;
 import org.opensaml.saml2.metadata.EntityDescriptor;
 import org.opensaml.saml2.metadata.IDPSSODescriptor;
@@ -43,7 +49,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.AbstractReloadingMetadataProvider;
 import org.opensaml.saml2.metadata.provider.FileBackedHTTPMetadataProvider;
 import org.opensaml.saml2.metadata.provider.FilesystemMetadataProvider;
 import org.opensaml.saml2.metadata.provider.MetadataFilter;
@@ -53,6 +59,8 @@
 import org.opensaml.saml2.metadata.provider.ObservableMetadataProvider;
 import org.opensaml.saml2.metadata.provider.RequiredValidUntilFilter;
 import org.opensaml.saml2.metadata.provider.SignatureValidationFilter;
+import org.opensaml.ws.soap.client.http.HttpClientBuilder;
+import org.opensaml.ws.soap.client.http.TLSProtocolSocketFactory;
 import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.parse.ParserPool;
 import org.opensaml.xml.security.credential.Credential;
@@ -95,6 +103,11 @@
     /** Handle for error output. */
     private static final Logger LOG = LoggerFactory.getLogger(IdPSiteSet.class.getName());
 
+    /**
+     * Time for the HTTP loading. This is one of initialized as needed.
+     */
+    private static Timer timer;
+
     /** The OpenSaml metadata source. */
     private ObservableMetadataProvider metadata;
 
@@ -140,8 +153,8 @@
         //
         // Configure the filters (before the metadata so we can add them before we start reading)
         //
-        MetadataFilterChain filterChain = makeFilterChain(element, warnOnBadBinding);
-        AbstractObservableMetadataProvider provider;
+        MetadataFilterChain filterChain = buildFilterChain(element, warnOnBadBinding);
+        AbstractReloadingMetadataProvider provider;
 
         LOG.info("Loading Metadata for " + displayName);
         try {
@@ -150,13 +163,16 @@
             if ("file".equalsIgnoreCase(url.getProtocol())) {
                 provider = new FilesystemMetadataProvider(new File(url.getFile()));
             } else {
-                provider = makeHTTPProvider(element);
+                provider = buildHTTPProvider(element, url);
             }

[... 379 lines stripped ...]