Fix extract of namespaced itemtype from mail header

Author: cedric-anne

phpunit/imap/MailCollectorTest.php

@@ -36,6 +36,7 @@
 
 use Config;
 use DbTestCase;
+use Glpi\Socket;
 use Glpi\Toolbox\Sanitizer;
 use ITILFollowup;
 use Laminas\Mail\Storage\Message;
@@ -393,6 +394,8 @@ public static function itemReferenceHeaderProvider()
         $soft_id   = getItemByTypeName('SoftwareLicense', '_test_softlic_1', true);
         $soft_notif = new NotificationTargetSoftwareLicense($root_ent_id, 'test_event', getItemByTypeName('SoftwareLicense', '_test_softlic_1'));
 
+        $socket_id   = getItemByTypeName(Socket::class, '_socket01', true);
+
         $uuid = Config::getUuid('notification');
 
         $time1 = time() - 548;
@@ -545,6 +548,15 @@ public static function itemReferenceHeaderProvider()
                 'expected_items_id' => $ticket_id,
                 'accepted'          => true,
             ],
+            // References generated by GLPI 10.0.7+ - found item (with namespace), reference event
+            [
+                'headers'           => [
+                    'references'  => "GLPI_{$uuid}-Glpi-Socket-{$socket_id}/new@{$uname1}",
+                ],
+                'expected_itemtype' => Socket::class,
+                'expected_items_id' => $socket_id,
+                'accepted'          => true,
+            ],
             // References generated by GLPI 10.0.7+ - found item, other event
             [
                 'headers'           => [
@@ -554,6 +566,15 @@ public static function itemReferenceHeaderProvider()
                 'expected_items_id' => $ticket_id,
                 'accepted'          => true,
             ],
+            // References generated by GLPI 10.0.7+ - found item (with namespace), other event
+            [
+                'headers'           => [
+                    'references'  => "GLPI_{$uuid}-Glpi-Socket-{$socket_id}/update.{$time1}.{$rand1}@{$uname1}",
+                ],
+                'expected_itemtype' => Socket::class,
+                'expected_items_id' => $socket_id,
+                'accepted'          => true,
+            ],
             // References generated by GLPI 10.0.7+ - invalid itemtype
             [
                 'headers'           => [

src/MailCollector.php

@@ -2402,12 +2402,13 @@ private function extractValuesFromRefHeader(string $header): ?array
         $pattern = '/'
             . 'GLPI'
             . '_(?<uuid>[a-z0-9]+)' // uuid
-            . '(-(?<itemtype>[a-z]+)-(?<items_id>[0-9]+))?' // optional itemtype + items_id (only when related to an item)
+            . '(-(?<itemtype>[a-z\-]+)-(?<items_id>[0-9]+))?' // optional itemtype + items_id (only when related to an item)
             . '\/(?<event>[a-z_]+)' // event
             . '(\.[0-9]+\.[0-9]+)?' // optional time + rand (only when NOT related to an item OR when event is not the reference one)
             . '@.+'     // uname
             . '/i';
         if (preg_match($pattern, $header, $values) === 1) {
+            $values['itemtype'] = str_replace('-', '\\', $values['itemtype']); // restore backslashes in namespaced classes
             $values += $defaults;
             return $values;
         }

src/NotificationTarget.php

@@ -293,7 +293,11 @@ final public static function getMessageIdForEvent(?string $itemtype, ?int $items
 
         $reference_event = null;
         if ($is_item_related) {
-            $message_id .= sprintf('-%s-%d', str_replace(['\\', '/'], '-', $itemtype), $items_id);
+            $message_id .= sprintf(
+                '-%s-%d',
+                str_replace('\\', '-', $itemtype), // RFC 2822 does not allow backslashes (namespaced classes)
+                $items_id
+            );
             $reference_event = $itemtype::getMessageReferenceEvent($event);
         }