Fix XSS issue in handling attachment filename extension in mimetype m…

…ismatch warning (#8193)
roundcube · Aug 31, 2021 · faf99bf · faf99bf
1 parent c59a5ca
commit faf99bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail
 - Fix handling of custom sender addresses with names (#8106)
 - Fix shift + drag'n'drop menu not working in Elastic skin with Chrome browser (#8107)
 - Fix Firefox infinate loading display on mail screen (#8128)
+- Fix XSS issue in handling attachment filename extension in mimetype mismatch warning (#8193)
 
 RELEASE 1.4.11
 --------------

diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
@@ -187,8 +187,8 @@ if (empty($_GET['_thumb']) && $attachment->is_valid()) {
                         $RCMAIL->gettext(array(
                                 'name' => 'attachmentvalidationerror',
                                 'vars' => array(
-                                    'expected' => $mimetype . ($file_extension ? " (.$file_extension)" : ''),
-                                    'detected' => $real_mimetype . ($extensions[0] ? " (.$extensions[0])" : ''),
+                                    'expected' => $mimetype . (!empty($file_extension) ? rcube::Q(" (.{$file_extension})") : ''),
+                                    'detected' => $real_mimetype . (!empty($extensions[0]) ? " (.{$extensions[0]})" : ''),
                                 )
                             )
                         ),