Update to use new profile handler code.
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 17 Apr 2007 01:08:53 +0000 (01:08 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 17 Apr 2007 01:08:53 +0000 (01:08 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2176 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

16 files changed:
src/edu/internet2/middleware/shibboleth/idp/profile/AbstractSAMLProfileHandler.java [new file with mode: 0644]
src/edu/internet2/middleware/shibboleth/idp/profile/ProfileRequestDispatcher.java
src/edu/internet2/middleware/shibboleth/idp/profile/ShibbolethProfileRequest.java
src/edu/internet2/middleware/shibboleth/idp/profile/ShibbolethProfileResponse.java
src/edu/internet2/middleware/shibboleth/idp/profile/adfs/SingleSignOn.java [deleted file]
src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractProfileHandler.java [deleted file]
src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java [new file with mode: 0644]
src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactQuery.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQuery.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml1/MetadataException.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSO.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java [moved from src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractProfileHandler.java with 96% similarity]
src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQuery.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AuthenticationRequest.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml2/LogoutRequest.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/AbstractSAMLProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/AbstractSAMLProfileHandler.java
new file mode 100644 (file)
index 0000000..02c0579
--- /dev/null
@@ -0,0 +1,29 @@
+/*
+ * Copyright [2007] [University Corporation for Advanced Internet Development, Inc.]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package edu.internet2.middleware.shibboleth.idp.profile;
+
+import edu.internet2.middleware.shibboleth.common.profile.AbstractProfileHandler;
+import edu.internet2.middleware.shibboleth.common.relyingparty.provider.SAMLMDRelyingPartyConfigurationManager;
+import edu.internet2.middleware.shibboleth.idp.session.Session;
+
+/**
+ * Base class for SAML profile handlers.
+ */
+public abstract class AbstractSAMLProfileHandler extends
+        AbstractProfileHandler<SAMLMDRelyingPartyConfigurationManager, Session> {
+
+}
\ No newline at end of file
index e48a9b6..f73ca10 100644 (file)
@@ -24,31 +24,22 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.web.servlet.HttpServletBean;
 
-import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyManager;
-import edu.internet2.middleware.shibboleth.common.session.SessionManager;
-import edu.internet2.middleware.shibboleth.idp.session.Session;
+import edu.internet2.middleware.shibboleth.common.profile.AbstractProfileHandler;
 
 /**
- * Servlet responsible for dispatching incoming requests to the appropriate {@link ProfileHandler}.
+ * Servlet responsible for dispatching incoming requests to the appropriate {@link AbstractProfileHandler}.
  */
 public class ProfileRequestDispatcher extends HttpServletBean {
 
     /** Registered profile handlers. */
-    private Map<String, ProfileHandler> profileHandlers;
-
-    /** User session manager. */
-    private SessionManager<Session> sessionManager;
-
-    /** Relying party configuration manager. */
-    private RelyingPartyManager rpManager;
+    private Map<String, AbstractProfileHandler> profileHandlers;
 
     /**
      * Gets the profile handlers currently registered.
      * 
      * @return profile handlers currently registered
      */
-    public Map<String, ProfileHandler> getProfileHandlers() {
+    public Map<String, AbstractProfileHandler> getProfileHandlers() {
         return profileHandlers;
     }
 
@@ -57,18 +48,18 @@ public class ProfileRequestDispatcher extends HttpServletBean {
      * 
      * @param handlers the profile handlers to use
      */
-    public void setProfileHandlers(Map<String, ProfileHandler> handlers) {
+    public void setProfileHandlers(Map<String, AbstractProfileHandler> handlers) {
         profileHandlers = handlers;
     }
 
     /** {@inheritDoc} */
     public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException {
         String path = request.getPathInfo();
-        ProfileHandler handler = profileHandlers.get(path);
+        AbstractProfileHandler handler = profileHandlers.get(path);
 
         if (handler != null) {
-            ShibbolethProfileRequest profileReq = new ShibbolethProfileRequest(request, null, sessionManager, rpManager);
-            ShibbolethProfileResponse profileResp = new ShibbolethProfileResponse(response, null);
+            ShibbolethProfileRequest profileReq = new ShibbolethProfileRequest(request);
+            ShibbolethProfileResponse profileResp = new ShibbolethProfileResponse(response);
             handler.processRequest(profileReq, profileResp);
         }
 
index 40bebfd..789c1aa 100644 (file)
@@ -18,55 +18,27 @@ package edu.internet2.middleware.shibboleth.idp.profile;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.opensaml.common.binding.MessageDecoder;
-
 import edu.internet2.middleware.shibboleth.common.profile.ProfileRequest;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyManager;
-import edu.internet2.middleware.shibboleth.common.session.SessionManager;
-import edu.internet2.middleware.shibboleth.idp.session.Session;
 
 /**
  * Shibboleth {@link ProfileRequest}.
  */
-public class ShibbolethProfileRequest implements ProfileRequest<HttpServletRequest, Session> {
+public class ShibbolethProfileRequest implements ProfileRequest<HttpServletRequest> {
 
     /** The in comming request. */
     private HttpServletRequest rawRequest;
 
-    /** Configuration information for the requesting party. */
-    private RelyingPartyConfiguration rpConfiguration;
-
-    /** The current user session. */
-    private Session userSession;
-
     /**
      * Constructor.
      * 
      * @param request the incomming HTTP request
-     * @param decoder the decoder for the request, all information but the request must be set already
-     * @param sessionManager the manager of current user sessions
-     * @param rpConfigManager the relying party configuration manager
      */
-    public ShibbolethProfileRequest(HttpServletRequest request, MessageDecoder<HttpServletRequest> decoder,
-            SessionManager<Session> sessionManager, RelyingPartyManager rpConfigManager){
-
+    public ShibbolethProfileRequest(HttpServletRequest request){
         rawRequest = request;
-        userSession = sessionManager.getSession(request.getSession().getId());
     }
 
     /** {@inheritDoc} */
     public HttpServletRequest getRawRequest() {
         return rawRequest;
     }
-
-    /** {@inheritDoc} */
-    public RelyingPartyConfiguration getRelyingPartyConfiguration() {
-        return rpConfiguration;
-    }
-
-    /** {@inheritDoc} */
-    public Session getSession() {
-        return userSession;
-    }
 }
\ No newline at end of file
index 5daa220..db6be4d 100644 (file)
@@ -18,8 +18,6 @@ package edu.internet2.middleware.shibboleth.idp.profile;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.opensaml.common.binding.MessageEncoder;
-
 import edu.internet2.middleware.shibboleth.common.profile.ProfileResponse;
 
 /**
@@ -34,9 +32,9 @@ public class ShibbolethProfileResponse implements ProfileResponse<HttpServletRes
      * Constructor.
      * 
      * @param response the raw response
-     * @param encoder the encoder used to encode the response
+
      */
-    public ShibbolethProfileResponse(HttpServletResponse response, MessageEncoder<HttpServletResponse> encoder) {
+    public ShibbolethProfileResponse(HttpServletResponse response) {
         rawResponse = response;
     }
 
diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/adfs/SingleSignOn.java b/src/edu/internet2/middleware/shibboleth/idp/profile/adfs/SingleSignOn.java
deleted file mode 100644 (file)
index d9149f2..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright [2006] [University Corporation for Advanced Internet Development, Inc.]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package edu.internet2.middleware.shibboleth.idp.profile.adfs;
-
-import javax.servlet.ServletException;
-
-import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
-import edu.internet2.middleware.shibboleth.common.profile.ProfileRequest;
-import edu.internet2.middleware.shibboleth.common.profile.ProfileResponse;
-
-/**
- * ADFS (Active Directory Federation Service) single sign-on profile handler
- */
-public class SingleSignOn implements ProfileHandler {
-
-    /** {@inheritDoc} */
-    public boolean processRequest(ProfileRequest request, ProfileResponse response) throws ServletException {
-        // TODO Auto-generated method stub
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractProfileHandler.java
deleted file mode 100644 (file)
index a82d5fa..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright [2007] [University Corporation for Advanced Internet Development, Inc.]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.idp.profile.saml1;
-
-import javax.servlet.ServletRequest;
-
-import org.apache.log4j.Logger;
-import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObject;
-import org.opensaml.common.SAMLVersion;
-import org.opensaml.common.binding.BindingException;
-import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
-import org.opensaml.xml.XMLObjectBuilderFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolver;
-import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
-
-/**
- * Common implementation details for profile handlers.
- */
-public abstract class AbstractProfileHandler implements ProfileHandler {
-
-    /** SAML Version for this profile handler. */
-    public static final SAMLVersion SAML_VERSION = SAMLVersion.VERSION_11;
-
-    /** Class logger. */
-    private static Logger log = Logger.getLogger(AbstractProfileHandler.class);
-    
-    /** For building XML. */
-    private XMLObjectBuilderFactory builderFactory;
-
-    /** For generating random ids. */
-    private SecureRandomIdentifierGenerator idGenerator;
-
-    /** For resolving attributes. */
-    private AttributeResolver resolver;
-
-    /** To determine releasable attributes. */
-    private FilteringEngine engine;
-
-    /**
-     * Default constructor.
-     */
-    public AbstractProfileHandler() {
-        builderFactory = Configuration.getBuilderFactory();
-        idGenerator = new SecureRandomIdentifierGenerator();
-    }
-
-    /**
-     * Returns the XML builder factory.
-     * 
-     * @return Returns the builderFactory.
-     */
-    public XMLObjectBuilderFactory getBuilderFactory() {
-        return builderFactory;
-    }
-
-    /**
-     * Returns the id generator.
-     * 
-     * @return Returns the idGenerator.
-     */
-    public SecureRandomIdentifierGenerator getIdGenerator() {
-        return idGenerator;
-    }
-
-    /**
-     * Sets the attribute resolver.
-     * 
-     * @param r <code>AttributeResolver</code>
-     */
-    public void setAttributeResolver(AttributeResolver r) {
-        resolver = r;
-    }
-
-    /**
-     * Returns the attribute resolver.
-     * 
-     * @return <code>AttributeResolver</code>
-     */
-    public AttributeResolver getAttributeResolver() {
-        return resolver;
-    }
-
-    /**
-     * Sets the filter engine.
-     * 
-     * @param e <code>FilterEngine</code>
-     */
-    public void setFilterEngine(FilteringEngine e) {
-        engine = e;
-    }
-
-    /**
-     * Returns the filter engine.
-     * 
-     * @return <code>FilterEngine</code>
-     */
-    public FilteringEngine getFilteringEngine() {
-        return engine;
-    }
-    
-    /**
-     * This decodes the attribute query message from the supplied request.
-     * 
-     * @param request <code>ServletRequest</code>
-     * @return <code>SAMLObject</code>
-     * @throws BindingException if the request cannot be decoded
-     */
-    protected SAMLObject decodeMessage(ServletRequest request) throws BindingException {
-        // call decode method on decoder
-        decoder.setRequest(request);
-        decoder.decode();
-        if (log.isDebugEnabled()) {
-            log.debug("decoded servlet request");
-        }
-
-        // get SAMLMessage from the decoder
-        final SAMLObject message = decoder.getSAMLMessage();
-        if (log.isDebugEnabled()) {
-            log.debug("retrieved attribute query message from decoder: " + message);
-        }
-
-        return message;
-    }
-    
-
-    /**
-     * This encodes the supplied response.
-     * 
-     * @param response <code>SAMLObject</code>
-     * @throws BindingException if the response cannot be encoded
-     */
-    protected void encodeResponse(SAMLObject response) throws BindingException {
-        encoder.setSAMLMessage(response);
-        encoder.encode();
-        if (log.isDebugEnabled()) {
-            log.debug("encoded saml1 response");
-        }
-    }    
-}
diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java
new file mode 100644 (file)
index 0000000..5bf8e9b
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ * Copyright [2007] [University Corporation for Advanced Internet Development, Inc.]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package edu.internet2.middleware.shibboleth.idp.profile.saml1;
+
+import org.apache.log4j.Logger;
+import org.opensaml.Configuration;
+import org.opensaml.common.SAMLVersion;
+import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
+import org.opensaml.xml.XMLObjectBuilderFactory;
+
+import edu.internet2.middleware.shibboleth.idp.profile.AbstractSAMLProfileHandler;
+
+/**
+ * Common implementation details for profile handlers.
+ */
+public abstract class AbstractSAML1ProfileHandler extends AbstractSAMLProfileHandler {
+
+    /** SAML Version for this profile handler. */
+    public static final SAMLVersion SAML_VERSION = SAMLVersion.VERSION_11;
+
+    /** Class logger. */
+    private static Logger log = Logger.getLogger(AbstractSAML1ProfileHandler.class);
+    
+    /** For building XML. */
+    private XMLObjectBuilderFactory builderFactory;
+
+    /** For generating random ids. */
+    private SecureRandomIdentifierGenerator idGenerator;
+
+    /**
+     * Default constructor.
+     */
+    public AbstractSAML1ProfileHandler() {
+        builderFactory = Configuration.getBuilderFactory();
+        idGenerator = new SecureRandomIdentifierGenerator();
+    }
+
+    /**
+     * Returns the XML builder factory.
+     * 
+     * @return Returns the builderFactory.
+     */
+    public XMLObjectBuilderFactory getBuilderFactory() {
+        return builderFactory;
+    }
+
+    /**
+     * Returns the id generator.
+     * 
+     * @return Returns the idGenerator.
+     */
+    public SecureRandomIdentifierGenerator getIdGenerator() {
+        return idGenerator;
+    }
+}
\ No newline at end of file
index 6b9d7df..ef2e3cf 100644 (file)
@@ -17,14 +17,13 @@ package edu.internet2.middleware.shibboleth.idp.profile.saml1;
 
 import javax.servlet.ServletException;
 
-import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileRequest;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileResponse;
 
 /**
  * SAML 1 Artifact Query profile handler.
  */
-public class ArtifactQuery implements ProfileHandler {
+public class ArtifactQuery extends AbstractSAML1ProfileHandler {
 
     /** {@inheritDoc} */
     public boolean processRequest(ProfileRequest request, ProfileResponse response) throws ServletException {
index 89a8535..75938c8 100644 (file)
@@ -42,7 +42,7 @@ import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeRe
 /**
  * SAML 1 Attribute Query profile handler.
  */
-public class AttributeQuery extends AbstractProfileHandler {
+public class AttributeQuery extends AbstractSAML1ProfileHandler {
 
     /** Class logger. */
     private static Logger log = Logger.getLogger(AttributeQuery.class);
index 39dddd4..aae3d68 100644 (file)
@@ -19,7 +19,7 @@ package edu.internet2.middleware.shibboleth.idp.profile.saml1;
 
 /**
  * Metadata Exception. Generally thrown by a 
- * {@link edu.internet2.middleware.shibboleth.common.profile.ProfileHandler}
+ * {@link edu.internet2.middleware.shibboleth.common.profile.AbstractProfileHandler}
  * if unable ot locate needed metadata.
  */
 public class MetadataException extends java.lang.Exception {
index 55f10e9..374245a 100644 (file)
@@ -34,9 +34,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyManager;
+import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfigurationManager;
 import edu.internet2.middleware.shibboleth.common.relyingparty.saml1.ShibbolethSSOConfiguration;
 import edu.internet2.middleware.shibboleth.idp.authn.LoginContext;
 
@@ -79,7 +78,7 @@ import org.opensaml.xml.signature.Signature;
  * 
  * This profile implements the SSO profile from "Shibboleth Architecture Protocols and Profiles" - 10 September 2005.
  */
-public class ShibbolethSSO extends AbstractProfileHandler {
+public class ShibbolethSSO extends AbstractSAML1ProfileHandler {
 
     /** log4j. */
     private static final Logger log = Logger.getLogger(ShibbolethSSO.class);
@@ -103,7 +102,7 @@ public class ShibbolethSSO extends AbstractProfileHandler {
     protected static final String RP_COOKIE_DIGEST_ALG = "SHA-1";
 
     /** The RelyingPartyManager. */
-    protected RelyingPartyManager rpManager;
+    protected RelyingPartyConfigurationManager rpManager;
 
     /**
      * Backing store for artifacts. This must be shared between ShibbolethSSO and AttributeQuery.
@@ -214,7 +213,7 @@ public class ShibbolethSSO extends AbstractProfileHandler {
      * 
      * @param rpManager A RelyingPartyManager.
      */
-    public void setRelyingPartyManager(RelyingPartyManager rpManager) {
+    public void setRelyingPartyManager(RelyingPartyConfigurationManager rpManager) {
         this.rpManager = rpManager;
     }
 
@@ -44,19 +44,18 @@ import org.opensaml.saml2.core.Subject;
 import org.opensaml.xml.XMLObjectBuilder;
 import org.opensaml.xml.XMLObjectBuilderFactory;
 
-import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyManager;
+import edu.internet2.middleware.shibboleth.idp.profile.AbstractSAMLProfileHandler;
 
 /**
  * Common implementation details for profile handlers.
  */
-public abstract class AbstractProfileHandler implements ProfileHandler {
+public abstract class AbstractSAML2ProfileHandler extends AbstractSAMLProfileHandler {
 
     /** SAML Version for this profile handler. */
     public static final SAMLVersion SAML_VERSION = SAMLVersion.VERSION_20;
 
     /** Class logger. */
-    private static Logger log = Logger.getLogger(AbstractProfileHandler.class);
+    private static Logger log = Logger.getLogger(AbstractSAML2ProfileHandler.class);
 
     /** For building XML. */
     private XMLObjectBuilderFactory builderFactory;
@@ -82,7 +81,7 @@ public abstract class AbstractProfileHandler implements ProfileHandler {
     /**
      * Default constructor.
      */
-    public AbstractProfileHandler() {
+    public AbstractSAML2ProfileHandler() {
         builderFactory = Configuration.getBuilderFactory();
         idGenerator = new SecureRandomIdentifierGenerator();
 
index 2a8a0fa..cb96804 100644 (file)
@@ -18,14 +18,13 @@ package edu.internet2.middleware.shibboleth.idp.profile.saml2;
 
 import javax.servlet.ServletException;
 
-import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileRequest;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileResponse;
 
 /**
  * SAML 2.0 Artifact resolution profile handler.
  */
-public class ArtifactResolution implements ProfileHandler {
+public class ArtifactResolution extends AbstractSAML2ProfileHandler {
 
     /** {@inheritDoc} */
     public boolean processRequest(ProfileRequest request, ProfileResponse response) throws ServletException {
index 82e21e4..826d625 100644 (file)
@@ -54,7 +54,7 @@ import edu.internet2.middleware.shibboleth.idp.session.ServiceInformation;
 /**
  * SAML 2.0 Attribute Query profile handler.
  */
-public class AttributeQuery extends AbstractProfileHandler {
+public class AttributeQuery extends AbstractSAML2ProfileHandler {
 
     /** Class logger. */
     private static Logger log = Logger.getLogger(AttributeQuery.class);
index f7aa846..978993b 100644 (file)
@@ -71,7 +71,7 @@ import org.w3c.dom.Element;
 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.RelyingPartyManager;
+import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfigurationManager;
 import edu.internet2.middleware.shibboleth.common.relyingparty.saml2.SSOConfiguration;
 import edu.internet2.middleware.shibboleth.idp.authn.AuthenticationManager;
 import edu.internet2.middleware.shibboleth.idp.authn.LoginContext;
@@ -80,7 +80,7 @@ import edu.internet2.middleware.shibboleth.idp.authn.Saml2LoginContext;
 /**
  * SAML 2.0 Authentication Request profile handler
  */
-public class AuthenticationRequest extends AbstractProfileHandler {
+public class AuthenticationRequest extends AbstractSAML2ProfileHandler {
 
     private static final Logger log = Logger.getLogger(AuthenticationRequest.class.getName());
 
@@ -88,7 +88,7 @@ public class AuthenticationRequest extends AbstractProfileHandler {
     public static final String SAML20_PROTOCOL_URI = "urn:oasis:names:tc:SAML:2.0:protocol";
 
     /** The RelyingPartyManager. */
-    protected RelyingPartyManager rpManager;
+    protected RelyingPartyConfigurationManager rpManager;
 
     /**
      * Backing store for artifacts. This must be shared between ShibbolethSSO and AttributeQuery.
@@ -159,7 +159,7 @@ public class AuthenticationRequest extends AbstractProfileHandler {
      * 
      * @param rpManager The IdP's RelyingParyManager.
      */
-    public void setRelyingPartyManager(RelyingPartyManager rpManager) {
+    public void setRelyingPartyManager(RelyingPartyConfigurationManager rpManager) {
         this.rpManager = rpManager;
     }
 
index 2320ee9..1c879e5 100644 (file)
@@ -18,14 +18,13 @@ package edu.internet2.middleware.shibboleth.idp.profile.saml2;
 
 import javax.servlet.ServletException;
 
-import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileRequest;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileResponse;
 
 /**
  * SAML 2.0 Logout Request profile handler.
  */
-public class LogoutRequest implements ProfileHandler {
+public class LogoutRequest extends AbstractSAML2ProfileHandler {
 
     /** {@inheritDoc} */
     public boolean processRequest(ProfileRequest request, ProfileResponse response) throws ServletException {