Fix nodefs handling of unnamed file descriptors

hoodmane · hoodmane · commit cac8b191134a · 2024-12-03T18:07:26.000+01:00
diff --git a/src/library_fs.js b/src/library_fs.js
@@ -940,7 +940,13 @@ FS.staticInit();
     },
     fstat(fd) {
       var stream = FS.getStreamChecked(fd);
-      return stream.node.node_ops.getattr(stream.node);
+      var node = stream.node;
+      if (stream.stream_ops.getattr) {
+        return stream.stream_ops.getattr(stream);
+      } else if (node.node_ops.getattr) {
+        return node.node_ops.getattr(node);
+      }
+      throw new FS.ErrnoError({{{ cDefs.EPERM }}});
     },
     lstat(path) {
       return FS.stat(path, true);
@@ -966,7 +972,17 @@ FS.staticInit();
     },
     fchmod(fd, mode) {
       var stream = FS.getStreamChecked(fd);
-      FS.chmod(stream.node, mode);
+      var node = stream.node;
+      var attrs = {
+        mode: (mode & {{{ cDefs.S_IALLUGO }}}) | (node.mode & ~{{{ cDefs.S_IALLUGO }}}),
+        timestamp: Date.now()
+      };
+      if (stream.stream_ops.getattr) {
+        return stream.stream_ops.setattr(stream, attrs);
+      } else if (node.node_ops.getattr) {
+        return node.node_ops.setattr(node, attrs);
+      }
+      throw new FS.ErrnoError({{{ cDefs.EPERM }}});
     },
     chown(path, uid, gid, dontFollow) {
       var node;
@@ -989,7 +1005,17 @@ FS.staticInit();
     },
     fchown(fd, uid, gid) {
       var stream = FS.getStreamChecked(fd);
-      FS.chown(stream.node, uid, gid);
+      var node = stream.node;
+      var attrs = {
+        timestamp: Date.now()
+        // we ignore the uid / gid for now
+      };
+      if (stream.stream_ops.getattr) {
+        return stream.stream_ops.setattr(stream, attrs);
+      } else if (node.node_ops.getattr) {
+        return node.node_ops.setattr(node, attrs);
+      }
+      throw new FS.ErrnoError({{{ cDefs.EPERM }}});
     },
     truncate(path, len) {
       if (len < 0) {
@@ -1022,10 +1048,32 @@ FS.staticInit();
     },
     ftruncate(fd, len) {
       var stream = FS.getStreamChecked(fd);
+      var node = stream.node;
       if ((stream.flags & {{{ cDefs.O_ACCMODE }}}) === {{{ cDefs.O_RDONLY}}}) {
         throw new FS.ErrnoError({{{ cDefs.EINVAL }}});
       }
-      FS.truncate(stream.node, len);
+      if (!node.node_ops.setattr && !stream.stream_ops.setattr) {
+        throw new FS.ErrnoError({{{ cDefs.EPERM }}});
+      }
+      if (FS.isDir(node.mode)) {
+        throw new FS.ErrnoError({{{ cDefs.EISDIR }}});
+      }
+      if (!FS.isFile(node.mode)) {
+        throw new FS.ErrnoError({{{ cDefs.EINVAL }}});
+      }
+      var errCode = FS.nodePermissions(node, 'w');
+      if (errCode) {
+        throw new FS.ErrnoError(errCode);
+      }
+      var attrs = {
+        size: len,
+        timestamp: Date.now()
+      };
+      if (stream.stream_ops.setattr) {
+        stream.stream_ops.setattr(stream, attrs);
+      } else {
+        node.node_ops.setattr(node, attrs);
+      }
     },
     utime(path, atime, mtime) {
       var lookup = FS.lookupPath(path, { follow: true });
diff --git a/src/library_nodefs.js b/src/library_nodefs.js
@@ -116,64 +116,68 @@ addToLibrary({
       }
       return newFlags;
     },
-
-    node_ops: {
-      getattr(node) {
-        var path = NODEFS.realPath(node);
-        var stat;
-        NODEFS.tryFSOperation(() => stat = fs.lstatSync(path));
+    getattr(func) {
+        var stat = NODEFS.tryFSOperation(func);
         if (NODEFS.isWindows) {
-          // node.js v0.10.20 doesn't report blksize and blocks on Windows. Fake
-          // them with default blksize of 4096.
-          // See http://support.microsoft.com/kb/140365
-          if (!stat.blksize) {
-            stat.blksize = 4096;
-          }
-          if (!stat.blocks) {
-            stat.blocks = (stat.size+stat.blksize-1)/stat.blksize|0;
+        // node.js v0.10.20 doesn't report blksize and blocks on Windows. Fake
+        // them with default blksize of 4096.
+        // See http://support.microsoft.com/kb/140365
+        if (!stat.blksize) {
+          stat.blksize = 4096;
+        }
+        if (!stat.blocks) {
+          stat.blocks = (stat.size+stat.blksize-1)/stat.blksize|0;
+        }
+        // Windows does not report the 'x' permission bit, so propagate read
+        // bits to execute bits.
+        stat.mode |= (stat.mode & {{{ cDefs.S_IRUGO }}}) >> 2;
+      }
+      return {
+        dev: stat.dev,
+        ino: stat.ino,
+        mode: stat.mode,
+        nlink: stat.nlink,
+        uid: stat.uid,
+        gid: stat.gid,
+        rdev: stat.rdev,
+        size: stat.size,
+        atime: stat.atime,
+        mtime: stat.mtime,
+        ctime: stat.ctime,
+        blksize: stat.blksize,
+        blocks: stat.blocks
+      };
+    },
+    setattr(path, node, attr, chmod, utimes, truncate) {
+      NODEFS.tryFSOperation(() => {
+        if (attr.mode !== undefined) {
+          var mode = attr.mode;
+          if (NODEFS.isWindows) {
+            // Windows only supports S_IREAD / S_IWRITE (S_IRUSR / S_IWUSR)
+            // https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/chmod-wchmod
+            mode &= {{{ cDefs.S_IRUSR | cDefs.S_IWUSR }}};
           }
-          // Windows does not report the 'x' permission bit, so propagate read
-          // bits to execute bits.
-          stat.mode |= (stat.mode & {{{ cDefs.S_IRUGO }}}) >> 2;
+          chmod(path, mode);
+          // update the common node structure mode as well
+          node.mode = attr.mode;
+        }
+        if (attr.timestamp !== undefined) {
+          var date = new Date(attr.timestamp);
+          utimes(path, date, date);
         }
-        return {
-          dev: stat.dev,
-          ino: stat.ino,
-          mode: stat.mode,
-          nlink: stat.nlink,
-          uid: stat.uid,
-          gid: stat.gid,
-          rdev: stat.rdev,
-          size: stat.size,
-          atime: stat.atime,
-          mtime: stat.mtime,
-          ctime: stat.ctime,
-          blksize: stat.blksize,
-          blocks: stat.blocks
-        };
+        if (attr.size !== undefined) {
+          truncate(path, attr.size);
+        }
+      });
+    },
+    node_ops: {
+      getattr(node) {
+        var path = NODEFS.realPath(node);
+        return NODEFS.getattr(() => fs.lstatSync(path));
       },
       setattr(node, attr) {
         var path = NODEFS.realPath(node);
-        NODEFS.tryFSOperation(() => {
-          if (attr.mode !== undefined) {
-            var mode = attr.mode;
-            if (NODEFS.isWindows) {
-              // Windows only supports S_IREAD / S_IWRITE (S_IRUSR / S_IWUSR)
-              // https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/chmod-wchmod
-              mode &= {{{ cDefs.S_IRUSR | cDefs.S_IWUSR }}};
-            }
-            fs.chmodSync(path, mode);
-            // update the common node structure mode as well
-            node.mode = attr.mode;
-          }
-          if (attr.timestamp !== undefined) {
-            var date = new Date(attr.timestamp);
-            fs.utimesSync(path, date, date);
-          }
-          if (attr.size !== undefined) {
-            fs.truncateSync(path, attr.size);
-          }
-        });
+        NODEFS.setattr(path, node, attr, fs.chmodSync, fs.utimesSync, fs.truncateSync);
       },
       lookup(parent, name) {
         var path = PATH.join2(NODEFS.realPath(parent), name);
@@ -228,6 +232,12 @@ addToLibrary({
       }
     },
     stream_ops: {
+      getattr(stream) {
+        return NODEFS.getattr(() => fs.fstatSync(stream.nfd));
+      },
+      setattr(stream, attr) {
+        NODEFS.setattr(stream.nfd, stream.node, attr, fs.fchmodSync, fs.futimesSync, fs.ftruncateSync);
+      },
       open(stream) {
         var path = NODEFS.realPath(stream.node);
         NODEFS.tryFSOperation(() => {
diff --git a/test/fs/test_stat_unnamed_file_descriptor.c b/test/fs/test_stat_unnamed_file_descriptor.c
@@ -4,13 +4,37 @@
 #include <assert.h>
 #include "stdio.h"
 
+#ifdef __EMSCRIPTEN__
+#include <emscripten.h>
+#endif
+
+void makedir(const char *dir) {
+  int rtn = mkdir(dir, 0777);
+  assert(rtn == 0);
+}
+
+void changedir(const char *dir) {
+  int rtn = chdir(dir);
+  assert(rtn == 0);
+}
+
+
 int main() {
+    makedir("working");
+#if defined(__EMSCRIPTEN__) && defined(NODEFS)
+    EM_ASM(FS.mount(NODEFS, { root: '.' }, 'working'));
+#endif
+    changedir("working");
     int fd = open("file.txt", O_RDWR | O_CREAT, 0666);
     unlink("file.txt");
     int res;
     struct stat buf;
     res = fstat(fd, &buf);
     assert(res == 0);
     assert(buf.st_atime > 1000000000);
+    res = fchmod(fd, 0777);
+    assert(res == 0);
+    res = ftruncate(fd, 10);
+    assert(res == 0);
     printf("success\n");
 }
diff --git a/test/test_core.py b/test/test_core.py
@@ -5921,9 +5921,18 @@ def test_fs_64bit(self):
       self.set_setting('FORCE_FILESYSTEM')
     self.do_runf('fs/test_64bit.c', 'success')
 
-  @also_with_noderawfs
-  def test_fs_stat_unnamed_file_descriptor(self):
+  @requires_node
+  @parameterized({
+    '': ([],),
+    'nodefs': (['-DNODEFS', '-lnodefs.js'],),
+    'noderawfs':(['-sNODERAWFS'],),
+  })
+  def test_fs_stat_unnamed_file_descriptor(self, args):
+    self.emcc_args += args
+    nodefs = '-DNODEFS' in args or '-DNODERAWFS' in args
     if self.get_setting('WASMFS'):
+      if nodefs:
+        self.skipTest('NODEFS in WasmFS')
       self.set_setting('FORCE_FILESYSTEM')
     self.do_runf('fs/test_stat_unnamed_file_descriptor.c', 'success')
 
