From e54e7dccc32a0d20d3be4d2e97215a3d30f3b0a2 Mon Sep 17 00:00:00 2001
From: "Maria Odea B. Ching" <oching@apache.org>
Date: Tue, 12 Apr 2011 07:07:05 +0000
Subject: [PATCH] reverted previous csrf fixes committed in -r1081111

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x@1091313 13f79535-47bb-0310-9956-ffa450edef68
---
 .../webapp/WEB-INF/jsp/decorators/default.jsp |  2 +-
 .../main/webapp/WEB-INF/jsp/quickSearch.jsp   |  4 +--
 .../src/main/webapp/WEB-INF/jsp/results.jsp   |  4 +--
 .../src/main/webapp/WEB-INF/web.xml           | 36 ++++---------------
 4 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
index 191af1d71..89195fae6 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
@@ -80,7 +80,7 @@
 
 
 <div id="topSearchBox">
-    <s:form method="post" action="quickSearch" namespace="/" validate="true">
+    <s:form method="get" action="quickSearch" namespace="/" validate="true">
         <s:textfield label="Search for" size="30" name="q"/>
     </s:form>
 </div>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
index 7b0c39c56..8dbf9b438 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
@@ -94,7 +94,7 @@
 
   <c:url var="iconCreateUrl" value="/images/icons/create.png" />
   
-  <s:form method="post" id="quickSearch" action="quickSearch" validate="true">    
+  <s:form method="get" id="quickSearch" action="quickSearch" validate="true">    
     <s:textfield label="Search for" size="50" name="q"/> 
     <s:hidden name="completeQueryString" value="%{completeQueryString}"/>  
     <s:submit value="Search"/>      	
@@ -111,7 +111,7 @@
     </tr>
     <tr>
       <td>    
-        <s:form id="filteredSearch" method="post" action="filteredSearch" validate="true">
+        <s:form id="filteredSearch" method="get" action="filteredSearch" validate="true">  
           <label><strong>Advanced Search Fields: </strong></label><s:select name="searchField" list="searchFields" theme="simple"/> 
           <s:a href="#" title="Add Search Field" onclick="addSearchField( document.filteredSearch.searchField.options[document.filteredSearch.searchField.selectedIndex].text, document.filteredSearch.searchField.value, 'dynamicFields' )" theme="simple">
             <img src="${iconCreateUrl}" />
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
index ae8e5f8a2..bc6c4a5f2 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
@@ -85,7 +85,7 @@
         </tr>
         <tr>
           <td>
-          <s:form id="filteredSearch" method="post" action="filteredSearch" validate="true">
+          <s:form id="filteredSearch" method="get" action="filteredSearch" validate="true">
             <s:hidden name="fromFilterSearch" value="%{#attr.fromFilterSearch}" theme="simple"/>  
             <label><strong>Advanced Search Fields: </strong></label><s:select name="searchField" list="searchFields" theme="simple"/> 
             <s:a href="#" title="Add Search Field" onclick="addSearchField( document.filteredSearch.searchField.options[document.filteredSearch.searchField.selectedIndex].text, document.filteredSearch.searchField.value, 'dynamicFields' )" theme="simple">
@@ -108,7 +108,7 @@
       </table>
     </c:if>
     <c:if test="${fromFilterSearch == false}">
-      <s:form method="post" action="quickSearch" validate="true">
+      <s:form method="get" action="quickSearch" validate="true">
         <s:textfield label="Search for" size="50" name="q"/>
         <s:checkbox label="Search within results" name="searchResultsOnly"/>        
         <s:hidden name="completeQueryString" value="%{#attr.completeQueryString}"/>        
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
index cad63b21e..b4fb373d0 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
@@ -29,21 +29,6 @@
           <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
         </filter>
 
-  <!-- To enable this filter, uncomment the corresponding filter-mapping -->
-  <filter>
-    <filter-name>redback-csrf</filter-name>
-    <filter-class>org.codehaus.plexus.redback.struts2.filter.RedbackCSRFFilter</filter-class>
-    <init-param>
-      <param-name>nonceCacheSize</param-name>
-      <param-value>20</param-value>
-    </init-param>
-    <init-param>
-      <param-name>excludedPaths</param-name>
-      <param-value>/css/**,/images/**,/struts/**,/favicon.ico,/js/**,//repository/**,//xmlrpc/**,//feeds/**</param-value>
-    </init-param>
-  </filter>
-
-
 	<filter>
 		<filter-name>sitemesh</filter-name>
 		<filter-class>
@@ -67,25 +52,18 @@
 			<param-name>forceEncoding</param-name>
 			<param-value>true</param-value>
 		</init-param>
-	</filter>
-
-  <!-- Uncomment this to apply the CSRF filter mapping in Archiva
-  <filter-mapping>
-    <filter-name>redback-csrf</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  -->
-
+	</filter>  
+  
 	<filter-mapping>
 		<filter-name>encodingFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
-  <!-- this must be before the sitemesh filter -->
-  <filter-mapping>
-    <filter-name>webwork-cleanup</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+	<!-- this must be before the sitemesh filter -->
+	<filter-mapping>
+		<filter-name>webwork-cleanup</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
 
 	<filter-mapping>
 		<filter-name>sitemesh</filter-name>
-- 
2.39.5