Fix and update application filtering

README.md

@@ -5,6 +5,30 @@ Shows information about applications on the client.
 
 Data can be viewed under the Applications tab on the client details page or using the Applications listing view 
 
+Configuration
+-------------
+
+The inventory module has two settings that can be managed by adding them to the server environment variables or the `.env` file.
+
+
+#### APPS\_BUNDLEPATH_IGNORELIST
+
+List of bundle-paths to be ignored when processing inventory. The list is processed using regex, examples:
+
+Skip all apps in /System/Library/:
+```
+APPS_BUNDLEPATH_IGNORELIST='/System/Library/.*'
+```
+
+Skip all apps that are contained in an app bundle (Please note that backslashes need to be escaped):
+```
+APPS_BUNDLEPATH_IGNORELIST='.*\\.app\\/.*\\.app'
+```
+
+Defaults:
+```
+APPS_BUNDLEPATH_IGNORELIST='/System/Library/.*, '/System/Applications/.*', .*/Library/AutoPkg.*, /.DocumentRevisions-V100/.*, /Library/Application Support/Adobe/Uninstall/.*, .*/Library/Application Support/Google/Chrome/Default/Web Applications/.*', '.*/Library/Application Support/Firefox/Profiles/.*.default/storage/default/.*'
+```
 
 Table Schema
 ------

applications_controller.php

@@ -8,24 +8,23 @@
  **/
 class Applications_controller extends Module_controller
 {
-
-	/*** Protect methods with auth! ****/
-	function __construct()
-	{
-		// Store module path
-		$this->module_path = dirname(__FILE__);
-	}
+    /*** Protect methods with auth! ****/
+    function __construct()
+    {
+        // Store module path
+        $this->module_path = dirname(__FILE__);
+    }
 
     /**
-	 * Default method
-	 * @author tuxudo
-	 *
-	 **/
+    * Default method
+    * @author tuxudo
+    *
+    **/
     function index()
-	{
-		echo "You've loaded the applications module!";
-	}
-    
+    {
+        echo "You've loaded the applications module!";
+    }
+
     /**
      * Retrieve data in json format for widget
      *
@@ -43,7 +42,7 @@ public function get_32_bit_apps()
         $queryobj = new Applications_model();
         jsonView($queryobj->query($sql));
      }
-    
+
     /**
      * Retrieve data in json format
      *
@@ -55,10 +54,11 @@ public function get_data($serial_number = '')
 
         $sql = "SELECT name, path, last_modified, obtained_from, runtime_environment, version, bundle_version, info, signed_by, has64bit
                         FROM applications
-                        WHERE serial_number = '$serial_number'";
+                        LEFT JOIN reportdata USING (serial_number)
+                        ".get_machine_group_filter()."
+                        AND serial_number = '$serial_number'";
 
         $queryobj = new Applications_model();
         jsonView($queryobj->query($sql));
     }
-
 } // End class Applications_controller

applications_model.php

@@ -22,7 +22,7 @@ function __construct($serial='')
 
         $this->serial_number = $serial;
     }
-	
+    
     // ------------------------------------------------------------------------
 
     /**
@@ -59,11 +59,15 @@ function process($plist)
         );
 
         // List of paths to ignore
-        $bundlepath_ignorelist = is_array(conf('bundlepath_ignorelist')) ? conf('bundlepath_ignorelist') : array();
+        configAppendFile(__DIR__ . '/config.php');
+
+        // List of paths to ignore
+        $bundlepath_ignorelist = is_array(conf('apps_bundlepath_ignorelist')) ? conf('apps_bundlepath_ignorelist') : array();
         $path_regex = ':^'.implode('|', $bundlepath_ignorelist).'$:';
 
         // Process each app
         foreach ($myList as $app) {
+
             // Check if we have a name
             if( ! array_key_exists("name", $app)){
                 continue;

config.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+  'apps_bundlepath_ignorelist' => env('APPSBUNDLEPATH_IGNORELIST', [
+        '/System/Library/.*',
+        '/System/Applications/.*',
+        '.*/Library/AutoPkg.*',
+        '/.DocumentRevisions-V100/.*',
+        '/Library/Application Support/Adobe/Uninstall/.*',
+        '.*/Library/Application Support/Google/Chrome/Default/Web Applications/.*',
+        '.*/Library/Application Support/Firefox/Profiles/.*.default/storage/default/.*',
+  ]),
+];

migrations/2017_12_24_085405_applications.php

@@ -31,7 +31,7 @@ public function up()
             $table->index('has64bit');
         });
     }
-    
+
     public function down()
     {
         $capsule = new Capsule();

migrations/2021_02_26_000001_applications_add_bundle_version.php

@@ -16,7 +16,7 @@ public function up()
             $table->index('bundle_version');
         });
     }
-    
+
     public function down()
     {
         $capsule = new Capsule();

migrations/2022_06_14_000000_applications_null_last_modified.php

@@ -14,7 +14,7 @@ public function up()
             $table->bigInteger('last_modified')->nullable()->change();
         });
     }
-    
+
     public function down()
     {
         $capsule = new Capsule();

scripts/applications.py

@@ -76,7 +76,7 @@ def flatten_applications_info(array):
                 app['has64bit'] = 1
             elif item == 'arch_kind':
                 app['runtime_environment'] = obj[item]
-                if (obj[item] == 'arch_i64' or obj[item] == 'arch_i32_i64' or obj[item] == 'arch_arm_i64' or obj[item] == 'arch_ios'):
+                if (obj[item] == 'arch_i64' or obj[item] == 'arch_i32_i64' or obj[item] == 'arch_arm_i64' or obj[item] == 'arch_ios' or obj[item] == 'arch_arm'):
                     app['has64bit'] = 1
 
         # Sometimes Spotlight doesn't properly get the app version, get that manually

views/applications_listing.php

@@ -99,15 +99,15 @@
                 var sn=$('td:eq(1)', nRow).html();
                 var link = mr.getClientDetailLink(name, sn, '#tab_applications-tab');
                 $('td:eq(0)', nRow).html(link);
-                
+
                 // Localize Obtained From
                 var obtained_from=$('td:eq(6)', nRow).html();
                 obtained_from = obtained_from == 'unknown' ? i18n.t('unknown') :
                 obtained_from = obtained_from == 'mac_app_store' ? i18n.t('applications.mac_app_store') :
                 obtained_from = obtained_from == 'apple' ? "Apple":
                 (obtained_from === 'identified_developer' ? i18n.t('applications.identified_developer') : obtained_from)
                 $('td:eq(6)', nRow).html(obtained_from)
-                
+
                 // Format date
                 var event = parseInt($('td:eq(7)', nRow).html());
                 if (event > 0){