CVE-2023-36469: Improper Neutralization of Special Elements in Output Used by a Downstream Component ('Injection') (CWE-74)
value: XWiki Platform is a generic wiki platform offering runtime services for applications built on top of it. Any user who can edit their own user profile and notification settings can execute arbitrary script macros including Groovy and Python macros that allow remote code execution including unrestricted read and write access to all wiki contents. This has been patched in XWiki 14.10.6 and 15.2RC1. Users are advised to update. As a workaround the main security fix can be manually applied by patching the affected document `XWiki.Notifications.Code.NotificationRSSService`. This will break the link to the differences, though as this requires additional changes to Velocity templates as shown in the patch. While the default template is available in the instance and can be easily patched, the template for mentions is contained in a `.jar`-file and thus cannot be fixed without replacing that jar.
CWE description: The product constructs all or part of a command, data structure, or record using externally-influenced input from an upstream component, but it does not neutralize or incorrectly neutralizes special elements that could modify how it is parsed or interpreted when it is sent to a downstream component.
CVSS v3 base score: 8.8
Published: 2023-06-29T21:15Z
Repository: https://github.com/xwiki/xwiki-platform
Language: XML
Files changed: xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/src/main/resources/templates/notification/rss/mentions.mention.vm, xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml, xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationRSSService.xml, xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/test/java/org/xwiki/notifications/NotificationRSSServicePageTest.java, xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/rss/default.vm
Commit date: 2023-02-27 09:57:38 +0100
Commit message: XWIKI-20610: Notification RSS feed is parsed as XWiki syntax

* Write the feed directly to the response.
* Use the source parameter of the code macro.
* Add page test.

Diff: diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/src/main/resources/templates/notification/rss/mentions.mention.vm b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/src/main/resources/templates/notification/rss/mentions.mention.vm
index 7659f2710d3ae..10026f354dd7e 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/src/main/resources/templates/notification/rss/mentions.mention.vm
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/src/main/resources/templates/notification/rss/mentions.mention.vm
@@ -60,9 +60,9 @@
         #end
         #if ($newdoc.version)
           #set ($externalURL = $newdoc.getExternalURL('view',
             "viewer=changes&rev1=${origdoc.version}&rev2=${newdoc.version}"))
           #set ($diffLink = "<a href='$externalURL'>${newdoc.version}</a>")
-          $services.localization.render('notifications.rss.seeChanges', 'xwiki/2.1', [$diffLink])
+          $services.localization.render('notifications.rss.seeChanges', [$diffLink])
         #end
     #end
 </p>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml
index 2c2ef6366405f..10f4c946ef453 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml
@@ -124,7 +124,20 @@
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-date</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <!-- Needed for NotificationRSSService. -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-rendering-macro-code</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-test-page</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationRSSService.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationRSSService.xml
index edb2b0d57d6ad..ee0f40edecc6d 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationRSSService.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationRSSService.xml
@@ -35,17 +35,26 @@
   <comment/>
   <minorEdit>false</minorEdit>
   <syntaxId>xwiki/2.1</syntaxId>
   <hidden>true</hidden>
   <content>{{velocity}}
+#set ($feedContent = $services.notification.notifiers.getFeed(20))
 #if ($xcontext.action == 'get' &amp;&amp; "$request.outputSyntax" == 'plain')
-  #set($discard = $response.setContentType('application/xml'))
+  #set ($characterEncoding = 'utf-8')
+  #set ($discard = $response.setContentType('application/xml'))
+  ## Make sure the Character Encoding response header matches the character encoding used to write the response and
+  ## compute its length.
+  #set ($discard = $response.setCharacterEncoding($characterEncoding))
+  ## We write the output directly to the response to avoid the execution of the Rendering Transformations.
+  #set ($discard = $response.writer.print($feedContent))
+  ## The content length is measured in bytes and one character can use more than one byte.
+  #set ($discard = $response.setContentLength($feedContent.getBytes($characterEncoding).size()))
+  ## Make sure the entire content is send back to the client.
+  #set ($discard = $response.flushBuffer())
+  ## Make sure XWiki doesn't write any more content to the response.
+  #set ($discard = $xcontext.setFinished(true))
 #else
-  {{code language="xml"}}
-#end
-$services.notification.notifiers.getFeed(20)
-#if ($xcontext.action != 'get' || "$request.outputSyntax" != 'plain')
-  {{/code}}
+  {{code language="xml" source="script:feedContent" /}}
 #end
 {{/velocity}}
 </content>
 </xwikidoc>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/test/java/org/xwiki/notifications/NotificationRSSServicePageTest.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/test/java/org/xwiki/notifications/NotificationRSSServicePageTest.java
new file mode 100644
index 0000000000000..d0b957d356fb8
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/test/java/org/xwiki/notifications/NotificationRSSServicePageTest.java
@@ -0,0 +1,142 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.notifications;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.xwiki.model.reference.DocumentReference;
+import org.xwiki.notifications.notifiers.script.NotificationNotifiersScriptService;
+import org.xwiki.notifications.script.NotificationScriptService;
+import org.xwiki.rendering.block.WordBlock;
+import org.xwiki.rendering.internal.code.layout.PlainLayoutHandler;
+import org.xwiki.rendering.internal.macro.code.CodeMacro;
+import org.xwiki.rendering.internal.macro.code.source.DefaultCodeMacroSourceFactory;
+import org.xwiki.rendering.internal.macro.code.source.ScriptCodeMacroSourceFactory;
+import org.xwiki.rendering.internal.macro.script.source.ScriptMacroContentWikiSourceFactory;
+import org.xwiki.rendering.internal.macro.source.MacroContentSourceReferenceConverter;
+import org.xwiki.rendering.parser.HighlightParser;
+import org.xwiki.rendering.syntax.Syntax;
+import org.xwiki.script.service.ScriptService;
+import org.xwiki.test.annotation.ComponentList;
+import org.xwiki.test.junit5.mockito.MockComponent;
+import org.xwiki.test.mockito.MockitoComponentManager;
+import org.xwiki.test.page.HTML50ComponentList;
+import org.xwiki.test.page.PageTest;
+import org.xwiki.test.page.XWikiSyntax21ComponentList;
+import org.xwiki.text.StringUtils;
+
+import com.xpn.xwiki.web.XWikiServletResponseStub;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+/**
+ * Test for {@code NotificationRSSService}.
+ *
+ * @version $Id$
+ */
+@HTML50ComponentList
+@XWikiSyntax21ComponentList
+@ComponentList({
+    CodeMacro.class,
+    DefaultCodeMacroSourceFactory.class,
+    ScriptCodeMacroSourceFactory.class,
+    ScriptMacroContentWikiSourceFactory.class,
+    MacroContentSourceReferenceConverter.class,
+    PlainLayoutHandler.class
+})
+class NotificationRSSServicePageTest extends PageTest
+{
+    private static final DocumentReference RSS_DOCUMENT_REFERENCE =
+        new DocumentReference("xwiki", List.of("XWiki", "Notifications", "Code"), "NotificationRSSService");
+
+    private static final String NOTIFIERS_HINT = "notification.notifiers";
+
+    private NotificationNotifiersScriptService notifiersScriptService;
+
+    @MockComponent
+    private HighlightParser highlightParser;
+
+    @BeforeEach
+    public void setUp(MockitoComponentManager componentManager) throws Exception
+    {
+        NotificationScriptService notificationScriptService =
+            componentManager.registerMockComponent(ScriptService.class, "notification",
+                NotificationScriptService.class, false);
+        this.notifiersScriptService = componentManager.registerMockComponent(ScriptService.class,
+            NOTIFIERS_HINT, NotificationNotifiersScriptService.class, false);
+        when(notificationScriptService.get("notifiers")).thenReturn(this.notifiersScriptService);
+    }
+
+    @Test
+    void rssResult() throws Exception
+    {
+        loadPage(RSS_DOCUMENT_REFERENCE);
+        this.request.put("outputSyntax", "plain");
+        this.setOutputSyntax(Syntax.PLAIN_1_0);
+        this.context.setAction("get");
+
+        String testContent = "//Test//";
+        when(this.notifiersScriptService.getFeed(anyInt())).thenReturn(testContent);
+
+        StringWriter out = new StringWriter();
+        PrintWriter writer = new PrintWriter(out);
+
+        this.response = new XWikiServletResponseStub() {
+            @Override
+            public PrintWriter getWriter() throws IOException
+            {
+                return writer;
+            }
+        };
+        this.context.setResponse(this.response);
+
+        String result = renderPage(RSS_DOCUMENT_REFERENCE);
+        assertTrue(StringUtils.isAllBlank(result));
+        assertEquals(testContent, out.toString());
+    }
+
+    @Test
+    void codeMacroResult() throws Exception
+    {
+        loadPage(RSS_DOCUMENT_REFERENCE);
+
+        String testContent = "{{/code}}";
+        when(this.notifiersScriptService.getFeed(anyInt())).thenReturn(testContent);
+        when(this.highlightParser.highlight(eq("xml"), any())).then(invocation ->
+        {
+            Reader source = invocation.getArgument(1);
+            return List.of(new WordBlock(IOUtils.toString(source)));
+        });
+        String result = renderPage(RSS_DOCUMENT_REFERENCE);
+        assertEquals("<div class=\"box\"><div class=\"code\">&#123;&#123;/code}}</div></div>", result);
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/rss/default.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/rss/default.vm
index 34c7ee547f613..6d4ca889e5be6 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/rss/default.vm
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/rss/default.vm
@@ -65,9 +65,9 @@
 #end
 #if ($newdoc.version)
   #set ($externalURL = $newdoc.getExternalURL('view',
     "viewer=changes&rev1=${origdoc.version}&rev2=${newdoc.version}"))
   #set ($diffLink = "<a href='$externalURL'>${newdoc.version}</a>")
-  $services.localization.render('notifications.rss.seeChanges', 'xwiki/2.1', [$diffLink])
+  $services.localization.render('notifications.rss.seeChanges', [$diffLink])
 #end
 #end
 </p>

Vulnerable code:           $services.localization.render('notifications.rss.seeChanges', 'xwiki/2.1', [$diffLink])
  #set($discard = $response.setContentType('application/xml'))
  {{code language="xml"}}
#end
$services.notification.notifiers.getFeed(20)
#if ($xcontext.action != 'get' || "$request.outputSyntax" != 'plain')
  {{/code}}
  $services.localization.render('notifications.rss.seeChanges', 'xwiki/2.1', [$diffLink])
Fixed code:           $services.localization.render('notifications.rss.seeChanges', [$diffLink])
    <!-- Needed for NotificationRSSService. -->
    <dependency>
      <groupId>org.xwiki.platform</groupId>
      <artifactId>xwiki-platform-rendering-macro-code</artifactId>
      <version>${project.version}</version>
      <scope>runtime</scope>
    </dependency>
    <dependency>
      <groupId>org.xwiki.platform</groupId>
      <artifactId>xwiki-platform-test-page</artifactId>
      <version>${project.version}</version>
      <scope>test</scope>
    </dependency>
#set ($feedContent = $services.notification.notifiers.getFeed(20))
  #set ($characterEncoding = 'utf-8')
  #set ($discard = $response.setContentType('application/xml'))
  ## Make sure the Character Encoding response header matches the character encoding used to write the response and
  ## compute its length.
  #set ($discard = $response.setCharacterEncoding($characterEncoding))
  ## We write the output directly to the response to avoid the execution of the Rendering Transformations.
  #set ($discard = $response.writer.print($feedContent))
  ## The content length is measured in bytes and one character can use more than one byte.
  #set ($discard = $response.setContentLength($feedContent.getBytes($characterEncoding).size()))
  ## Make sure the entire content is send back to the client.
  #set ($discard = $response.flushBuffer())
  ## Make sure XWiki doesn't write any more content to the response.
  #set ($discard = $xcontext.setFinished(true))
  {{code language="xml" source="script:feedContent" /}}
/*
 * See the NOTICE file distributed with this work for additional
 * information regarding copyright ownership.
 *
 * This is free software; you can redistribute it and/or modify it
 * under the terms of the GNU Lesser General Public License as
 * published by the Free Software Foundation; either version 2.1 of
 * the License, or (at your option) any later version.
 *
 * This software is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this software; if not, write to the Free
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
package org.xwiki.notifications;

import java.io.IOException;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.StringWriter;
import java.util.List;

import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.xwiki.model.reference.DocumentReference;
import org.xwiki.notifications.notifiers.script.NotificationNotifiersScriptService;
import org.xwiki.notifications.script.NotificationScriptService;
import org.xwiki.rendering.block.WordBlock;
import org.xwiki.rendering.internal.code.layout.PlainLayoutHandler;
import org.xwiki.rendering.internal.macro.code.CodeMacro;
import org.xwiki.rendering.internal.macro.code.source.DefaultCodeMacroSourceFactory;
import org.xwiki.rendering.internal.macro.code.source.ScriptCodeMacroSourceFactory;
import org.xwiki.rendering.internal.macro.script.source.ScriptMacroContentWikiSourceFactory;
import org.xwiki.rendering.internal.macro.source.MacroContentSourceReferenceConverter;
import org.xwiki.rendering.parser.HighlightParser;
import org.xwiki.rendering.syntax.Syntax;
import org.xwiki.script.service.ScriptService;
import org.xwiki.test.annotation.ComponentList;
import org.xwiki.test.junit5.mockito.MockComponent;
import org.xwiki.test.mockito.MockitoComponentManager;
import org.xwiki.test.page.HTML50ComponentList;
import org.xwiki.test.page.PageTest;
import org.xwiki.test.page.XWikiSyntax21ComponentList;
import org.xwiki.text.StringUtils;

import com.xpn.xwiki.web.XWikiServletResponseStub;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.when;

/**
 * Test for {@code NotificationRSSService}.
 *
 * @version $Id$
 */
@HTML50ComponentList
@XWikiSyntax21ComponentList
@ComponentList({
    CodeMacro.class,
    DefaultCodeMacroSourceFactory.class,
    ScriptCodeMacroSourceFactory.class,
    ScriptMacroContentWikiSourceFactory.class,
    MacroContentSourceReferenceConverter.class,
    PlainLayoutHandler.class
})
class NotificationRSSServicePageTest extends PageTest
{
    private static final DocumentReference RSS_DOCUMENT_REFERENCE =
        new DocumentReference("xwiki", List.of("XWiki", "Notifications", "Code"), "NotificationRSSService");

    private static final String NOTIFIERS_HINT = "notification.notifiers";

    private NotificationNotifiersScriptService notifiersScriptService;

    @MockComponent
    private HighlightParser highlightParser;

    @BeforeEach
    public void setUp(MockitoComponentManager componentManager) throws Exception
    {
        NotificationScriptService notificationScriptService =
            componentManager.registerMockComponent(ScriptService.class, "notification",
                NotificationScriptService.class, false);
        this.notifiersScriptService = componentManager.registerMockComponent(ScriptService.class,
            NOTIFIERS_HINT, NotificationNotifiersScriptService.class, false);
        when(notificationScriptService.get("notifiers")).thenReturn(this.notifiersScriptService);
    }

    @Test
    void rssResult() throws Exception
    {
        loadPage(RSS_DOCUMENT_REFERENCE);
        this.request.put("outputSyntax", "plain");
        this.setOutputSyntax(Syntax.PLAIN_1_0);
        this.context.setAction("get");

        String testContent = "//Test//";
        when(this.notifiersScriptService.getFeed(anyInt())).thenReturn(testContent);

        StringWriter out = new StringWriter();
        PrintWriter writer = new PrintWriter(out);

        this.response = new XWikiServletResponseStub() {
            @Override
            public PrintWriter getWriter() throws IOException
            {
                return writer;
            }
        };
        this.context.setResponse(this.response);

        String result = renderPage(RSS_DOCUMENT_REFERENCE);
        assertTrue(StringUtils.isAllBlank(result));
        assertEquals(testContent, out.toString());
    }

    @Test
    void codeMacroResult() throws Exception
    {
        loadPage(RSS_DOCUMENT_REFERENCE);

        String testContent = "{{/code}}";
        when(this.notifiersScriptService.getFeed(anyInt())).thenReturn(testContent);
        when(this.highlightParser.highlight(eq("xml"), any())).then(invocation ->
        {
            Reader source = invocation.getArgument(1);
            return List.of(new WordBlock(IOUtils.toString(source)));
        });
        String result = renderPage(RSS_DOCUMENT_REFERENCE);
        assertEquals("<div class=\"box\"><div class=\"code\">&#123;&#123;/code}}</div></div>", result);
    }
}
  $services.localization.render('notifications.rss.seeChanges', [$diffLink])