Просмотр исходного кода

Fix HTML injection in extension names (#9608)

Fix [GHSA-crc7-3qcq-m9h3](https://github.com/FreshRSS/FreshRSS/security/advisories/GHSA-crc7-3qcq-m9h3)
Inverle 13 часов назад
Родитель
Сommit
6a6b23bf82
3 измененных файлов с 24 добавлено и 20 удалено
  1. 1 0
      CHANGELOG.md
  2. 21 18
      app/Controllers/extensionController.php
  3. 2 2
      app/views/helpers/extension/details.phtml

+ 1 - 0
CHANGELOG.md

@@ -48,6 +48,7 @@ See also [the FreshRSS releases](https://github.com/FreshRSS/FreshRSS/releases).
 	* Fix escape labels during JSON import and render tag dropdown as text [#9504](https://github.com/FreshRSS/FreshRSS/pull/9504)
 	* More security for extension files: `X-Content-Type-Options: nosniff` [#9593](https://github.com/FreshRSS/FreshRSS/pull/9593), [GHSA-w38f-92pp-95hg](https://github.com/FreshRSS/FreshRSS/security/advisories/GHSA-w38f-92pp-95hg)
 	* Fix HTML injection in view mode error notification [#9605](https://github.com/FreshRSS/FreshRSS/pull/9605), [GHSA-wpf6-5v7v-6cvj](https://github.com/FreshRSS/FreshRSS/security/advisories/GHSA-wpf6-5v7v-6cvj)
+	* Fix HTML injection in extension names [#9608](https://github.com/FreshRSS/FreshRSS/pull/9608), [GHSA-crc7-3qcq-m9h3](https://github.com/FreshRSS/FreshRSS/security/advisories/GHSA-crc7-3qcq-m9h3)
 	* Fix full-content logic [#9602](https://github.com/FreshRSS/FreshRSS/pull/9602), [GHSA-5hcv-wqwr-j8r8](https://github.com/FreshRSS/FreshRSS/security/advisories/GHSA-5hcv-wqwr-j8r8)
 	* Sanitize DB install params [#9595](https://github.com/FreshRSS/FreshRSS/pull/9595), [GHSA-xm97-f66c-q5fx](https://github.com/FreshRSS/FreshRSS/security/advisories/GHSA-xm97-f66c-q5fx)
 	* Document threat model for security scanners [#9509](https://github.com/FreshRSS/FreshRSS/pull/9509)

+ 21 - 18
app/Controllers/extensionController.php

@@ -136,7 +136,7 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController {
 			$this->view->_path('extension/index.phtml');
 		}
 
-		$ext_name = urldecode(Minz_Request::paramString('e'));
+		$ext_name = urldecode(Minz_Request::paramString('e', plaintext: true));
 		$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 		if ($ext === null) {
@@ -154,7 +154,10 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController {
 			$this->view->extension->handleConfigureAction();
 		} catch (Minz_Exception $e) {	// @phpstan-ignore catch.neverThrown (Thrown by extensions)
 			Minz_Log::error('Error while configuring extension ' . $ext->getName() . ': ' . $e->getMessage());
-			Minz_Request::bad(_t('feedback.extensions.enable.ko', $ext_name, _url('index', 'logs')), ['c' => 'extension', 'a' => 'index']);
+			Minz_Request::bad(
+				_t('feedback.extensions.enable.ko', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8'), _url('index', 'logs')),
+				['c' => 'extension', 'a' => 'index']
+			);
 		}
 	}
 
@@ -171,21 +174,21 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController {
 		$url_redirect = ['c' => 'extension', 'a' => 'index'];
 
 		if (Minz_Request::isPost()) {
-			$ext_name = urldecode(Minz_Request::paramString('e'));
+			$ext_name = urldecode(Minz_Request::paramString('e', plaintext: true));
 			$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name), $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_found', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8')), $url_redirect);
 				return;
 			}
 
 			if ($ext->isEnabled()) {
-				Minz_Request::bad(_t('feedback.extensions.already_enabled', $ext_name), $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.already_enabled', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8')), $url_redirect);
 			}
 
 			$type = $ext->getType();
 			if ($type !== 'user' && !FreshRSS_Auth::hasAccess('admin')) {
-				Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name), $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.no_access', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8')), $url_redirect);
 				return;
 			}
 
@@ -211,13 +214,13 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController {
 				$conf->save();
 
 				Minz_Request::good(
-					_t('feedback.extensions.enable.ok', $ext_name),
+					_t('feedback.extensions.enable.ok', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8')),
 					$url_redirect,
 					showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
 				);
 			} else {
 				Minz_Log::warning('Cannot enable extension ' . $ext_name . ': ' . $res);
-				Minz_Request::bad(_t('feedback.extensions.enable.ko', $ext_name, _url('index', 'logs')), $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.enable.ko', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8'), _url('index', 'logs')), $url_redirect);
 			}
 		}
 
@@ -237,21 +240,21 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController {
 		$url_redirect = ['c' => 'extension', 'a' => 'index'];
 
 		if (Minz_Request::isPost()) {
-			$ext_name = urldecode(Minz_Request::paramString('e'));
+			$ext_name = urldecode(Minz_Request::paramString('e', plaintext: true));
 			$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name), $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_found', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8')), $url_redirect);
 				return;
 			}
 
 			if (!$ext->isEnabled()) {
-				Minz_Request::bad(_t('feedback.extensions.not_enabled', $ext_name), $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_enabled', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8')), $url_redirect);
 			}
 
 			$type = $ext->getType();
 			if ($type !== 'user' && !FreshRSS_Auth::hasAccess('admin')) {
-				Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name), $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.no_access', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8')), $url_redirect);
 				return;
 			}
 
@@ -277,13 +280,13 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController {
 				$conf->save();
 
 				Minz_Request::good(
-					_t('feedback.extensions.disable.ok', $ext_name),
+					_t('feedback.extensions.disable.ok', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8')),
 					$url_redirect,
 					showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
 				);
 			} else {
 				Minz_Log::warning('Cannot disable extension ' . $ext_name . ': ' . $res);
-				Minz_Request::bad(_t('feedback.extensions.disable.ko', $ext_name, _url('index', 'logs')), $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.disable.ko', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8'), _url('index', 'logs')), $url_redirect);
 			}
 		}
 
@@ -307,23 +310,23 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController {
 		$url_redirect = ['c' => 'extension', 'a' => 'index'];
 
 		if (Minz_Request::isPost()) {
-			$ext_name = urldecode(Minz_Request::paramString('e'));
+			$ext_name = urldecode(Minz_Request::paramString('e', plaintext: true));
 			$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name), $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_found', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8')), $url_redirect);
 				return;
 			}
 
 			$res = recursive_unlink($ext->getPath());
 			if ($res) {
 				Minz_Request::good(
-					_t('feedback.extensions.removed', $ext_name),
+					_t('feedback.extensions.removed', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8')),
 					$url_redirect,
 					showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
 				);
 			} else {
-				Minz_Request::bad(_t('feedback.extensions.cannot_remove', $ext_name), $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.cannot_remove', htmlspecialchars($ext_name, ENT_COMPAT, 'UTF-8')), $url_redirect);
 			}
 		}
 

+ 2 - 2
app/views/helpers/extension/details.phtml

@@ -21,8 +21,8 @@
 	if ($this->ext_details->getType() === 'user' || FreshRSS_Auth::hasAccess('admin')) {?>
 	<button class="switch<?= $button_class ?>" formaction="<?= _url('extension', $action, 'e', $name_encoded) ?>" title="<?= _t('gen.action.enable') ?>"></button>
 	<a class="open-slider configure" title="<?= _t('gen.action.manage') ?>" href="<?= _url('extension', 'configure', 'e', $name_encoded) ?>"><?= _i('configure') ?></a>
-	<span class="ext_name<?= $name_class ?>"><?= $this->ext_details->getName() ?></span>
+	<span class="ext_name<?= $name_class ?>"><?= htmlspecialchars($this->ext_details->getName(), ENT_NOQUOTES, 'UTF-8') ?></span>
 <?php } else { ?>
 	<button class="switch<?= $button_class ?>" title="<?= _t('admin.extensions.system.no_rights') ?>" disabled="disabled"></button>
-	<span class="ext_name<?= $name_class ?>"><?= $this->ext_details->getName() ?></span>
+	<span class="ext_name<?= $name_class ?>"><?= htmlspecialchars($this->ext_details->getName(), ENT_NOQUOTES, 'UTF-8') ?></span>
 <?php } ?>