Return ENOENT on all file accesses; #293

DMOJ · Dec 9, 2017 · f2f8c8f · f2f8c8f
1 parent 319f986
commit f2f8c8f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/dmoj/cptbox/chroot.py b/dmoj/cptbox/chroot.py
@@ -5,7 +5,7 @@
 import os
 import logging
 
-from dmoj.cptbox.handlers import ALLOW, STDOUTERR, ACCESS_DENIED
+from dmoj.cptbox.handlers import ALLOW, STDOUTERR, ACCESS_DENIED, ACCESS_ENOENT
 from dmoj.cptbox._cptbox import bsd_get_proc_cwd, bsd_get_proc_fdno, AT_FDCWD
 from dmoj.cptbox.syscalls import *
 from dmoj.utils.unicode import utf8text
@@ -31,13 +31,13 @@ def __init__(self, filesystem, writable=(1, 2), io_redirects=None):
             sys_read: ALLOW,
             sys_write: ALLOW,
             sys_writev: ALLOW,
-            sys_open: self.do_open,
             sys_openat: self.do_openat,
-            sys_access: self.do_access,
             sys_faccessat: self.do_faccessat,
             # Deny with report
-            sys_mkdir: self.deny_with_file_path('mkdir', 0),
-            sys_unlink: self.deny_with_file_path('unlink', 0),
+            sys_open: self.check_file_access('open', 0),
+            sys_access: self.check_file_access('access', 0),
+            sys_mkdir: self.check_file_access('mkdir', 0),
+            sys_unlink: self.check_file_access('unlink', 0),
             sys_tgkill: self.do_tgkill,
             sys_kill: self.do_kill,
             sys_prctl: self.do_prctl,
@@ -149,7 +149,7 @@ def __init__(self, filesystem, writable=(1, 2), io_redirects=None):
                 sys_setcontext: ALLOW,
                 sys_pread: ALLOW,
                 sys_fsync: ALLOW,
-                sys_shm_open: self.do_open,
+                sys_shm_open: self.check_file_access('shm_open', 0),
                 sys_cpuset_getaffinity: ALLOW,
                 sys_thr_new: ALLOW,
                 sys_thr_exit: ALLOW,
@@ -169,24 +169,17 @@ def __init__(self, filesystem, writable=(1, 2), io_redirects=None):
                 sys_ktimer_delete: ALLOW,
             })
 
-    def deny_with_file_path(self, syscall, argument):
+    def check_file_access(self, syscall, argument):
         def check(debugger):
-            file = debugger.readstr(getattr(debugger, 'uarg%d' % argument))
-            print('%s: not allowed to access: %s' % (syscall, file), file=sys.stderr)
+            file_ptr = getattr(debugger, 'uarg%d' % argument)
+            file = debugger.readstr(file_ptr)
+            if self._file_access_check(file, debugger, file_ptr):
+                return True
             log.warning('Denied access via syscall %s: %s', syscall, file)
-            return False
+            return ACCESS_ENOENT(debugger)
 
         return check
 
-    def do_access(self, debugger):
-        file = debugger.readstr(debugger.uarg0)
-        return self._file_access_check(file, debugger) or ACCESS_DENIED(debugger)
-
-    def do_open(self, debugger):
-        file_ptr = debugger.uarg0
-        file = debugger.readstr(file_ptr)
-        return self._file_access_check(file, debugger, file_ptr)
-
     def _handle_io_redirects(self, file, debugger, file_ptr):
         data = self._io_redirects.get(file, None)
 
@@ -233,7 +226,6 @@ def _file_access_check(self, rel_file, debugger, file_ptr=None, dirfd=AT_FDCWD):
                 if self._handle_io_redirects(path, debugger, file_ptr):
                     return True
         if self.fs_jail.match(file) is None:
-            log.warning('Denied file open: %s', file)
             return False
         return True
 

diff --git a/dmoj/cptbox/handlers.py b/dmoj/cptbox/handlers.py
@@ -17,3 +17,4 @@ def on_return():
     return handler
 
 ACCESS_DENIED = errno_handler(errno.EACCES)
+ACCESS_ENOENT = errno_handler(errno.ENOENT)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,4 @@ def on_return():
		return handler

		ACCESS_DENIED = errno_handler(errno.EACCES)
		ACCESS_ENOENT = errno_handler(errno.ENOENT)