fix: Fix software publisher analysis in software inventory on MacOSX

glpi-project · May 3, 2024 · b5c8b66 · b5c8b66
1 parent 4e52de0
commit b5c8b66
Show file tree

Hide file tree

Showing 4 changed files with 117 additions and 49 deletions.
diff --git a/lib/GLPI/Agent/Task/Inventory/MacOS/Softwares.pm b/lib/GLPI/Agent/Task/Inventory/MacOS/Softwares.pm
@@ -67,7 +67,7 @@ sub _getSoftwaresList {
         if ($source eq 'Apple' || ($app->{'Location'} && $app->{'Location'} =~ m{/System/Library/(CoreServices|Frameworks)/})) {
             $soft->{PUBLISHER} = 'Apple';
         } elsif ($source eq 'Identified Developer' && $app->{'Signed by'}) {
-            my ($developer) = $app->{'Signed by'} =~ /^Developer ID Application: ([^,]*),/;
+            my ($developer) = $app->{'Signed by'} =~ /^Developer ID Application: ([^,]*),?/;
             $developer = $1 if !empty($developer) && $developer =~ /^(.*)\s+\(.*\)$/;
             $developer =~ s/\s*Incorporated.*/ Inc./i unless empty($developer);
             $developer =~ s/\s*Corporation.*//i unless empty($developer);
@@ -87,7 +87,7 @@ sub _getSoftwaresList {
                     $publisher =~ s/\s*All rights reserved\.?\s*//i;
                     $publisher =~ s/\s*Incorporated.*/ Inc./i;
                     $publisher =~ s/\s*Corporation.*//i;
-                    $publisher =~ s/\s*\d+(-\d+)?\s*//g;
+                    $publisher =~ s/\s*\d+(\s*-\s*\d+)?\s*//g;
                     $soft->{PUBLISHER} = $publisher unless empty($publisher);
                 }
             }

diff --git a/resources/macos/system_profiler/sample4.SPApplicationsDataType.results.txt b/resources/macos/system_profiler/sample4.SPApplicationsDataType.results.txt
@@ -1756,7 +1756,7 @@ $results = [
         'ARCH' => '32-bit (Unsupported)',
         'INSTALLDATE' => '07/09/2020',
         'NAME' => 'PhotoshopdotcomInspirationBrowser',
-        'PUBLISHER' => '-Adobe Systems Inc.',
+        'PUBLISHER' => 'Adobe Systems Inc.',
         'SYSTEM_CATEGORY' => 'Applications/Adobe',
         'VERSION' => '3.07'
     },