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

Fix RSS and OPML access by token (#8434)

Regression from https://github.com/FreshRSS/FreshRSS/pull/8165
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/8371
Alexandre Alapetite 2 месяцев назад
Родитель
Сommit
09aa9adb31
1 измененных файлов с 5 добавлено и 5 удалено
  1. 5 5
      app/Controllers/indexController.php

+ 5 - 5
app/Controllers/indexController.php

@@ -232,14 +232,14 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController {
 
 	/**
 	 * This action displays the RSS feed of FreshRSS.
+	 * @deprecated See user query RSS sharing instead
 	 */
-	#[Deprecated('See user query RSS sharing instead')]
 	public function rssAction(): void {
 		$allow_anonymous = FreshRSS_Context::systemConf()->allow_anonymous;
 
 		// Check if user has access.
-		if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous) {
-			Minz_Error::error(403);
+		if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous && !Minz_Request::tokenIsOk()) {
+			Minz_Error::error(403, redirect: false);
 		}
 
 		try {
@@ -271,8 +271,8 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController {
 		$allow_anonymous = FreshRSS_Context::systemConf()->allow_anonymous;
 
 		// Check if user has access.
-		if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous) {
-			Minz_Error::error(403);
+		if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous && !Minz_Request::tokenIsOk()) {
+			Minz_Error::error(403, redirect: false);
 		}
 
 		try {