Fix metadata profile handler MIME type - SIDP-262

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

diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt
index e408181..110479c 100644 (file)
--- a/doc/RELEASE-NOTES.txt
+++ b/doc/RELEASE-NOTES.txt
@@ -2,6 +2,7 @@ Changes in Release 2.1.2
 =============================================
 * Significant memory optimizations
 [SIDP-260] - NPE in login-err.jsp
+[SIDP-262] - MIME type on metadata profile handler is incorrect
 [SIDP-267] - check if cookies are set on error.jsp
 [SIDP-268] - Expose Metadata on entityID URL
 

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/SAMLMetadataProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/SAMLMetadataProfileHandler.java
index 070caff..21ccc7b 100644 (file)
--- a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/SAMLMetadataProfileHandler.java
+++ b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/SAMLMetadataProfileHandler.java
@@ -19,11 +19,14 @@ package edu.internet2.middleware.shibboleth.idp.profile;
 import java.io.File;
 import java.io.OutputStreamWriter;
 
+import javax.servlet.http.HttpServletResponse;
+
 import org.opensaml.Configuration;
 import org.opensaml.saml2.metadata.provider.FilesystemMetadataProvider;
 import org.opensaml.ws.transport.InTransport;
 import org.opensaml.ws.transport.OutTransport;
 import org.opensaml.ws.transport.http.HttpServletRequestAdapter;
+import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
 import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.io.Marshaller;
 import org.opensaml.xml.parse.ParserPool;
@@ -68,6 +71,9 @@ public class SAMLMetadataProfileHandler extends AbstractRequestURIMappedProfileH
     public void processRequest(InTransport in, OutTransport out) throws ProfileException {
         XMLObject metadata;
 
+        HttpServletResponse httpResponse = ((HttpServletResponseAdapter)out).getWrappedResponse();
+        httpResponse.setContentType("application/samlmetadata+xml");
+        
         try {
             String requestedEntity = DatatypeHelper.safeTrimOrNullString(((HttpServletRequestAdapter) in)
                     .getParameterValue("entity"));