Fixed an IdP configuration schema bug.
[java-idp.git] / src / edu / internet2 / middleware / shibboleth / idp / IdPProtocolSupport.java
index 768052d..cde7985 100644 (file)
@@ -32,8 +32,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.log4j.Logger;
 import org.apache.xml.security.signature.XMLSignature;
 import org.opensaml.InvalidCryptoException;
@@ -51,12 +49,13 @@ import edu.internet2.middleware.shibboleth.aa.arp.ArpEngine;
 import edu.internet2.middleware.shibboleth.aa.arp.ArpProcessingException;
 import edu.internet2.middleware.shibboleth.aa.attrresolv.AttributeResolver;
 import edu.internet2.middleware.shibboleth.artifact.ArtifactMapper;
-import edu.internet2.middleware.shibboleth.artifact.provider.MemoryArtifactMapper;
 import edu.internet2.middleware.shibboleth.common.Credential;
 import edu.internet2.middleware.shibboleth.common.NameMapper;
 import edu.internet2.middleware.shibboleth.common.RelyingParty;
 import edu.internet2.middleware.shibboleth.common.ServiceProviderMapper;
 import edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException;
+import edu.internet2.middleware.shibboleth.common.provider.ShibbolethTrust;
+import edu.internet2.middleware.shibboleth.common.Trust;
 import edu.internet2.middleware.shibboleth.metadata.EntityDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.Metadata;
 import edu.internet2.middleware.shibboleth.metadata.MetadataException;
@@ -72,16 +71,18 @@ public class IdPProtocolSupport implements Metadata {
        private static Logger log = Logger.getLogger(IdPProtocolSupport.class.getName());
        private Logger transactionLog;
        private IdPConfig config;
-       private ArrayList fedMetadata = new ArrayList();
+       private ArrayList metadata = new ArrayList();
        private NameMapper nameMapper;
        private ServiceProviderMapper spMapper;
        private ArpEngine arpEngine;
        private AttributeResolver resolver;
        private ArtifactMapper artifactMapper;
        private Semaphore throttle;
+       private Trust trust = new ShibbolethTrust();
 
        IdPProtocolSupport(IdPConfig config, Logger transactionLog, NameMapper nameMapper, ServiceProviderMapper spMapper,
-                       ArpEngine arpEngine, AttributeResolver resolver) throws ShibbolethConfigurationException {
+                       ArpEngine arpEngine, AttributeResolver resolver, ArtifactMapper artifactMapper)
+                       throws ShibbolethConfigurationException {
 
                this.transactionLog = transactionLog;
                this.config = config;
@@ -90,21 +91,12 @@ public class IdPProtocolSupport implements Metadata {
                spMapper.setMetadata(this);
                this.arpEngine = arpEngine;
                this.resolver = resolver;
-               // TODO make this pluggable... and clean up memory impl
-               artifactMapper = new MemoryArtifactMapper();
+               this.artifactMapper = artifactMapper;
 
                // Load a semaphore that throttles how many requests the IdP will handle at once
                throttle = new Semaphore(config.getMaxThreads());
        }
 
-       public static void validateEngineData(HttpServletRequest req) throws InvalidClientDataException {
-
-               // TODO this should be pulled out into handlers
-
-               if ((req.getRemoteAddr() == null) || (req.getRemoteAddr().equals(""))) { throw new InvalidClientDataException(
-                               "Unable to obtain client address."); }
-       }
-
        public Logger getTransactionLog() {
 
                return transactionLog;
@@ -129,9 +121,8 @@ public class IdPProtocolSupport implements Metadata {
                        SAMLException {
 
                if (relyingParty.getIdentityProvider().getSigningCredential() == null
-                               || relyingParty.getIdentityProvider().getSigningCredential().getPrivateKey() == null) {
-                       // TODO error out
-               }
+                               || relyingParty.getIdentityProvider().getSigningCredential().getPrivateKey() == null) { throw new InvalidCryptoException(
+                               SAMLException.RESPONDER, "Invalid signing credential."); }
 
                for (int i = 0; i < assertions.length; i++) {
                        String assertionAlgorithm;
@@ -159,10 +150,8 @@ public class IdPProtocolSupport implements Metadata {
 
                // Make sure we have an appropriate credential
                if (relyingParty.getIdentityProvider().getSigningCredential() == null
-                               || relyingParty.getIdentityProvider().getSigningCredential().getPrivateKey() == null) {
-
-                       // TODO error
-               }
+                               || relyingParty.getIdentityProvider().getSigningCredential().getPrivateKey() == null) { throw new InvalidCryptoException(
+                               SAMLException.RESPONDER, "Invalid signing credential."); }
 
                // Sign the response
                String responseAlgorithm;
@@ -183,29 +172,29 @@ public class IdPProtocolSupport implements Metadata {
                }
        }
 
-       protected void addFederationProvider(Element element) {
+       protected void addMetadataProvider(Element element) {
 
-               log.debug("Found Federation Provider configuration element.");
-               if (!element.getTagName().equals("FederationProvider")) {
-                       log.error("Error while attemtping to load Federation Provider.  Malformed provider specificaion.");
+               log.debug("Found Metadata Provider configuration element.");
+               if (!element.getTagName().equals("MetadataProvider")) {
+                       log.error("Error while attemtping to load Metadata Provider.  Malformed provider specificaion.");
                        return;
                }
 
                try {
-                       fedMetadata.add(FederationProviderFactory.loadProvider(element));
+                       metadata.add(MetadataProviderFactory.loadProvider(element));
                } catch (MetadataException e) {
-                       log.error("Unable to load Federation Provider.  Skipping...");
+                       log.error("Unable to load Metadata Provider.  Skipping...");
                }
        }
 
        public int providerCount() {
 
-               return fedMetadata.size();
+               return metadata.size();
        }
 
        public EntityDescriptor lookup(String providerId) {
 
-               Iterator iterator = fedMetadata.iterator();
+               Iterator iterator = metadata.iterator();
                while (iterator.hasNext()) {
                        EntityDescriptor provider = ((Metadata) iterator.next()).lookup(providerId);
                        if (provider != null) { return provider; }
@@ -215,7 +204,7 @@ public class IdPProtocolSupport implements Metadata {
 
        public EntityDescriptor lookup(Artifact artifact) {
 
-               Iterator iterator = fedMetadata.iterator();
+               Iterator iterator = metadata.iterator();
                while (iterator.hasNext()) {
                        EntityDescriptor provider = ((Metadata) iterator.next()).lookup(artifact);
                        if (provider != null) { return provider; }
@@ -282,6 +271,11 @@ public class IdPProtocolSupport implements Metadata {
                return artifactMapper;
        }
 
+       public Trust getTrust() {
+
+               return trust;
+       }
+
        private class Semaphore {
 
                private int value;