This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch roller-6.1.x
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/roller-6.1.x by this push:
     new 82636611c Require POST for action methods that change data (#227)
82636611c is described below

commit 82636611c60fc6058542491cfe486162e5c6baff
Author: David M. Johnson <[email protected]>
AuthorDate: Thu Oct 29 22:49:29 2026 -0400

    Require POST for action methods that change data (#227)
    
    * Require POST or a salt for action methods that change data
    * Add the salt to the installer bootstrap links; note the change in 
CHANGES.md
    * Save common ping targets only on POST; redirect after link actions; fix 
invite links
    * Require POST, not a salt on GET, for action methods that change data
---
 CHANGES.md                                         |  7 ++
 .../weblogger/ui/struts2/admin/PingTargetEdit.java | 16 +++-
 .../weblogger/ui/struts2/admin/PingTargets.java    |  4 +-
 .../roller/weblogger/ui/struts2/core/MainMenu.java |  4 +-
 .../roller/weblogger/ui/struts2/editor/Pings.java  |  6 +-
 .../roller/weblogger/ui/struts2/util/UIAction.java |  3 +
 .../ui/struts2/util/ValidateSaltInterceptor.java   | 30 ++++++-
 app/src/main/resources/struts.xml                  | 21 +++++
 .../main/webapp/WEB-INF/jsps/admin/PingTargets.jsp | 20 +++--
 .../webapp/WEB-INF/jsps/core/CreateDatabase.jsp    | 14 +++-
 app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp | 24 +++---
 .../webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp   | 14 +++-
 app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp  | 32 ++++----
 .../ui/struts2/admin/PingTargetEditTest.java       | 94 ++++++++++++++++++++++
 .../struts2/util/ValidateSaltInterceptorTest.java  | 60 ++++++++++++++
 15 files changed, 300 insertions(+), 49 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 047994d7f..2bee3d9a1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -93,6 +93,13 @@
   holds an entry that has since gone back to draft. Updating an entry through
   AtomPub so that it is no longer published also removes it from the index,
   and so does deleting an entry through AtomPub.
+- **Actions that change data need a POST.** A request other than a POST
+  that calls an action method which changes data, for example
+  `pings!enable.rol`, is refused with `405 Method Not Allowed`. Roller's own
+  ping, invitation and installer links are now small forms that POST with
+  the page's form token, and return to the page afterwards. Saving a common
+  ping target needs a POST. A bookmark or script that calls such a URL with
+  a GET is refused.
 
 ### Bug fixes
 
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java
index 148dbc962..6689b8c64 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java
@@ -18,6 +18,8 @@
 
 package org.apache.roller.weblogger.ui.struts2.admin;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -26,13 +28,14 @@ import 
org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.business.pings.PingTargetManager;
 import org.apache.roller.weblogger.pojos.PingTarget;
 import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.struts2.interceptor.ServletRequestAware;
 import org.apache.struts2.convention.annotation.AllowedMethods;
 
 /**
  * Add or modify a common ping target.
  */
 // TODO: make this work @AllowedMethods({"execute","save"})
-public class PingTargetEdit extends UIAction {
+public class PingTargetEdit extends UIAction implements ServletRequestAware {
     
     private static Log log = LogFactory.getLog(PingTargetEdit.class);
 
@@ -42,6 +45,8 @@ public class PingTargetEdit extends UIAction {
     // ping target we are working on, if any
     private PingTarget pingTarget = null;
 
+    private String httpMethod = "GET";
+
     public PingTargetEdit() {
         this.desiredMenu = "admin";
     }
@@ -84,6 +89,10 @@ public class PingTargetEdit extends UIAction {
      */
     @Override
     public String execute() {
+        if (!"POST".equals(httpMethod)) {
+            return INPUT;
+        }
+
         myValidate();
 
         if (!hasActionErrors()) {
@@ -147,4 +156,9 @@ public class PingTargetEdit extends UIAction {
     public void setBean(PingTargetBean bean) {
         this.bean = bean;
     }
+
+    @Override
+    public void setServletRequest(HttpServletRequest req) {
+        httpMethod = req.getMethod();
+    }
 }
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
index c34fbc190..ff36eb3b7 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
@@ -116,7 +116,7 @@ public class PingTargets extends UIAction {
             addError("commonPingTargets.error.enabling");
         }
         
-        return LIST;
+        return DONE;
     }
     
     
@@ -140,7 +140,7 @@ public class PingTargets extends UIAction {
             addError("commonPingTargets.error.disabling");
         }
         
-        return LIST;
+        return DONE;
     }
 
     /**
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
index 566db7fc9..37164317f 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
@@ -77,7 +77,7 @@ public class MainMenu extends UIAction {
             addError("yourWebsites.permNotFound");
         }
         
-        return SUCCESS;
+        return DONE;
     }
     
     
@@ -99,7 +99,7 @@ public class MainMenu extends UIAction {
             addError("yourWebsites.permNotFound");
         }
         
-        return SUCCESS;
+        return DONE;
     }
 
     public List<WeblogPermission> getExistingPermissions() {
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
index 3a90368f7..f2c07e16a 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
@@ -129,7 +129,7 @@ public class Pings extends UIAction {
             }
         }
         
-        return execute();
+        return DONE;
     }
     
     
@@ -149,7 +149,7 @@ public class Pings extends UIAction {
             }
         }
         
-        return execute();
+        return DONE;
     }
     
     
@@ -188,7 +188,7 @@ public class Pings extends UIAction {
             }
         }
         
-        return execute();
+        return DONE;
     }
     
     
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
index b5be30dcb..e596aa226 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
@@ -63,6 +63,9 @@ public abstract class UIAction extends ActionSupport
     
     // a result for a cancel.
     public static final String CANCEL = "cancel";
+
+    // a result that redirects back to the page after a link changed data
+    public static final String DONE = "done";
     
     // the authenticated user accessing this action, or null if client is not 
logged in
     private User authenticatedUser = null;
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/ValidateSaltInterceptor.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/ValidateSaltInterceptor.java
index 76afb21da..49ae86b9d 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/ValidateSaltInterceptor.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/ValidateSaltInterceptor.java
@@ -19,8 +19,11 @@
 
 package org.apache.roller.weblogger.ui.struts2.util;
 
+import java.util.Set;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -28,18 +31,31 @@ import 
org.apache.roller.weblogger.ui.core.filters.SaltValidator;
 import org.apache.struts2.StrutsStatics;
 import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
 
+import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 
 /**
- * Validates salts after Struts has wrapped a multipart form request.
+ * Validates salts after Struts has wrapped a multipart form request, and
+ * refuses requests other than POST to action methods that change data.
  */
 public class ValidateSaltInterceptor extends AbstractInterceptor implements 
StrutsStatics {
 
     private static final long serialVersionUID = 2446434402795510394L;
     private static final Log log = 
LogFactory.getLog(ValidateSaltInterceptor.class);
 
+    /**
+     * Action methods that a GET may call. They only display data, except
+     * "activate", which the account activation e-mail links to and which is
+     * guarded by its one-time activation code. Any other method needs a POST,
+     * which ValidateSaltFilter checks for a salt.
+     */
+    static final Set<String> DISPLAY_METHODS = Set.of(
+            "execute", "input", "view", "search", "query", "edit", "cancel",
+            "firstSave", "folderCreated", "deleteConfirm",
+            "fetchDirectoryContentLight", "activate");
+
     @Override
     public String intercept(ActionInvocation invocation) throws Exception {
         ActionContext context = invocation.getInvocationContext();
@@ -66,6 +82,18 @@ public class ValidateSaltInterceptor extends 
AbstractInterceptor implements Stru
                     SaltValidator.VALIDATED_REQUEST_ATTRIBUTE, Boolean.TRUE);
         }
 
+        if (!"POST".equalsIgnoreCase(request.getMethod())
+                && 
!DISPLAY_METHODS.contains(invocation.getProxy().getMethod())) {
+            if (log.isDebugEnabled()) {
+                log.debug("Refused " + request.getMethod() + " to URL : "
+                        + request.getServletPath() + "; the action method 
needs a POST");
+            }
+            HttpServletResponse response = (HttpServletResponse) 
context.get(HTTP_RESPONSE);
+            response.setHeader("Allow", "POST");
+            response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+            return Action.NONE;
+        }
+
         return invocation.invoke();
     }
 }
diff --git a/app/src/main/resources/struts.xml 
b/app/src/main/resources/struts.xml
index ea14c602a..f1f984da0 100644
--- a/app/src/main/resources/struts.xml
+++ b/app/src/main/resources/struts.xml
@@ -179,7 +179,13 @@
         
         <action name="menu"
                 class="org.apache.roller.weblogger.ui.struts2.core.MainMenu">
+            <interceptor-ref name="rollerStack"/>
+            <!-- keep messages across the redirect after accept or decline -->
+            <interceptor-ref name="store">
+                <param name="operationMode">AUTOMATIC</param>
+            </interceptor-ref>
             <result type="tiles">.MainMenu</result>
+            <result name="done" type="redirectAction">menu</result>
             <allowed-methods>accept,decline,execute</allowed-methods>
         </action>
 
@@ -269,7 +275,13 @@
         <action name="commonPingTargets"
                 
class="org.apache.roller.weblogger.ui.struts2.admin.PingTargets">
             <result name="list" type="tiles">.PingTargets</result>
+            <interceptor-ref name="rollerStack"/>
+            <!-- keep messages across the redirect after enable or disable -->
+            <interceptor-ref name="store">
+                <param name="operationMode">AUTOMATIC</param>
+            </interceptor-ref>
             <result name="confirm" type="tiles">.PingTargetConfirm</result>
+            <result name="done" 
type="redirectAction">commonPingTargets</result>
             
<allowed-methods>delete,deleteConfirm,disable,enable,execute</allowed-methods>
         </action>
         
@@ -640,7 +652,16 @@
 
         <action name="pings"
                 class="org.apache.roller.weblogger.ui.struts2.editor.Pings">
+            <interceptor-ref name="rollerStack"/>
+            <!-- keep messages across the redirect after enable, disable or 
ping -->
+            <interceptor-ref name="store">
+                <param name="operationMode">AUTOMATIC</param>
+            </interceptor-ref>
             <result name="list" type="tiles">.Pings</result>
+            <result name="done" type="redirectAction">
+                <param name="actionName">pings</param>
+                <param name="weblog">${actionWeblog.handle}</param>
+            </result>
             <allowed-methods>disable,enable,execute,pingNow</allowed-methods>
         </action>
 
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/PingTargets.jsp 
b/app/src/main/webapp/WEB-INF/jsps/admin/PingTargets.jsp
index f0c328ce1..6ca93a518 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/PingTargets.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/PingTargets.jsp
@@ -53,20 +53,18 @@
 
             <td class="rollertable" align="center">
                 <s:if test="#pingTarget.autoEnabled">
-                    <s:url var="disablePing" 
action="commonPingTargets!disable">
-                        <s:param name="pingTargetId" value="#pingTarget.id"/>
-                    </s:url>
-                    <s:a href="%{disablePing}">
-                        <s:text name="pingTarget.disable"/>
-                    </s:a>
+                    <s:url var="pingActionUrl" 
action="commonPingTargets!disable" />
+                    <s:set var="pingActionLabel" value="'pingTarget.disable'" 
/>
                 </s:if>
                 <s:else>
-                    <s:url var="enablePing" action="commonPingTargets!enable">
-                        <s:param name="pingTargetId" value="#pingTarget.id"/>
-                    </s:url>
-                    <s:a href="%{enablePing}">
-                        <s:text name="pingTarget.enable"/></s:a>
+                    <s:url var="pingActionUrl" 
action="commonPingTargets!enable" />
+                    <s:set var="pingActionLabel" value="'pingTarget.enable'" />
                 </s:else>
+                <form action="<s:property value="#pingActionUrl" />" 
method="post" style="display: inline;">
+                    <input type="hidden" name="salt" value="<s:property 
value="salt" />" />
+                    <input type="hidden" name="pingTargetId" 
value="<s:property value="#pingTarget.id" />" />
+                    <button type="submit" class="btn btn-link" style="padding: 
0; border: 0; vertical-align: baseline;"><s:text name="%{#pingActionLabel}" 
/></button>
+                </form>
             </td>
 
             <td class="rollertable" align="center">
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp 
b/app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
index 66db1ca14..cfde84057 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
@@ -31,11 +31,23 @@
     <h2><s:text name="installer.tablesCreated" /></h2>
     
     <p><s:text name="installer.tablesCreatedExplanation" /></p>
+    <%-- the message's link submits this form; bootstrapping needs a POST --%>
     <p>
         <s:text name="installer.tryBootstrapping">
-            <s:param><s:url action="install!bootstrap"/></s:param>
+            <s:param>#bootstrap</s:param>
         </s:text>
     </p>
+    <s:url var="bootstrapUrl" action="install!bootstrap" />
+    <form id="bootstrapForm" action="<s:property value="#bootstrapUrl" />" 
method="post">
+        <input type="hidden" name="salt" value="<s:property value="salt" />" />
+        <noscript><button type="submit"><s:text name="installer.finishUpgrade" 
/></button></noscript>
+    </form>
+    <script>
+        
document.querySelector('a[href="#bootstrap"]').addEventListener('click', 
function (event) {
+            event.preventDefault();
+            document.getElementById('bootstrapForm').submit();
+        });
+    </script>
     
 <pre>
 <s:iterator value="messages"><s:property/><br /></s:iterator>
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp 
b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
index c90f69006..de6050cc5 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
@@ -34,19 +34,19 @@
             <s:param value="#invite.weblog.handle" />
         </s:text>
         
-        <s:url action="menu!accept" var="acceptInvite">
-            <s:param name="inviteId" value="#invite.weblog.id" />
-        </s:url>
-        <a href='<s:property value="acceptInvite" />'>
-            <s:text name="yourWebsites.accept" />
-        </a> 
+        <s:url action="menu!accept" var="acceptInvite" />
+        <form action="<s:property value="#acceptInvite" />" method="post" 
style="display: inline;">
+            <input type="hidden" name="salt" value="<s:property value="salt" 
/>" />
+            <input type="hidden" name="inviteId" value="<s:property 
value="#invite.weblog.id" />" />
+            <button type="submit" class="btn btn-link" style="padding: 0; 
border: 0; vertical-align: baseline;"><s:text name="yourWebsites.accept" 
/></button>
+        </form>
         &nbsp;|&nbsp;
-        <s:url action="menu!decline" var="declineInvite">
-            <s:param name="inviteId" value="#invite.weblog.id" />
-        </s:url>
-        <a href='<s:property value="declineInvite" />'>
-            <s:text name="yourWebsites.decline" />
-        </a><br />
+        <s:url action="menu!decline" var="declineInvite" />
+        <form action="<s:property value="#declineInvite" />" method="post" 
style="display: inline;">
+            <input type="hidden" name="salt" value="<s:property value="salt" 
/>" />
+            <input type="hidden" name="inviteId" value="<s:property 
value="#invite.weblog.id" />" />
+            <button type="submit" class="btn btn-link" style="padding: 0; 
border: 0; vertical-align: baseline;"><s:text name="yourWebsites.decline" 
/></button>
+        </form><br />
     </s:iterator>
     <br />
 </s:elseif>
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp 
b/app/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
index 945e91d80..70251c294 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
@@ -49,11 +49,23 @@
     <h2><s:text name="installer.tablesUpgraded"/></h2>
 
     <p><s:text name="installer.tablesUpgradedExplanation"/></p>
+    <%-- the message's link submits this form; bootstrapping needs a POST --%>
     <p>
         <s:text name="installer.tryBootstrapping">
-            <s:param><s:url action="install!bootstrap"/></s:param>
+            <s:param>#bootstrap</s:param>
         </s:text>
     </p>
+    <s:url var="bootstrapUrl" action="install!bootstrap" />
+    <form id="bootstrapForm" action="<s:property value="#bootstrapUrl" />" 
method="post">
+        <input type="hidden" name="salt" value="<s:property value="salt" />" />
+        <noscript><button type="submit"><s:text name="installer.finishUpgrade" 
/></button></noscript>
+    </form>
+    <script>
+        
document.querySelector('a[href="#bootstrap"]').addEventListener('click', 
function (event) {
+            event.preventDefault();
+            document.getElementById('bootstrapForm').submit();
+        });
+    </script>
 
     <pre>
         <s:iterator value="messages"><s:property/><br/></s:iterator>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp 
b/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
index fa90d6ab6..3591df115 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
@@ -68,27 +68,29 @@
     <!-- TODO: Use icons here -->
     <td class="rollertable" align="center" >
         <s:if test="pingStatus[#pingTarget.id]">
-            <s:url var="disableUrl" action="pings!disable" >
-                <s:param name="weblog" value="%{actionWeblog.handle}" />
-                <s:param name="pingTargetId" value="#pingTarget.id" />
-            </s:url>
-            <s:a href="%{disableUrl}"><s:text name="pingTarget.disable"/></s:a>
+            <s:url var="pingActionUrl" action="pings!disable" />
+            <s:set var="pingActionLabel" value="'pingTarget.disable'" />
         </s:if>
         <s:else>
-            <s:url var="enableUrl" action="pings!enable" >
-                <s:param name="weblog" value="%{actionWeblog.handle}" />
-                <s:param name="pingTargetId" value="#pingTarget.id" />
-            </s:url>
-            <s:a href="%{enableUrl}"><s:text name="pingTarget.enable"/></s:a>
+            <s:url var="pingActionUrl" action="pings!enable" />
+            <s:set var="pingActionLabel" value="'pingTarget.enable'" />
         </s:else>
+        <form action="<s:property value="#pingActionUrl" />" method="post" 
style="display: inline;">
+            <input type="hidden" name="salt" value="<s:property value="salt" 
/>" />
+            <input type="hidden" name="weblog" value="<s:property 
value="actionWeblog.handle" />" />
+            <input type="hidden" name="pingTargetId" value="<s:property 
value="#pingTarget.id" />" />
+            <button type="submit" class="btn btn-link" style="padding: 0; 
border: 0; vertical-align: baseline;"><s:text name="%{#pingActionLabel}" 
/></button>
+        </form>
     </td>
     
     <td class="rollertable">
-        <s:url var="pingNowUrl" action="pings!pingNow" >
-            <s:param name="weblog" value="%{actionWeblog.handle}" />
-            <s:param name="pingTargetId" value="#pingTarget.id" />
-        </s:url>
-        <s:a href="%{pingNowUrl}"><s:text name="pingTarget.sendPingNow"/></s:a>
+        <s:url var="pingNowUrl" action="pings!pingNow" />
+        <form action="<s:property value="#pingNowUrl" />" method="post" 
style="display: inline;">
+            <input type="hidden" name="salt" value="<s:property value="salt" 
/>" />
+            <input type="hidden" name="weblog" value="<s:property 
value="actionWeblog.handle" />" />
+            <input type="hidden" name="pingTargetId" value="<s:property 
value="#pingTarget.id" />" />
+            <button type="submit" class="btn btn-link" style="padding: 0; 
border: 0; vertical-align: baseline;"><s:text name="pingTarget.sendPingNow" 
/></button>
+        </form>
     </td>
     
     </tr>
diff --git 
a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEditTest.java
 
b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEditTest.java
new file mode 100644
index 000000000..df8ee3f0f
--- /dev/null
+++ 
b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEditTest.java
@@ -0,0 +1,94 @@
+/*
+ * 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.roller.weblogger.ui.struts2.admin;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.roller.weblogger.business.Weblogger;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class PingTargetEditTest {
+
+    @Test
+    void getDoesNotSave() throws Exception {
+        PingTargetManager pingTargets = pingTargetManager();
+        try (MockedStatic<WebloggerFactory> factory = 
mockStatic(WebloggerFactory.class)) {
+            Weblogger weblogger = weblogger(factory, pingTargets);
+            PingTargetEdit action = action("GET");
+
+            assertEquals(PingTargetEdit.INPUT, action.execute());
+            verify(pingTargets, never()).savePingTarget(any());
+            verify(weblogger, never()).flush();
+        }
+    }
+
+    @Test
+    void postSaves() throws Exception {
+        PingTargetManager pingTargets = pingTargetManager();
+        try (MockedStatic<WebloggerFactory> factory = 
mockStatic(WebloggerFactory.class)) {
+            Weblogger weblogger = weblogger(factory, pingTargets);
+            PingTargetEdit action = action("POST");
+
+            assertEquals(PingTargetEdit.SUCCESS, action.execute());
+            verify(pingTargets).savePingTarget(any(PingTarget.class));
+            verify(weblogger).flush();
+        }
+    }
+
+    private static PingTargetManager pingTargetManager() throws Exception {
+        PingTargetManager pingTargets = mock(PingTargetManager.class);
+        when(pingTargets.isUrlWellFormed(anyString())).thenReturn(true);
+        when(pingTargets.isHostnameKnown(anyString())).thenReturn(true);
+        return pingTargets;
+    }
+
+    private static Weblogger weblogger(MockedStatic<WebloggerFactory> factory,
+            PingTargetManager pingTargets) {
+        Weblogger weblogger = mock(Weblogger.class);
+        when(weblogger.getPingTargetManager()).thenReturn(pingTargets);
+        factory.when(WebloggerFactory::getWeblogger).thenReturn(weblogger);
+        return weblogger;
+    }
+
+    private static PingTargetEdit action(String method) {
+        PingTargetEdit action = spy(new PingTargetEdit());
+        doAnswer(call -> 
call.getArgument(0)).when(action).getText(anyString(), anyString(), 
anyString());
+        action.setActionName("commonPingTargetAdd");
+        action.getBean().setName("example");
+        action.getBean().setPingUrl("http://ping.example.com/rpc";);
+        HttpServletRequest request = mock(HttpServletRequest.class);
+        when(request.getMethod()).thenReturn(method);
+        action.setServletRequest(request);
+        action.myPrepare();
+        return action;
+    }
+}
diff --git 
a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/util/ValidateSaltInterceptorTest.java
 
b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/util/ValidateSaltInterceptorTest.java
index 1aea1b664..91a869d25 100644
--- 
a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/util/ValidateSaltInterceptorTest.java
+++ 
b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/util/ValidateSaltInterceptorTest.java
@@ -21,6 +21,7 @@ package org.apache.roller.weblogger.ui.struts2.util;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.ui.core.RollerSession;
@@ -34,8 +35,10 @@ import org.mockito.Mock;
 import org.mockito.MockedStatic;
 import org.mockito.MockitoAnnotations;
 
+import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -197,6 +200,63 @@ public class ValidateSaltInterceptorTest {
         verify(invocation).invoke();
     }
 
+    @Test
+    public void testGetToDataChangingMethodIsRefused() throws Exception {
+        HttpServletResponse response = mock(HttpServletResponse.class);
+        when(context.get(StrutsStatics.HTTP_RESPONSE)).thenReturn(response);
+        configureGet("/roller-ui/authoring/pings!disable.rol", "disable");
+
+        assertEquals(Action.NONE, interceptor.intercept(invocation));
+        verify(response).sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+        verify(response).setHeader("Allow", "POST");
+        verify(invocation, never()).invoke();
+    }
+
+    @Test
+    public void testGetToDataChangingMethodIsRefusedEvenWithSalt() throws 
Exception {
+        HttpServletResponse response = mock(HttpServletResponse.class);
+        when(context.get(StrutsStatics.HTTP_RESPONSE)).thenReturn(response);
+        configureGet("/roller-ui/authoring/pings!enable.rol", "enable");
+        when(request.getParameter("salt")).thenReturn("validSalt");
+
+        assertEquals(Action.NONE, interceptor.intercept(invocation));
+        verify(response).sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+        verify(invocation, never()).invoke();
+    }
+
+    @Test
+    public void testPostToDataChangingMethodIsInvoked() throws Exception {
+        ActionProxy proxy = mock(ActionProxy.class);
+        when(proxy.getMethod()).thenReturn("enable");
+        when(invocation.getProxy()).thenReturn(proxy);
+        when(request.getMethod()).thenReturn("POST");
+        
when(request.getContentType()).thenReturn("application/x-www-form-urlencoded");
+        when(invocation.invoke()).thenReturn("done");
+
+        assertEquals("done", interceptor.intercept(invocation));
+    }
+
+    @Test
+    public void testGetToDisplayMethodNeedsNoSalt() throws Exception {
+        try (MockedStatic<RollerSession> mockedRollerSession = 
mockStatic(RollerSession.class)) {
+            mockedRollerSession.when(() -> 
RollerSession.getRollerSession(request)).thenReturn(rollerSession);
+            for (String method : new String[] {"execute", "view", 
"firstSave"}) {
+                configureGet("/roller-ui/authoring/page!" + method + ".rol", 
method);
+                when(invocation.invoke()).thenReturn("success");
+                assertEquals("success", interceptor.intercept(invocation));
+            }
+            verify(request, never()).getParameter("salt");
+        }
+    }
+
+    private void configureGet(String servletPath, String method) {
+        ActionProxy proxy = mock(ActionProxy.class);
+        when(proxy.getMethod()).thenReturn(method);
+        when(invocation.getProxy()).thenReturn(proxy);
+        when(request.getMethod()).thenReturn("GET");
+        when(request.getServletPath()).thenReturn(servletPath);
+    }
+
     private void configureMultipartPost(String servletPath) {
         when(request.getMethod()).thenReturn("POST");
         when(request.getContentType()).thenReturn("multipart/form-data; 
boundary=abc123");

Reply via email to