Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Maria Odea B. Ching 2011-04-12 07:07:05 +00:00
parent d680a4f05e
commit e54e7dccc3
4 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
View File

@ -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>

4
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
View File

@ -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}" />

4
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
View File

@ -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}"/>

22
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
View File

@ -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>
@ -69,13 +54,6 @@
</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-mapping>
<filter-name>encodingFilter</filter-name>
<url-pattern>/*</url-pattern>