Return-Path: 
 <commits-return-37197-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7CBC118988
	for <apmail-activemq-commits-archive@www.apache.org>;
 Fri, 12 Feb 2016 20:46:53 +0000 (UTC)
Received: (qmail 70175 invoked by uid 500); 12 Feb 2016 20:46:53 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 70139 invoked by uid 500); 12 Feb 2016 20:46:53 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 70130 invoked by uid 99); 12 Feb 2016 20:46:53 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Feb 2016 20:46:53 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 22FA1E38C6; Fri, 12 Feb 2016 20:46:53 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: cshannon@apache.org
To: commits@activemq.apache.org
Message-Id: <597461f660934bedbb1ce89f0c0df54c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: activemq git commit: https://issues.apache.org/jira/browse/AMQ-6170
Date: Fri, 12 Feb 2016 20:46:53 +0000 (UTC)

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.13.x 559477285 -> 028a33ea7


https://issues.apache.org/jira/browse/AMQ-6170

Fixing X-Frame-Options header so that is applied for all content served
by Jetty.  The previous patch wasn't correct because it only applied it
to Servlets and JSPs and not static content. This also reverts AMQ-6113

(cherry picked from commit 24ad36778534c5ac888f880837075449169578ad)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/028a33ea
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/028a33ea
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/028a33ea

Branch: refs/heads/activemq-5.13.x
Commit: 028a33ea7d73fabe6161defffdbfc85578328a68
Parents: 5594772
Author: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Authored: Fri Feb 12 19:43:37 2016 +0000
Committer: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Committed: Fri Feb 12 20:46:27 2016 +0000

----------------------------------------------------------------------
 .../src/main/webapp/WEB-INF/web.xml             | 10 ----
 .../src/main/webapp/WEB-INF/web.xml             |  9 ----
 .../activemq/web/XFrameOptionsFilter.java       | 53 --------------------
 assembly/src/release/conf/jetty.xml             | 13 +++++
 .../src/release/examples/conf/jetty-demo.xml    | 13 +++++
 5 files changed, 26 insertions(+), 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/028a33ea/activemq-web-console/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/WEB-INF/web.xml b/activemq-web-console/src/main/webapp/WEB-INF/web.xml
index 28a873c..962713e 100755
--- a/activemq-web-console/src/main/webapp/WEB-INF/web.xml
+++ b/activemq-web-console/src/main/webapp/WEB-INF/web.xml
@@ -25,16 +25,6 @@
     Apache ActiveMQ Web Console
   </description>
   <display-name>ActiveMQ Console</display-name>
-  
-  <filter>
-    <filter-name>XFrameOptions</filter-name>
-    <filter-class>org.apache.activemq.web.XFrameOptionsFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>XFrameOptions</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
 
   <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <!--              Expose Spring POJOs to JSP                   .                                                             -->

http://git-wip-us.apache.org/repos/asf/activemq/blob/028a33ea/activemq-web-demo/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/activemq-web-demo/src/main/webapp/WEB-INF/web.xml b/activemq-web-demo/src/main/webapp/WEB-INF/web.xml
index 39240d6..cd39366 100755
--- a/activemq-web-demo/src/main/webapp/WEB-INF/web.xml
+++ b/activemq-web-demo/src/main/webapp/WEB-INF/web.xml
@@ -30,15 +30,6 @@
     </context-param>
 
 	<!-- filters -->
-    <filter>
-      <filter-name>XFrameOptions</filter-name>
-      <filter-class>org.apache.activemq.web.XFrameOptionsFilter</filter-class>
-    </filter>
-  
-    <filter-mapping>
-      <filter-name>XFrameOptions</filter-name>
-      <url-pattern>/*</url-pattern>
-    </filter-mapping>
 	<filter>
 		<filter-name>session</filter-name>
 		<filter-class>org.apache.activemq.web.SessionFilter</filter-class>

http://git-wip-us.apache.org/repos/asf/activemq/blob/028a33ea/activemq-web/src/main/java/org/apache/activemq/web/XFrameOptionsFilter.java
----------------------------------------------------------------------
diff --git a/activemq-web/src/main/java/org/apache/activemq/web/XFrameOptionsFilter.java b/activemq-web/src/main/java/org/apache/activemq/web/XFrameOptionsFilter.java
deleted file mode 100644
index e78c79f..0000000
--- a/activemq-web/src/main/java/org/apache/activemq/web/XFrameOptionsFilter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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 org.apache.activemq.web;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Filter to set the header X-FRAME-OPTIONS on web responses
- *
- */
-public class XFrameOptionsFilter implements Filter {
-
-    private static String SAMEORIGIN = "SAMEORIGIN";
-
-    @Override
-    public void init(FilterConfig config) throws ServletException {
-    }
-
-    @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-        HttpServletResponse servletResponse = (HttpServletResponse)response;
-        //Set all responses to SAMEORIGIN, can be switched to be configurable later if
-        //we need to conditionally set this
-        servletResponse.addHeader("X-FRAME-OPTIONS", SAMEORIGIN);
-        chain.doFilter(request, response);
-    }
-
-    @Override
-    public void destroy() {
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq/blob/028a33ea/assembly/src/release/conf/jetty.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/jetty.xml b/assembly/src/release/conf/jetty.xml
index 3ff04b6..b3d3cde 100644
--- a/assembly/src/release/conf/jetty.xml
+++ b/assembly/src/release/conf/jetty.xml
@@ -46,9 +46,22 @@
         <property name="pathSpec" value="*.action" />
     </bean>
     
+    <bean id="rewriteHandler" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
+        <property name="rules">
+            <list>
+                <bean id="header" class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
+                  <property name="pattern" value="*"/>
+                  <property name="name" value="X-FRAME-OPTIONS"/>
+                  <property name="value" value="SAMEORIGIN"/>
+                </bean>
+            </list>
+        </property>
+    </bean>
+    
 	<bean id="secHandlerCollection" class="org.eclipse.jetty.server.handler.HandlerCollection">
 		<property name="handlers">
 			<list>
+   	            <ref bean="rewriteHandler"/>
 				<bean class="org.eclipse.jetty.webapp.WebAppContext">
 					<property name="contextPath" value="/admin" />
 					<property name="resourceBase" value="${activemq.home}/webapps/admin" />

http://git-wip-us.apache.org/repos/asf/activemq/blob/028a33ea/assembly/src/release/examples/conf/jetty-demo.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/examples/conf/jetty-demo.xml b/assembly/src/release/examples/conf/jetty-demo.xml
index 04ca8dc..dded766 100644
--- a/assembly/src/release/examples/conf/jetty-demo.xml
+++ b/assembly/src/release/examples/conf/jetty-demo.xml
@@ -46,9 +46,22 @@
         <property name="pathSpec" value="*.action" />
     </bean>
 
+    <bean id="rewriteHandler" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
+        <property name="rules">
+            <list>
+                <bean id="header" class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
+                  <property name="pattern" value="*"/>
+                  <property name="name" value="X-FRAME-OPTIONS"/>
+                  <property name="value" value="SAMEORIGIN"/>
+                </bean>
+            </list>
+        </property>
+    </bean>
+    
 	<bean id="secHandlerCollection" class="org.eclipse.jetty.server.handler.HandlerCollection">
 		<property name="handlers">
 			<list>
+                <ref bean="rewriteHandler"/>
 				<bean class="org.eclipse.jetty.webapp.WebAppContext">
 					<property name="contextPath" value="/admin" />
 					<property name="resourceBase" value="${activemq.home}/webapps/admin" />