make it build again

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2214 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSO.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSO.java
index 125bc7b..13b72bd 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSO.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSO.java
@@ -42,7 +42,7 @@ import edu.internet2.middleware.shibboleth.common.profile.ProfileResponse;
 import edu.internet2.middleware.shibboleth.common.relyingparty.ProfileConfiguration;
 import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
 import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfigurationManager;
-import edu.internet2.middleware.shibboleth.common.relyingparty.saml1.ShibbolethSSOConfiguration;
+import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml1.ShibbolethSSOConfiguration;
 import edu.internet2.middleware.shibboleth.idp.authn.LoginContext;
 import java.io.UnsupportedEncodingException;
 

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractAuthenticationRequest.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractAuthenticationRequest.java
index 02471da..6dcf149 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractAuthenticationRequest.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractAuthenticationRequest.java
@@ -69,8 +69,8 @@ import org.w3c.dom.Element;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileException;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileResponse;
 import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.saml2.AbstractSAML2ProfileConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.saml2.SSOConfiguration;
+import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.AbstractSAML2ProfileConfiguration;
+import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.SSOConfiguration;
 import edu.internet2.middleware.shibboleth.idp.authn.AuthenticationManager;
 import edu.internet2.middleware.shibboleth.idp.authn.LoginContext;
 import edu.internet2.middleware.shibboleth.idp.authn.Saml2LoginContext;
@@ -169,7 +169,7 @@ public abstract class AbstractAuthenticationRequest extends AbstractSAML2Profile
      *             On Error.
      */
     protected Response evaluateRequest(final AuthnRequest authnRequest,
-            final Issuer issuer, final HttpSession session,
+            String issuer, final HttpSession session,
             final RelyingPartyConfiguration relyingParty,
             final SSOConfiguration ssoConfig, final SPSSODescriptor spDescriptor)
             throws ProfileException {
@@ -279,7 +279,7 @@ public abstract class AbstractAuthenticationRequest extends AbstractSAML2Profile
      *            The SPSSODescriptor for the ssoConfig.
      */
     protected void storeRequestData(final HttpSession session,
-            final AuthnRequest authnRequest, final Issuer issuer,
+            final AuthnRequest authnRequest, String issuer,
             final RelyingPartyConfiguration relyingParty,
             final SSOConfiguration ssoConfig, final SPSSODescriptor spDescriptor) {
         
@@ -313,7 +313,7 @@ public abstract class AbstractAuthenticationRequest extends AbstractSAML2Profile
      *            Will be populated with the SPSSODescriptor for the ssoConfig.
      */
     protected void retrieveRequestData(final HttpSession session,
-            AuthnRequest authnRequest, Issuer issuer,
+            AuthnRequest authnRequest, String issuer,
             RelyingPartyConfiguration relyingParty, SSOConfiguration ssoConfig,
             SPSSODescriptor spDescriptor) {
         
@@ -324,7 +324,7 @@ public abstract class AbstractAuthenticationRequest extends AbstractSAML2Profile
         
         authnRequest = (AuthnRequest) session
                 .getAttribute(AUTHNREQUEST_SESSION_KEY);
-        issuer = (Issuer) session.getAttribute(ISSUER_SESSION_KEY);
+        issuer = (String) session.getAttribute(ISSUER_SESSION_KEY);
         relyingParty = (RelyingPartyConfiguration) session
                 .getAttribute(RPCONFIG_SESSION_KEY);
         ssoConfig = (SSOConfiguration) session
@@ -525,13 +525,13 @@ public abstract class AbstractAuthenticationRequest extends AbstractSAML2Profile
      *             on error.
      */
     protected void verifyAuthnRequest(final AuthnRequest authnRequest,
-            Issuer issuer, final RelyingPartyConfiguration relyingParty,
+            String issuer, final RelyingPartyConfiguration relyingParty,
             final HttpSession session) throws AuthenticationRequestException {
         
         Status failureStatus;
         
         // Check if we are in scope to handle this AuthnRequest
-        checkScope(authnRequest, issuer.getSPProvidedID());
+        checkScope(authnRequest, issuer);
         
         // XXX: run signature checks on authnRequest
         

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AuthenticationRequestBrowserPost.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AuthenticationRequestBrowserPost.java
index 4e991b9..4fb1267 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AuthenticationRequestBrowserPost.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AuthenticationRequestBrowserPost.java
@@ -26,7 +26,7 @@ import edu.internet2.middleware.shibboleth.common.profile.ProfileException;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileRequest;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileResponse;
 import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.saml2.SSOConfiguration;
+import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.SSOConfiguration;
 
 import org.apache.log4j.Logger;
 import org.opensaml.common.SAMLObject;
@@ -79,9 +79,8 @@ public class AuthenticationRequestBrowserPost extends AbstractAuthenticationRequ
         HttpSession httpSession = httpRequest.getSession();
         
         AuthnRequest authnRequest = null;
-        Issuer issuer = null;
+        String issuer = null;
         MetadataProvider metadataProvider = null;
-        String providerId = null;
         RelyingPartyConfiguration relyingParty = null;
         SSOConfiguration ssoConfig = null;
         SPSSODescriptor spDescriptor = null;
@@ -99,7 +98,7 @@ public class AuthenticationRequestBrowserPost extends AbstractAuthenticationRequ
                     throw new ProfileException("SAML 2 AuthnRequest: No MessageDecoder registered for " + BINDING_URI);
                 }
                 
-                decoder.setMetadataProvider(getRelyingPartyConfigurationManager().getMetadataProvider());
+                decoder.setMetadataProvider(getMetadataProvider());
                 populateMessageDecoder(decoder);
                 decoder.decode();
                 
@@ -110,12 +109,11 @@ public class AuthenticationRequestBrowserPost extends AbstractAuthenticationRequ
                 }
                 
                 authnRequest = (AuthnRequest) samlObject;
-                issuer = (Issuer) decoder.getSecurityPolicy().getIssuer();
+                issuer = decoder.getSecurityPolicy().getIssuer();
                 
                 // check that we have metadata for the RP
                 metadataProvider = getRelyingPartyConfigurationManager().getMetadataProvider();
-                providerId = issuer.getSPProvidedID();
-                relyingParty = getRelyingPartyConfigurationManager().getRelyingPartyConfiguration(providerId);
+                relyingParty = getRelyingPartyConfigurationManager().getRelyingPartyConfiguration(issuer);
                 ssoConfig = (SSOConfiguration) relyingParty.getProfileConfigurations().get(SSOConfiguration.PROFILE_ID);
                 
                 try {
@@ -125,22 +123,16 @@ public class AuthenticationRequestBrowserPost extends AbstractAuthenticationRequ
                 } catch (MetadataProviderException ex) {
                     log.error(
                             "SAML 2 Authentication Request: Unable to locate metadata for SP "
-                            + providerId + " for protocol "
-                            + SAML20_PROTOCOL_URI, ex);
+                            + issuer + " for protocol " + SAML20_PROTOCOL_URI, ex);
                     throw new ProfileException("SAML 2 Authentication Request: Unable to locate metadata for SP "
-                            + providerId + " for protocol "
-                            + SAML20_PROTOCOL_URI, ex);
+                            + issuer + " for protocol " + SAML20_PROTOCOL_URI, ex);
                 }
                 
                 if (spDescriptor == null) {
                     log.error("SAML 2 Authentication Request: Unable to locate metadata for SP "
-                            + providerId
-                            + " for protocol "
-                            + SAML20_PROTOCOL_URI);
+                            + issuer + " for protocol " + SAML20_PROTOCOL_URI);
                     throw new ProfileException("SAML 2 Authentication Request: Unable to locate metadata for SP "
-                            + providerId
-                            + " for protocol "
-                            + SAML20_PROTOCOL_URI);
+                            + issuer + " for protocol " + SAML20_PROTOCOL_URI);
                 }
                 
                 verifyAuthnRequest(authnRequest, issuer, relyingParty, httpSession);