svn commit: r1723004 - in /sling/trunk/bundles/commons/log/src: main/java/org/apache/sling/commons/log/logback/internal/SlingLogPanel.java test/java/org/apache/sling/commons/log/logback/integration/ITWebConsoleRemote.java

[chetanm]

Author: chetanm
Date: Tue Jan  5 05:17:11 2016
New Revision: 1723004

URL: http://svn.apache.org/viewvc?rev=1723004&view=rev
Log:
SLING-5092 - Missing Content type for system/console/slinglog/tailer.txt

Modified:
    
sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/logback/internal/SlingLogPanel.java
    
sling/trunk/bundles/commons/log/src/test/java/org/apache/sling/commons/log/logback/integration/ITWebConsoleRemote.java

Modified: 
sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/logback/internal/SlingLogPanel.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/logback/internal/SlingLogPanel.java?rev=1723004&r1=1723003&r2=1723004&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/logback/internal/SlingLogPanel.java
 (original)
+++ 
sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/logback/internal/SlingLogPanel.java
 Tue Jan  5 05:17:11 2016
@@ -134,6 +134,7 @@ public class SlingLogPanel extends HttpS
         if (req.getPathInfo() != null) {
             if (req.getPathInfo().endsWith(PATH_TAILER)){
                 String appenderName = req.getParameter(PARAM_APPENDER_NAME);
+                addNoSniffHeader(resp);
                 if (appenderName == null){
                     pw.printf("Provide appender name via [%s] request 
parameter%n", PARAM_APPENDER_NAME);
                     return;
@@ -857,6 +858,9 @@ public class SlingLogPanel extends HttpS
         return (path != null) ? path : "[stdout]";
     }
 
+    private static void addNoSniffHeader(HttpServletResponse resp) {
+        resp.setHeader("X-Content-Type-Options", "nosniff");
+    }
 
     // ~------------------------------------------------Status Manager
     // Based on ch.qos.logback.core.status.ViewStatusMessagesServletBase

Modified: 
sling/trunk/bundles/commons/log/src/test/java/org/apache/sling/commons/log/logback/integration/ITWebConsoleRemote.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/src/test/java/org/apache/sling/commons/log/logback/integration/ITWebConsoleRemote.java?rev=1723004&r1=1723003&r2=1723004&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/log/src/test/java/org/apache/sling/commons/log/logback/integration/ITWebConsoleRemote.java
 (original)
+++ 
sling/trunk/bundles/commons/log/src/test/java/org/apache/sling/commons/log/logback/integration/ITWebConsoleRemote.java
 Tue Jan  5 05:17:11 2016
@@ -23,6 +23,7 @@ import java.io.File;
 import java.io.IOException;
 
 import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider;
+import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import org.apache.commons.io.FilenameUtils;
@@ -38,6 +39,7 @@ import org.ops4j.pax.exam.spi.PaxExamRun
 import org.ops4j.pax.tinybundles.core.TinyBundle;
 import org.osgi.framework.Constants;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.ops4j.pax.exam.CoreOptions.composite;
 import static org.ops4j.pax.exam.CoreOptions.frameworkProperty;
@@ -134,6 +136,13 @@ public class ITWebConsoleRemote extends
         assertTrue(text.contains("testremote.log"));
     }
 
+    @Test
+    public void tailerHeader() throws Exception{
+        Page page = 
webClient.getPage(prepareUrl("slinglog/tailer.txt?name=webconsoletest1.log"));
+        String nosniffHeader = 
page.getWebResponse().getResponseHeaderValue("X-Content-Type-Options");
+        assertEquals("nosniff", nosniffHeader);
+    }
+
     @AfterClass
     public static void tearDownClass() {
         if (testContainer != null) {