Fix username detection with \W characters

mintware-de · Nov 3, 2022 · 40f9cda · 40f9cda
1 parent b3516b1
commit 40f9cda
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# v1.1.2
+Fixes:
+- Usernames can contain `\W` characters [PR #3](https://github.com/mintware-de/native-cron/pull/3)
+
 # v1.1.1
 Fixes:
 - Crontabs must end with an empty line [PR #2](https://github.com/mintware-de/native-cron/pull/2)

diff --git a/src/Content/CronJobLine.php b/src/Content/CronJobLine.php
@@ -8,7 +8,7 @@
 
 class CronJobLine implements CrontabLineInterface
 {
-    public const PATTERN_WITH_USER = '~^(?P<datetime>'.DateTimeDefinition::PATTERN.')\s*(?P<user>\w+)\s*(?P<command>.+)$~';
+    public const PATTERN_WITH_USER = '~^(?P<datetime>'.DateTimeDefinition::PATTERN.')\s*(?P<user>[^\s]+)\s*(?P<command>.+)$~';
     public const PATTERN_WITHOUT_USER = '~^(?P<datetime>'.DateTimeDefinition::PATTERN.')\s*(?P<command>.+)$~';
 
     private bool $includeUser;

diff --git a/tests/Content/CronjobLineTest.php b/tests/Content/CronjobLineTest.php
@@ -132,6 +132,13 @@ public function testBuildAdvanced(): void
         self::assertEquals($line, $cronjobLine->build());
     }
 
+    public function testUserWithDashes(): void
+    {
+        $line = '* * * * * www-data command';
+        $cronjobLine = new CronJobLine($line, true);
+        self::assertEquals('www-data', $cronjobLine->getUser());
+    }
+
     private function checkEmptyValues(CronJobLine $cronjobLine): void
     {
         $dateTimeDefinition = $cronjobLine->getDateTimeDefinition();