Rename SyscallFilter.name to SyscallFilter.syscall

maybe/__init__.py

@@ -13,7 +13,7 @@
 from blessings import Terminal
 
 
-SyscallFilter = namedtuple("SyscallFilter", ["name", "format", "substitute"])
+SyscallFilter = namedtuple("SyscallFilter", ["syscall", "format", "substitute"])
 # Make returning zero the default substitute function
 # Source: http://stackoverflow.com/a/18348004
 SyscallFilter.__new__.__defaults__ = (lambda args: 0,)

maybe/filters/change_owner.py

@@ -31,19 +31,19 @@ def format_change_owner(path, owner, group):
 
 SYSCALL_FILTERS["change_owner"] = [
  SyscallFilter(
- name="chown",
+ syscall="chown",
  format=lambda args: format_change_owner(args[0], args[1], args[2]),
  ),
  SyscallFilter(
- name="fchown",
+ syscall="fchown",
  format=lambda args: format_change_owner(get_file_descriptor_path(args[0]), args[1], args[2]),
  ),
  SyscallFilter(
- name="lchown",
+ syscall="lchown",
  format=lambda args: format_change_owner(args[0], args[1], args[2]),
  ),
  SyscallFilter(
- name="fchownat",
+ syscall="fchownat",
  format=lambda args: format_change_owner(args[1], args[2], args[3]),
  ),
 ]

maybe/filters/change_permissions.py

@@ -30,15 +30,15 @@ def format_change_permissions(path, permissions):
 
 SYSCALL_FILTERS["change_permissions"] = [
  SyscallFilter(
- name="chmod",
+ syscall="chmod",
  format=lambda args: format_change_permissions(args[0], args[1]),
  ),
  SyscallFilter(
- name="fchmod",
+ syscall="fchmod",
  format=lambda args: format_change_permissions(get_file_descriptor_path(args[0]), args[1]),
  ),
  SyscallFilter(
- name="fchmodat",
+ syscall="fchmodat",
  format=lambda args: format_change_permissions(args[1], args[2]),
  ),
 ]

maybe/filters/create_directory.py

@@ -19,11 +19,11 @@ def format_create_directory(path):
 
 SYSCALL_FILTERS["create_directory"] = [
  SyscallFilter(
- name="mkdir",
+ syscall="mkdir",
  format=lambda args: format_create_directory(args[0]),
  ),
  SyscallFilter(
- name="mkdirat",
+ syscall="mkdirat",
  format=lambda args: format_create_directory(args[1]),
  ),
 ]

maybe/filters/create_link.py

@@ -20,19 +20,19 @@ def format_create_link(path_source, path_target, symbolic):
 
 SYSCALL_FILTERS["create_link"] = [
  SyscallFilter(
- name="link",
+ syscall="link",
  format=lambda args: format_create_link(args[1], args[0], False),
  ),
  SyscallFilter(
- name="linkat",
+ syscall="linkat",
  format=lambda args: format_create_link(args[3], args[1], False),
  ),
  SyscallFilter(
- name="symlink",
+ syscall="symlink",
  format=lambda args: format_create_link(args[1], args[0], True),
  ),
  SyscallFilter(
- name="symlinkat",
+ syscall="symlinkat",
  format=lambda args: format_create_link(args[2], args[0], True),
  ),
 ]

maybe/filters/create_write_file.py

@@ -107,64 +107,64 @@ def substitute_dup(file_descriptor_old, file_descriptor_new=None):
 
 SYSCALL_FILTERS["create_write_file"] = [
  SyscallFilter(
- name="open",
+ syscall="open",
  format=lambda args: format_open(args[0], args[1]),
  substitute=lambda args: substitute_open(args[0], args[1]),
  ),
  SyscallFilter(
- name="creat",
+ syscall="creat",
  format=lambda args: format_open(args[0], O_CREAT | O_WRONLY | O_TRUNC),
  substitute=lambda args: substitute_open(args[0], O_CREAT | O_WRONLY | O_TRUNC),
  ),
  SyscallFilter(
- name="openat",
+ syscall="openat",
  format=lambda args: format_open(args[1], args[2]),
  substitute=lambda args: substitute_open(args[1], args[2]),
  ),
  SyscallFilter(
- name="mknod",
+ syscall="mknod",
  format=lambda args: format_mknod(args[0], args[1]),
  substitute=lambda args: substitute_mknod(args[0], args[1]),
  ),
  SyscallFilter(
- name="mknodat",
+ syscall="mknodat",
  format=lambda args: format_mknod(args[1], args[2]),
  substitute=lambda args: substitute_mknod(args[1], args[2]),
  ),
  SyscallFilter(
- name="write",
+ syscall="write",
  format=lambda args: format_write(args[0], args[2]),
  substitute=lambda args: substitute_write(args[0], args[2]),
  ),
  SyscallFilter(
- name="pwrite",
+ syscall="pwrite",
  format=lambda args: format_write(args[0], args[2]),
  substitute=lambda args: substitute_write(args[0], args[2]),
  ),
  SyscallFilter(
- name="writev",
+ syscall="writev",
  # TODO: Actual byte count is iovcnt * iov.iov_len
  format=lambda args: format_write(args[0], args[2]),
  substitute=lambda args: substitute_write(args[0], args[2]),
  ),
  SyscallFilter(
- name="pwritev",
+ syscall="pwritev",
  # TODO: Actual byte count is iovcnt * iov.iov_len
  format=lambda args: format_write(args[0], args[2]),
  substitute=lambda args: substitute_write(args[0], args[2]),
  ),
  SyscallFilter(
- name="dup",
+ syscall="dup",
  format=lambda args: None,
  substitute=lambda args: substitute_dup(args[0]),
  ),
  SyscallFilter(
- name="dup2",
+ syscall="dup2",
  format=lambda args: None,
  substitute=lambda args: substitute_dup(args[0], args[1]),
  ),
  SyscallFilter(
- name="dup3",
+ syscall="dup3",
  format=lambda args: None,
  substitute=lambda args: substitute_dup(args[0], args[1]),
  ),

maybe/filters/delete.py

@@ -19,15 +19,15 @@ def format_delete(path):
 
 SYSCALL_FILTERS["delete"] = [
  SyscallFilter(
- name="unlink",
+ syscall="unlink",
  format=lambda args: format_delete(args[0]),
  ),
  SyscallFilter(
- name="unlinkat",
+ syscall="unlinkat",
  format=lambda args: format_delete(args[1]),
  ),
  SyscallFilter(
- name="rmdir",
+ syscall="rmdir",
  format=lambda args: format_delete(args[0]),
  ),
 ]

maybe/filters/move.py

@@ -26,15 +26,15 @@ def format_move(path_old, path_new):
 
 SYSCALL_FILTERS["move"] = [
  SyscallFilter(
- name="rename",
+ syscall="rename",
  format=lambda args: format_move(args[0], args[1]),
  ),
  SyscallFilter(
- name="renameat",
+ syscall="renameat",
  format=lambda args: format_move(args[1], args[3]),
  ),
  SyscallFilter(
- name="renameat2",
+ syscall="renameat2",
  format=lambda args: format_move(args[1], args[3]),
  ),
 ]

maybe/maybe.py

@@ -170,7 +170,7 @@ def main(argv=sys.argv[1:]):
 
  for filter_scope in filter_scopes:
  for syscall_filter in SYSCALL_FILTERS[filter_scope]:
- syscall_filters[syscall_filter.name] = syscall_filter
+ syscall_filters[syscall_filter.syscall] = syscall_filter
 
  # Prevent python-ptrace from decoding arguments to keep raw numerical values
  DIRFD_ARGUMENTS.clear()

tests/test_basics.py

@@ -8,7 +8,7 @@ def test_syscall_filters():
  # Verify that every filtered syscall is known to python-ptrace
  for filter_scope in SYSCALL_FILTERS:
  for syscall_filter in SYSCALL_FILTERS[filter_scope]:
- assert syscall_filter.name in SYSCALL_PROTOTYPES
+ assert syscall_filter.syscall in SYSCALL_PROTOTYPES
 
 
 def test_no_operations():