Author: oching
Date: Sun Mar 13 13:35:02 2011
New Revision: 1081111
URL: http://svn.apache.org/viewvc?rev=1081111&view=rev
Log:
[MRM-1460]
o upgraded redback to 1.2.7
o added configuration for redback csrf filter
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
archiva/branches/archiva-1.3.x/pom.xml
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=1081111&r1=1081110&r2=1081111&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
Sun Mar 13 13:35:02 2011
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.3.5-SNAPSHOT</version>
</parent>
<artifactId>archiva-webapp-test</artifactId>
<packaging>pom</packaging>
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=1081111&r1=1081110&r2=1081111&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Sun Mar 13 13:35:02 2011
@@ -80,7 +80,7 @@
<div id="topSearchBox">
- <s:form method="get" action="quickSearch" namespace="/" validate="true">
+ <s:form method="post" action="quickSearch" namespace="/" validate="true">
<s:textfield label="Search for" size="30" name="q"/>
</s:form>
</div>
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp?rev=1081111&r1=1081110&r2=1081111&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
Sun Mar 13 13:35:02 2011
@@ -94,7 +94,7 @@
<c:url var="iconCreateUrl" value="/images/icons/create.png" />
- <s:form method="get" id="quickSearch" action="quickSearch" validate="true">
+ <s:form method="post" 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="get" action="filteredSearch"
validate="true">
+ <s:form id="filteredSearch" method="post" 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}" />
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp?rev=1081111&r1=1081110&r2=1081111&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
Sun Mar 13 13:35:02 2011
@@ -85,7 +85,7 @@
</tr>
<tr>
<td>
- <s:form id="filteredSearch" method="get" action="filteredSearch"
validate="true">
+ <s:form id="filteredSearch" method="post" 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="get" action="quickSearch" validate="true">
+ <s:form method="post" 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}"/>
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml?rev=1081111&r1=1081110&r2=1081111&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
Sun Mar 13 13:35:02 2011
@@ -29,6 +29,21 @@
<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>
@@ -52,18 +67,25 @@
<param-name>forceEncoding</param-name>
<param-value>true</param-value>
</init-param>
- </filter>
-
+ </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-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>
Modified: archiva/branches/archiva-1.3.x/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/pom.xml?rev=1081111&r1=1081110&r2=1081111&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/pom.xml (original)
+++ archiva/branches/archiva-1.3.x/pom.xml Sun Mar 13 13:35:02 2011
@@ -468,7 +468,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -1102,7 +1102,7 @@
<properties>
<maven.version>2.0.8</maven.version>
<wagon.version>1.0-beta-5</wagon.version>
- <redback.version>1.2.6</redback.version>
+ <redback.version>1.2.7</redback.version>
<jetty.version>6.1.19</jetty.version>
<slf4j.version>1.5.8</slf4j.version>
<binder.version>0.9</binder.version>
