new filter field: command; added changes to log

Author: s-m-e

CHANGES.rst

@@ -5,8 +5,10 @@ Changes
 ------------------
 
 * FEATURE: New flag ``-j`` for JSON-formatted log output
-* FEATURE: (UNTESTED) Mac OS X support
-* FIX: Several implementations of FUSE calls such as truncate did rely on the assumption that the current working directory of the file system process would not change. This was risky.
+* FEATURE: New field ``command`` allowed in XML configuration files for filtering for command strings with regular expressions
+* FEATURE: All fields in ``include`` and ``exclude`` tags, e.g. ``extension`` or ``uid``, become optional / implicit and can be omitted.
+* FEATURE: (UNTESTED) Mac OS X support. Test framework still relies on Linux.
+* FIX: Several implementations of FUSE calls such as truncate did rely on the assumption that the current working directory of the file system process would not change. This was risky. LoggedFS-python does also NOT change the current working directory anymore on its own.
 * Code cleanup
 
 0.0.1 (2019-04-11)

src/loggedfs/filter.py

@@ -55,7 +55,8 @@ def new_filter_item():
 		'extension': '.*',
 		'uid': '*',
 		'action': '.*',
-		'retname': '.*'
+		'retname': '.*',
+		'command': '.*'
 		}
 
 
@@ -121,39 +122,41 @@ def _compile_filter_item_(in_item):
 		re.compile(in_item['extension']),
 		int(in_item['uid']) if in_item['uid'].isnumeric() else None,
 		re.compile(in_item['action']),
-		re.compile(in_item['retname'])
+		re.compile(in_item['retname']),
+		re.compile(in_item['command'])
 		)
 
 
 def match_filters(
-	abs_path, uid, action, ret_status,
+	abs_path, uid, action, ret_status, command,
 	incl_filter_list, excl_filter_list
 	):
 
 	if len(incl_filter_list) != 0:
 		included = False
 		for filter_tuple in incl_filter_list:
-			if _match_filter_item_(abs_path, uid, action, ret_status, *filter_tuple):
+			if _match_filter_item_(abs_path, uid, action, ret_status, command, *filter_tuple):
 				included = True
 				break
 		if not included:
 			return False
 
 	for filter_tuple in excl_filter_list:
-		if _match_filter_item_(abs_path, uid, action, ret_status, *filter_tuple):
+		if _match_filter_item_(abs_path, uid, action, ret_status, command, *filter_tuple):
 			return False
 
 	return True
 
 
 def _match_filter_item_(
-	abs_path, uid, action, ret_status,
-	f_path, f_uid, f_action, f_status
+	abs_path, uid, action, ret_status, command,
+	f_path, f_uid, f_action, f_status, f_command
 	):
 
 	return all((
 		bool(f_path.match(abs_path)),
 		(uid == f_uid) if isinstance(f_uid, int) else True,
 		bool(f_action.match(action)),
-		bool(f_status.match(ret_status))
+		bool(f_status.match(ret_status)),
+		bool(f_command.match(command))
 		))

src/loggedfs/out.py

@@ -217,7 +217,7 @@ def _log_event_(
 		log_dict['return'] = ret_str
 
 	if not match_filters(
-		log_dict['param_%s' % func_arg_abspath], uid, func.__name__, ret_status,
+		log_dict['param_%s' % func_arg_abspath], uid, func.__name__, ret_status, p_cmdname,
 		self._f_incl, self._f_excl
 		):
 		return

tests/test_loggedfs_cfg.xml

@@ -5,6 +5,7 @@
 		<include extension=".*" uid="*" action=".*" retname=".*"/>
 	</includes>
 	<excludes>
+		<exclude command=".*gvfs.*"/>
 		<exclude extension=".*.proverc" uid="*" action=".*" retname=".*"/>
 		<exclude extension=".*.prove" uid="*" action=".*" retname=".*"/>
 		<exclude extension=".*autorun.inf" uid="*" action=".*" retname=".*"/>