Added infectedAction option 'Mark and log', which marks (renames) 'in…

…fected' files. This patch can easily used to move 'infected' files into a quarantain folder. Translations are incomplete.

Signed-off-by: tx0h <tx0h@icf.de>

l10n/de.js

@@ -52,6 +52,7 @@ OC.L10N.register(
     "When infected files are found during a background scan" : "Wenn infizierte Dateien während eines Hintergrund-Scans gefunden werden",
     "Only log" : "Nur loggen",
     "Delete file" : "Datei löschen",
+    "Mark and log" : "Markieren und loggen",
     "Save" : "Speichern",
     "Advanced" : "Erweitert",
     "Rules" : "Regeln",

l10n/de.json

@@ -50,6 +50,7 @@
     "When infected files are found during a background scan" : "Wenn infizierte Dateien während eines Hintergrund-Scans gefunden werden",
     "Only log" : "Nur loggen",
     "Delete file" : "Datei löschen",
+    "Mark and log" : "Markieren und loggen",
     "Save" : "Speichern",
     "Advanced" : "Erweitert",
     "Rules" : "Regeln",
@@ -61,4 +62,4 @@
     "Mark as" : "Markieren als",
     "Add a rule" : "Eine Regel hinzufügen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
+}

l10n/de_DE.js

@@ -53,6 +53,7 @@ OC.L10N.register(
     "When infected files are found during a background scan" : "Wenn infizierte Dateien während eines Hintergrund-Scans gefunden werden",
     "Only log" : "Nur protokollieren",
     "Delete file" : "Datei löschen",
+    "Mark and log" : "Markieren und loggen",
     "Save" : "Speichern",
     "Advanced" : "Erweitert",
     "Rules" : "Regeln",

l10n/de_DE.json

@@ -51,6 +51,7 @@
     "When infected files are found during a background scan" : "Wenn infizierte Dateien während eines Hintergrund-Scans gefunden werden",
     "Only log" : "Nur protokollieren",
     "Delete file" : "Datei löschen",
+    "Mark and log" : "Markieren und loggen",
     "Save" : "Speichern",
     "Advanced" : "Erweitert",
     "Rules" : "Regeln",
@@ -62,4 +63,4 @@
     "Mark as" : "Markieren als",
     "Add a rule" : "Eine Regel hinzufügen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
+}

l10n/en_GB.js

@@ -53,6 +53,7 @@ OC.L10N.register(
     "When infected files are found during a background scan" : "When infected files are found during a background scan",
     "Only log" : "Only log",
     "Delete file" : "Delete file",
+    "Mark and log" : "Mark and log",
     "Save" : "Save",
     "Advanced" : "Advanced",
     "Rules" : "Rules",

l10n/en_GB.json

@@ -51,6 +51,7 @@
     "When infected files are found during a background scan" : "When infected files are found during a background scan",
     "Only log" : "Only log",
     "Delete file" : "Delete file",
+    "Mark and log" : "Mark and log",
     "Save" : "Save",
     "Advanced" : "Advanced",
     "Rules" : "Rules",
@@ -62,4 +63,4 @@
     "Mark as" : "Mark as",
     "Add a rule" : "Add a rule"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
+}

lib/Item.php

@@ -93,8 +93,10 @@ public function processInfected(Status $status): void {
 		$infectedAction = $this->config->getAvInfectedAction();
 
 		$shouldDelete = $infectedAction === 'delete';
+		$shouldMarkAndLog = $infectedAction === 'mark_and_log';
 
 		$message = $shouldDelete ? Provider::MESSAGE_FILE_DELETED : '';
+		$message = $shouldMarkAndLog ? 'Infected file marked and logged' : '';
 
 		$userFolder = $this->rootFolder->getUserFolder($this->file->getOwner()->getUID());
 		$path = $userFolder->getRelativePath($this->file->getPath());
@@ -107,7 +109,6 @@ public function processInfected(Status $status): void {
 			->setAffectedUser($this->file->getOwner()->getUID())
 			->setType(Provider::TYPE_VIRUS_DETECTED);
 		$this->activityManager->publish($activity);
-
 		if ($shouldDelete) {
 			if ($this->isCron) {
 				$msg = 'Infected file deleted (during background scan)';
@@ -116,6 +117,16 @@ public function processInfected(Status $status): void {
 			}
 			$this->logError($msg . ' ' . $status->getDetails());
 			$this->deleteFile();
+		} else if ($shouldMarkAndLog) {
+			if ($this->isCron) {
+				$msg = 'Infected file found (during background scan)';
+			} else {
+				$msg = 'Infected file found.';
+			}
+			$this->logError('mark and log');
+			$this->logError($msg . ' ' . $status->getDetails());
+			$this->markFile();
+			$this->updateCheckTime($this->clock->getTime());
 		} else {
 			if ($this->isCron) {
 				$msg = 'Infected file found (during background scan)';
@@ -222,6 +233,13 @@ private function deleteFile(): void {
 		}
 	}
 
+	/**
+	 *    * Mark infected file
+	 */
+	private function markFile(): void {
+		$this->file->move($this->file->getPath() . " [\u{2623} VIRUS DETECTED \u{2620}]");
+	}
+
 	private function generateExtraInfo(): string {
 		$owner = $this->file->getOwner();
 

templates/settings.php

@@ -101,7 +101,7 @@
 				</tr>
 				<tr class="infected_action">
 					<td><label for="av_infected_action"><?php p($l->t('When infected files are found during a background scan'));?></label></td>
-					<td><select id="av_infected_action" name="avInfectedAction"><?php print_unescaped(html_select_options(['only_log' => $l->t('Only log'), 'delete' => $l->t('Delete file')], $_['avInfectedAction'])) ?></select></td>
+					<td><select id="av_infected_action" name="avInfectedAction"><?php print_unescaped(html_select_options(['only_log' => $l->t('Only log'), 'delete' => $l->t('Delete file'), 'mark_and_log' => $l->t('Mark and log')], $_['avInfectedAction'])) ?></select></td>
 					<td></td>
 				</tr>
 			</table>