You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2026/09/25 14:45:35 UTC

(jspwiki) 31/33: JSPWIKI-1228 see jira for details

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

juanpablo-santos pushed a commit to branch master-2.x
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit c084bb9e8b2a9ae63de012f5b4f06cf67a5d872b
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Sep 25 13:34:03 2026 +0200

    JSPWIKI-1228 see jira for details
---
 .../wiki/ajax/WikiAjaxDispatcherServlet.java       | 27 ++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
index 24edcb02a..8815a36f9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
@@ -23,9 +23,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.wiki.api.core.Engine;
+import org.apache.wiki.api.core.Session;
 import org.apache.wiki.api.spi.Wiki;
 import org.apache.wiki.auth.AuthorizationManager;
+import org.apache.wiki.auth.SessionMonitor;
 import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.event.WikiEventManager;
+import org.apache.wiki.event.WikiSecurityEvent;
 import org.apache.wiki.util.TextUtil;
 
 import javax.servlet.ServletConfig;
@@ -129,10 +133,23 @@ public class WikiAjaxDispatcherServlet extends HttpServlet {
             final AjaxServletContainer container = findServletContainer( servletName );
             if( container != null ) {
                 final WikiAjaxServlet servlet = container.servlet;
+                final Session wikiSession = SessionMonitor.getInstance( m_engine ).find( req.getSession() );
                 if ( validatePermission( req, container ) ) {
                     req.setCharacterEncoding( m_engine.getContentEncoding().displayName() );
                     res.setCharacterEncoding( m_engine.getContentEncoding().displayName() );
                     final String actionName = AjaxUtil.getNextPathPart( req.getRequestURI(), servlet.getServletMapping() );
+                    // Prefer the request header: a token sent as a GET parameter ends up in access logs and
+                    // browser history. The parameter is still accepted for compatibility with older clients.
+                    String xsrfToken = req.getHeader( "X-XSRF-TOKEN" );
+                    if( xsrfToken == null ) {
+                        xsrfToken = req.getParameter( "X-XSRF-TOKEN" );
+                    }
+                    if( !wikiSession.antiCsrfToken().equals( xsrfToken ) ) {
+                        res.sendError( 400, "X-XSRF-TOKEN missing or invalid." );
+                        WikiEventManager.fireEvent( this, new WikiSecurityEvent( wikiSession, WikiSecurityEvent.ACCESS_DENIED,
+                                                                                req.getUserPrincipal(), "X-XSRF-TOKEN missing or invalid." ) );
+                        return;
+                    }
                     LOG.debug( "actionName=" + actionName );
                     final String params = req.getParameter( "params" );
                     LOG.debug( "params=" + params );
@@ -145,10 +162,16 @@ public class WikiAjaxDispatcherServlet extends HttpServlet {
                     servlet.service( req, res, actionName, paramValues );
                 } else {
                     LOG.warn( "Servlet container " + container + " not authorised. Permission required." );
+                    WikiEventManager.fireEvent( this, new WikiSecurityEvent( wikiSession, WikiSecurityEvent.ACCESS_DENIED,
+                                                                            req.getUserPrincipal(), container.permission ) );
+                    res.sendError( 400, "Denied." );
+                    return;
                 }
             } else {
-                LOG.error( "No registered class for servletName=" + servletName + " in path=" + path );
-                throw new ServletException( "No registered class for servletName=" + servletName );
+                LOG.warn( "No registered class for servletName=" + servletName + " in path=" + path );
+                res.sendError( 400, "Unknown Service." );
+                //should this be an auditable event?
+                //throw new ServletException( "No registered class for servletName=" + servletName );
             }
         }
     }