Added check if regex pattern is valid + fixed code format + Added userConfig in FeedServiceTest.php

Signed-off-by: Markus87 <6339979+Markus87@users.noreply.github.com>

Author: Markus87

lib/Service/FeedServiceV2.php

@@ -286,6 +286,25 @@ public function create(
         return $this->mapper->insert($feed);
     }
 
+    /**
+     * Get regex pattern for filtering article titles
+     *
+     * @param String $userId UserId for configuration access
+     *
+     * @return valid regex pattern or empty string if invalid
+     */
+    private function getTitleFilterRegex(String $userId): String
+    {
+        $pattern = $this->userConfig->getValueString($userId, 'news', 'titleFilterRegex');
+        if (empty($pattern)) {
+            return '';
+        }
+        if (@preg_match($pattern, '') === false) {
+            $this->logger->warning('Pattern in titleFilterRegex is not valid: {pattern}', [ 'pattern' => $pattern ]);
+            return '';
+        }
+        return $pattern;
+    }
 
     /**
      * Update a feed
@@ -388,10 +407,10 @@ public function fetch(Entity $feed): Entity
             $feed->setFaviconLink($fetchedFavicon);
         }
 
-	foreach (array_reverse($items) as &$item) {
-            $filterBy = $this->userConfig->getValueString( $feed->getUserId(), 'news', 'titleFilterRegex');
-            if( $item->getTitle() !== null && !empty($filterBy ) && preg_match( $filterBy, $item->getTitle() ) ) {
-                $this->logger->trace( 'Item filtered: {title}', [ 'title' => $item->getTitle() ] );
+        $filterBy = $this->getTitleFilterRegex($feed->getUserId());
+        foreach (array_reverse($items) as &$item) {
+            if ($item->getTitle() !== null && !empty($filterBy) && preg_match($filterBy, $item->getTitle())) {
+                $this->logger->info('Item filtered: matched by = {filterBy} title = {title}', [ 'title' => $item->getTitle(), 'filterBy' => $filterBy ]);
                 continue;
             }
 

src/components/modals/AppSettingsDialog.vue

@@ -20,13 +20,12 @@
 
 				<NcFormBoxSwitch
 					v-model="disableRefresh"
-					:label="t('news', 'Disable automatic refresh')" />				
+					:label="t('news', 'Disable automatic refresh')" />
 			</NcFormBox>
 			<NcTextField
 				v-model="titleFilterRegex"
 				:label="t('news', 'Drop new articles with title matching regex')"
-				:placeholder="t('news', 'spam|ads')"
-			/>
+				:placeholder="t('news', '/spam|ads/')" />
 		</NcAppSettingsSection>
 
 		<NcAppSettingsSection id="settings-display" :name="t('news', 'Appearance')">
@@ -364,10 +363,11 @@ export default defineComponent({
 			get() {
 				return this.$store.getters.titleFilterRegex
 			},
+
 			set(newValue) {
 				this.saveSetting('titleFilterRegex', newValue)
 			},
-		},		
+		},
 
 		uploadOpmlStatusMessage() {
 			return this.$store.getters.lastOpmlImportMessage?.message

src/store/app.ts

@@ -74,7 +74,7 @@ const getters = {
 		return state.disableRefresh
 	},
 	titleFilterRegex(state: AppInfoState) {
-    	return state.titleFilterRegex
+		return state.titleFilterRegex
 	},
 	lastViewedFeedId(state: AppInfoState) {
 		return state.lastViewedFeedId
@@ -155,10 +155,10 @@ export const mutations = {
 		state.disableRefresh = value
 	},
 	titleFilterRegex(
-    state: AppInfoState,
-    { value }: { value: string },
+		state: AppInfoState,
+		{ value }: { value: string },
 	) {
-    	state.titleFilterRegex = value
+		state.titleFilterRegex = value
 	},
 	starredOpenState(
 		state: AppInfoState,

tests/Unit/Service/FeedServiceTest.php

@@ -27,6 +27,7 @@
 use OCA\News\Utility\HtmlSanitizer;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\IAppConfig;
+use OCP\IUserConfig;
 
 use OCA\News\Db\Feed;
 use OCA\News\Db\Item;
@@ -129,11 +130,15 @@ protected function setUp(): void
             ->getMockBuilder(IAppConfig::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->userConfig = $this
+            ->getMockBuilder(IUserConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->appData = $this
             ->getMockBuilder(AppData::class)
             ->disableOriginalConstructor()
             ->getMock();
-        
+
         $this->class = new FeedServiceV2(
             $this->mapper,
             $this->fetcher,
@@ -142,6 +147,7 @@ protected function setUp(): void
             $this->purifier,
             $this->logger,
             $this->config,
+            $this->userConfig,
             $this->appData
         );
         $this->uid = 'jack';