Extracted unneeded legacy code.
authorwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Fri, 8 Sep 2006 15:51:27 +0000 (15:51 +0000)
committerwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Fri, 8 Sep 2006 15:51:27 +0000 (15:51 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2016 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

13 files changed:
data/idp/blackbox/conf/SPRelyingParty/idp.xml
data/idp/blackbox/conf/constraints/idp.xml
data/idp/blackbox/conf/groupRelyingParty/idp.xml
data/idp/blackbox/conf/multipleNameMappers/idp.xml
data/idp/blackbox/conf/passThruErrors/idp.xml
data/idp/blackbox/conf/signAssertions/idp.xml
data/idp/blackbox/conf/ssoPost/idp.xml
data/idp/blackbox/conf/standard/idp.xml
src/conf/dist.idp.xml
src/edu/internet2/middleware/shibboleth/common/RelyingParty.java
src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java
src/edu/internet2/middleware/shibboleth/idp/IdPConfig.java
src/schemas/shibboleth-idpconfig-1.0.xsd

index 0c432a4..2e42168 100644 (file)
@@ -6,7 +6,6 @@
     xmlns:name="urn:mace:shibboleth:namemapper:1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:mace:shibboleth:idp:config:1.0 shibboleth-idpconfig-1.0.xsd"
-    AAUrl="https://idp.example.org/shibboleth-idp/AA"
     resolverConfig="$IDP_HOME$/etc/resolver.xml"
     defaultRelyingParty="urn:x-shibtest:IdP:defaultRelyingParty"
     providerId="urn:x-shibtest:IdP">
index 7d61c3f..336d8f3 100644 (file)
@@ -6,7 +6,6 @@
     xmlns:name="urn:mace:shibboleth:namemapper:1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:mace:shibboleth:idp:config:1.0 shibboleth-idpconfig-1.0.xsd"
-    AAUrl="https://idp.example.org/shibboleth-idp/AA"
     resolverConfig="$IDP_HOME$/etc/resolver.xml"
     defaultRelyingParty="urn:x-shibtest:IdP:defaultRelyingParty"
     providerId="urn:x-shibtest:IdP">
index faa0800..0b908d5 100644 (file)
@@ -6,7 +6,6 @@
     xmlns:name="urn:mace:shibboleth:namemapper:1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:mace:shibboleth:idp:config:1.0 shibboleth-idpconfig-1.0.xsd"
-    AAUrl="https://idp.example.org/shibboleth-idp/AA"
     resolverConfig="$IDP_HOME$/etc/resolver.xml"
     defaultRelyingParty="urn:x-shibtest:IdP:defaultRelyingParty"
     providerId="urn:x-shibtest:IdP">
index 7d61c3f..336d8f3 100644 (file)
@@ -6,7 +6,6 @@
     xmlns:name="urn:mace:shibboleth:namemapper:1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:mace:shibboleth:idp:config:1.0 shibboleth-idpconfig-1.0.xsd"
-    AAUrl="https://idp.example.org/shibboleth-idp/AA"
     resolverConfig="$IDP_HOME$/etc/resolver.xml"
     defaultRelyingParty="urn:x-shibtest:IdP:defaultRelyingParty"
     providerId="urn:x-shibtest:IdP">
index cc038dc..47d1016 100644 (file)
@@ -6,7 +6,6 @@
     xmlns:name="urn:mace:shibboleth:namemapper:1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:mace:shibboleth:idp:config:1.0 shibboleth-idpconfig-1.0.xsd"
-    AAUrl="https://idp.example.org/shibboleth-idp/AA"
     resolverConfig="$IDP_HOME$/etc/resolver.xml"
     defaultRelyingParty="urn:x-shibtest:IdP:defaultRelyingParty"
     providerId="urn:x-shibtest:IdP"
index 55a2b50..b9a0380 100644 (file)
@@ -6,7 +6,6 @@
     xmlns:name="urn:mace:shibboleth:namemapper:1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:mace:shibboleth:idp:config:1.0 shibboleth-idpconfig-1.0.xsd"
-    AAUrl="https://idp.example.org/shibboleth-idp/AA"
     resolverConfig="$IDP_HOME$/etc/resolver.xml"
     defaultRelyingParty="urn:x-shibtest:IdP:defaultRelyingParty"
     providerId="urn:x-shibtest:IdP">
index 7d61c3f..336d8f3 100644 (file)
@@ -6,7 +6,6 @@
     xmlns:name="urn:mace:shibboleth:namemapper:1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:mace:shibboleth:idp:config:1.0 shibboleth-idpconfig-1.0.xsd"
-    AAUrl="https://idp.example.org/shibboleth-idp/AA"
     resolverConfig="$IDP_HOME$/etc/resolver.xml"
     defaultRelyingParty="urn:x-shibtest:IdP:defaultRelyingParty"
     providerId="urn:x-shibtest:IdP">
index 7d61c3f..336d8f3 100644 (file)
@@ -6,7 +6,6 @@
     xmlns:name="urn:mace:shibboleth:namemapper:1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:mace:shibboleth:idp:config:1.0 shibboleth-idpconfig-1.0.xsd"
-    AAUrl="https://idp.example.org/shibboleth-idp/AA"
     resolverConfig="$IDP_HOME$/etc/resolver.xml"
     defaultRelyingParty="urn:x-shibtest:IdP:defaultRelyingParty"
     providerId="urn:x-shibtest:IdP">
index 646b4cf..ee6d6f8 100644 (file)
@@ -8,7 +8,6 @@
        xmlns:name="urn:mace:shibboleth:namemapper:1.0" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
        xsi:schemaLocation="urn:mace:shibboleth:idp:config:1.0 ../schemas/shibboleth-idpconfig-1.0.xsd" 
-       AAUrl="https://idp.example.org:8443/shibboleth-idp/AA" 
        resolverConfig="$IDP_HOME$/etc/resolver.xml"
        defaultRelyingParty="urn:mace:shibboleth:examples" 
        providerId="https://idp.example.org/shibboleth">
index 3016def..60e745d 100644 (file)
@@ -17,7 +17,6 @@
 package edu.internet2.middleware.shibboleth.common;
 
 import java.net.URI;
-import java.net.URL;
 
 /**
  * Defines a relationship between service providers and an identity provider. In Shibboleth parlance, a relying party
@@ -52,14 +51,6 @@ public interface RelyingParty extends ServiceProvider {
        public String[] getNameMapperIds();
 
        /**
-        * Returns the location of the Shibboleth Attribute Authority that should answer requests for this
-        * {@link RelyingParty}.
-        * 
-        * @return the URL
-        */
-       public URL getAAUrl();
-
-       /**
         * The authentication method that should be included in assertions to the {@link RelyingParty}, if one is not found
         * in HTTP request headers.
         * 
index add4a87..414136b 100644 (file)
 
 package edu.internet2.middleware.shibboleth.common;
 
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -220,7 +218,6 @@ public class ServiceProviderMapper {
                private RelyingPartyIdentityProvider identityProvider;
                private String name;
                private String overridenIdPProviderId;
-               private URL overridenAAUrl;
                private URI overridenDefaultAuthMethod;
                private List<String> mappingIds = new ArrayList<String>();
                private IdPConfig configuration;
@@ -255,17 +252,6 @@ public class ServiceProviderMapper {
                                overridenIdPProviderId = attribute;
                        }
 
-                       attribute = ((Element) partyConfig).getAttribute("AAUrl");
-                       if (attribute != null && !attribute.equals("")) {
-                               log.debug("Overriding AAUrl for Relying Pary (" + name + ") with (" + attribute + ").");
-                               try {
-                                       overridenAAUrl = new URL(attribute);
-                               } catch (MalformedURLException e) {
-                                       log.error("(AAUrl) attribute to is not a valid URL.");
-                                       throw new ServiceProviderMapperException("Configuration is invalid.");
-                               }
-                       }
-
                        attribute = ((Element) partyConfig).getAttribute("defaultAuthMethod");
                        if (attribute != null && !attribute.equals("")) {
                                log.debug("Overriding defaultAuthMethod for Relying Pary (" + name + ") with (" + attribute + ").");
@@ -345,7 +331,7 @@ public class ServiceProviderMapper {
 
                        attribute = ((Element) partyConfig).getAttribute("preferredArtifactType");
                        if (attribute != null && !attribute.equals("")) {
-                               log.debug("Overriding AAUrl for Relying Pary (" + name + ") with (" + attribute + ").");
+                               log.debug("Overriding preferredArtifactType for Relying Pary (" + name + ") with (" + attribute + ").");
                                try {
                                        preferredArtifactType = Integer.parseInt(attribute);
                                } catch (NumberFormatException e) {
@@ -440,15 +426,6 @@ public class ServiceProviderMapper {
                        }
                }
 
-               public URL getAAUrl() {
-
-                       if (overridenAAUrl != null) {
-                               return overridenAAUrl;
-                       } else {
-                               return configuration.getAAUrl();
-                       }
-               }
-
                public boolean passThruErrors() {
 
                        if (passThruIsOverriden) {
@@ -568,11 +545,6 @@ public class ServiceProviderMapper {
                        return wrapped.getNameMapperIds();
                }
 
-               public URL getAAUrl() {
-
-                       return wrapped.getAAUrl();
-               }
-
                public URI getDefaultAuthMethod() {
 
                        return wrapped.getDefaultAuthMethod();
@@ -660,11 +632,6 @@ public class ServiceProviderMapper {
                        return wrapped.getNameMapperIds();
                }
 
-               public URL getAAUrl() {
-
-                       return wrapped.getAAUrl();
-               }
-
                public URI getDefaultAuthMethod() {
 
                        return wrapped.getDefaultAuthMethod();
@@ -733,11 +700,6 @@ public class ServiceProviderMapper {
                        return ((RelyingParty) wrapped).getNameMapperIds();
                }
 
-               public URL getAAUrl() {
-
-                       return ((RelyingParty) wrapped).getAAUrl();
-               }
-
                public URI getDefaultAuthMethod() {
 
                        return ((RelyingParty) wrapped).getDefaultAuthMethod();
index 42dcfdf..a9c5bd5 100644 (file)
 
 package edu.internet2.middleware.shibboleth.idp;
 
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 
 import org.apache.log4j.Logger;
 import org.w3c.dom.Element;
@@ -39,7 +37,6 @@ public class IdPConfig {
        private int maxThreads = 30;
        private String authHeaderName = "REMOTE_USER";
        private URI defaultAuthMethod;
-       private URL AAUrl;
 
        private static Logger log = Logger.getLogger(IdPConfig.class.getName());
 
@@ -76,18 +73,6 @@ public class IdPConfig {
                        passThruErrors = Boolean.valueOf(attribute).booleanValue();
                }
 
-               attribute = ((Element) config).getAttribute("AAUrl");
-               if (attribute == null || attribute.equals("")) {
-                       log.error("Global Attribute Authority URL not set.  Add an (AAUrl) attribute to <IdPConfig/>.");
-                       throw new ShibbolethConfigurationException("Required configuration not specified.");
-               }
-               try {
-                       AAUrl = new URL(attribute);
-               } catch (MalformedURLException e) {
-                       log.error("(AAUrl) attribute to is not a valid URL.");
-                       throw new ShibbolethConfigurationException("Required configuration is invalid.");
-               }
-
                attribute = ((Element) config).getAttribute("defaultAuthMethod");
                if (attribute == null || attribute.equals("")) {
                        try {
@@ -120,7 +105,6 @@ public class IdPConfig {
                        authHeaderName = attribute;
                }
 
-               log.debug("Global IdP config: (AAUrl) = (" + getAAUrl() + ").");
                log.debug("Global IdP config: (defaultAuthMethod) = (" + getDefaultAuthMethod() + ").");
                log.debug("Global IdP config: (maxSigningThreads) = (" + getMaxThreads() + ").");
                log.debug("Global IdP config: (authHeaderName) = (" + getAuthHeaderName() + ").");
@@ -164,9 +148,4 @@ public class IdPConfig {
 
                return defaultAuthMethod;
        }
-
-       public URL getAAUrl() {
-
-               return AAUrl;
-       }
 }
\ No newline at end of file
index 2e3dad8..515a20e 100644 (file)
@@ -50,7 +50,6 @@
                                                                <xs:attribute name="name" type="xs:string" use="required"/>
                                                                <xs:attribute name="providerId" type="xs:anyURI" use="optional"/>
                                                                <xs:attribute name="signingCredential" type="xs:string" use="optional"/>
-                                                               <xs:attribute name="AAUrl" type="xs:anyURI" use="optional"/>
                                                                <xs:attribute name="passThruErrors" type="xs:boolean" use="optional"/>
                                                                <xs:attribute name="forceAttributePush" type="xs:boolean" use="optional"/>
                                                                <xs:attribute name="signAssertions" type="xs:boolean" use="optional"/>