continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1548065 - in /continuum/branches/CONTINUUM-2713: continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ continuum-webapp/src/main/resources/ continuum-webapp/src/main/webapp/WEB-INF/jsp/components/
Date Thu, 05 Dec 2013 10:00:09 GMT
Author: brett
Date: Thu Dec  5 10:00:08 2013
New Revision: 1548065

URL: http://svn.apache.org/r1548065
Log:
[CONTINUUM-2713] remove DMI from delete project action

Modified:
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/CSRFSecurityTest.java
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/CSRFSecurityTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/CSRFSecurityTest.java?rev=1548065&r1=1548064&r2=1548065&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/CSRFSecurityTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/CSRFSecurityTest.java
Thu Dec  5 10:00:08 2013
@@ -32,7 +32,7 @@ public class CSRFSecurityTest
     public void testCSRFDeleteProject()
     {
         getSelenium().open( baseUrl );
-        getSelenium().open( baseUrl + "/deleteProject!default.action?projectGroupId=2&projectId=2"
);
+        getSelenium().open( baseUrl + "/deleteProject_default.action?projectGroupId=2&projectId=2"
);
         assertTextPresent( "Security Alert - Invalid Token Found" );
         assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request."
);
     }

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml?rev=1548065&r1=1548064&r2=1548065&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml Thu Dec
 5 10:00:08 2013
@@ -292,6 +292,17 @@
       </result>
     </action>
 
+    <action name="deleteProject_default" class="deleteProject" method="default">
+      <interceptor-ref name="storeStack">
+        <param name="tokenSession.includeMethods">*</param>
+      </interceptor-ref>
+      <result name="delete">/WEB-INF/jsp/deleteProject.jsp</result>
+      <result name="success" type="redirectAction">
+        <param name="actionName">projectGroupSummary</param>
+        <param name="projectGroupId">${projectGroupId}</param>
+      </result>
+    </action>
+
     <action name="deleteProject" class="deleteProject">
       <interceptor-ref name="storeStack">
         <param name="tokenSession.includeMethods">*</param>

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?rev=1548065&r1=1548064&r2=1548065&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
Thu Dec  5 10:00:08 2013
@@ -211,7 +211,7 @@
           <c:when
               test="${projectIdle}">
             <s:token/>
-            <s:url id="deleteProjectUrl" value="deleteProject!default.action" namespace="/">
+            <s:url id="deleteProjectUrl" value="deleteProject_default.action" namespace="/">
               <s:param name="projectId"><c:out value="${project.id}"/></s:param>
               <s:param name="struts.token.name">token</s:param>
               <s:param name="token"><s:property value="token"/></s:param>



Mime
View raw message