@zenfs/core 2.7.6 → 2.7.7

package/dist/vfs/async.js

@@ -54,15 +54,15 @@ import { rethrow, setUVMessage, UV } from 'kerium';
 import { decodeUTF8 } from 'utilium';
 import * as constants from '../constants.js';
 import { contextOf } from '../internal/contexts.js';
-import { hasAccess, isDirectory, isSymbolicLink } from '../internal/inode.js';
+import { assertRemovable, assertSearchable, hasAccess, isDirectory, isSymbolicLink } from '../internal/inode.js';
 import { basename, dirname, join, parse, resolve as resolvePath } from '../path.js';
 import { normalizeMode, normalizePath } from '../utils.js';
-import { checkAccess } from './config.js';
+import { checkAccess, resolveFullWalk } from './config.js';
 import { Dirent, ifToDt } from './dir.js';
 import { Handle } from './file.js';
 import * as flags from './flags.js';
 import { resolveMount } from './shared.js';
-import { cacheOf, lockPath } from './vcache.js';
+import { cacheOf } from './vcache.js';
 import { emitChange } from './watchers.js';
 /**
  * Resolves the mount and real path for a path.
@@ -71,38 +71,44 @@ import { emitChange } from './watchers.js';
  */
 export async function resolve($, path, preserveSymlinks, extra) {
     path = resolvePath.call($, path);
-    if (preserveSymlinks) {
-        const resolved = resolveMount(path, $, extra);
-        const stats = cacheOf(resolved.fs).get(resolved.path)?.inode ?? (await resolved.fs.stat(resolved.path).catch(() => undefined));
-        return { ...resolved, fullPath: path, stats };
-    }
     /* Try to resolve it directly. If this works,
     that means we don't need to perform any resolution for parent directories. */
-    try {
-        const resolved = resolveMount(path, $);
-        const stats = cacheOf(resolved.fs).get(resolved.path)?.inode ?? (await resolved.fs.stat(resolved.path));
-        if (!isSymbolicLink(stats)) {
-            return { ...resolved, fullPath: path, stats };
+    if (!resolveFullWalk)
+        try {
+            const resolved = resolveMount(path, $);
+            const stats = await resolved.cache.stat(resolved.path);
+            if (!isSymbolicLink(stats) || preserveSymlinks) {
+                return { ...resolved, fullPath: path, stats };
+            }
+            const target = resolvePath.call($, dirname(path), await readlink.call($, path));
+            return await resolve($, target, preserveSymlinks, extra);
         }
-        const target = resolvePath.call($, dirname(path), await readlink.call($, path));
-        return await resolve($, target, preserveSymlinks, extra);
+        catch {
+            // Go the long way
+        }
+    const { base, dir } = parse(path);
+    const $ex = { syscall: 'stat', path, ...extra };
+    let realDir = '/';
+    if (dir != '/') {
+        const parent = await resolve($, dir, false, extra);
+        if (parent.stats && isDirectory(parent.stats))
+            assertSearchable($, parent.stats, $ex);
+        realDir = parent.fullPath;
     }
-    catch {
-        // Go the long way
+    else if (base && checkAccess) {
+        const root = resolveMount('/', $);
+        assertSearchable($, await root.cache.stat(root.path), $ex);
     }
-    const { base, dir } = parse(path);
-    const realDir = dir == '/' ? '/' : (await resolve($, dir, false, extra)).fullPath;
     const maybePath = join(realDir, base);
     const resolved = resolveMount(maybePath, $);
-    const stats = cacheOf(resolved.fs).get(resolved.path)?.inode
-        ?? (await resolved.fs.stat(resolved.path).catch((e) => {
-            if (e.code == 'ENOENT')
-                return;
-            throw setUVMessage(Object.assign(e, { syscall: 'stat', path: maybePath, ...extra }));
-        }));
+    const stats = await resolved.cache.stat(resolved.path).catch((e) => {
+        if (e.code == 'ENOENT')
+            return;
+        throw setUVMessage(Object.assign(e, { syscall: 'stat', path: maybePath, ...extra }));
+    });
     if (!stats)
         return { ...resolved, fullPath: maybePath };
-    if (!isSymbolicLink(stats)) {
+    if (!isSymbolicLink(stats) || preserveSymlinks) {
         return { ...resolved, fullPath: maybePath, stats };
     }
     const target = resolvePath.call($, realDir, await readlink.call($, maybePath));
@@ -117,7 +123,7 @@ export async function open($, path, opt) {
     const mode = normalizeMode(opt.mode, 0o644), flag = flags.parse(opt.flag);
     const $ex = { syscall: 'open', path };
     // eslint-disable-next-line prefer-const
-    let { fs, path: resolved, stats } = await resolve($, path, opt.preserveSymlinks, $ex);
+    let { fs, cache, path: resolved, stats } = await resolve($, path, opt.preserveSymlinks, $ex);
     if (!stats) {
         const env_1 = { stack: [], error: void 0, hasError: false };
         try {
@@ -125,16 +131,16 @@ export async function open($, path, opt) {
                 throw UV('ENOENT', $ex);
             // Create the file
             const parentPath = dirname(resolved);
-            const parentStats = await fs.stat(parentPath);
-            if (checkAccess && !hasAccess($, parentStats, constants.W_OK))
+            const parentStats = await cache.stat(parentPath, $ex);
+            if (checkAccess && !hasAccess($, parentStats, constants.W_OK | constants.X_OK))
                 throw UV('EACCES', 'open', dirname(path));
             if (!isDirectory(parentStats))
                 throw UV('ENOTDIR', 'open', dirname(path));
             if (!opt.allowDirectory && isDirectory({ mode }))
                 throw UV('EISDIR', 'open', path);
             // Serialize entry creation with other operations on the parent directory
-            const _ = __addDisposableResource(env_1, await lockPath(fs, parentPath, 'rw', parentStats), false);
-            stats = cacheOf(fs).get(resolved)?.inode ?? (await fs.stat(resolved).catch(() => undefined));
+            const _ = __addDisposableResource(env_1, await cache.lock(parentPath, 'rw', parentStats), false);
+            stats = await cache.stat(resolved).catch(() => undefined);
             if (!stats) {
                 const { euid: uid, egid: gid } = contextOf($).credentials;
                 const inode = await fs.createFile(resolved, {
@@ -143,7 +149,7 @@ export async function open($, path, opt) {
                     gid: parentStats.mode & constants.S_ISGID ? parentStats.gid : gid,
                 });
                 emitChange($, 'rename', path);
-                return new Handle($, path, resolved, flag, cacheOf(fs).ref(resolved, inode));
+                return new Handle($, path, resolved, flag, cache.ref(resolved, inode));
             }
         }
         catch (e_1) {
@@ -160,7 +166,7 @@ export async function open($, path, opt) {
         throw UV('EEXIST', $ex);
     if (!opt.allowDirectory && isDirectory({ mode }))
         throw UV('EISDIR', 'open', path);
-    const handle = new Handle($, path, resolved, flag, cacheOf(fs).ref(resolved, stats));
+    const handle = new Handle($, path, resolved, flag, cache.ref(resolved, stats));
     if (flag & constants.O_TRUNC)
         await handle.truncate(0);
     return handle;
@@ -186,17 +192,17 @@ export async function mkdir(path, options = {}) {
     const { mode = 0o777, recursive } = options;
     const $ex = { syscall: 'mkdir', path: original };
     const { fullPath: realParent } = await resolve(this, dirname(original), false, $ex);
-    const { fs, path: target } = resolveMount(join(realParent, basename(original)), this, $ex);
+    const { fs, cache, path: target } = resolveMount(join(realParent, basename(original)), this, $ex);
     const followed = realParent != dirname(original);
     let firstCreated;
     const __create = async (path, resolved) => {
         const env_2 = { stack: [], error: void 0, hasError: false };
         try {
             const parentPath = dirname(resolved);
-            const parent = recursive && parentPath != '/' ? await __create(dirname(path), parentPath) : await fs.stat(parentPath);
-            const _ = __addDisposableResource(env_2, await lockPath(fs, parentPath, 'rw', parent), false);
+            const parent = recursive && parentPath != '/' ? await __create(dirname(path), parentPath) : await cache.stat(parentPath, $ex);
+            const _ = __addDisposableResource(env_2, await cache.lock(parentPath, 'rw', parent), false);
             if (recursive) {
-                const existing = cacheOf(fs).get(resolved)?.inode ?? (await fs.stat(resolved).catch(() => null));
+                const existing = await cache.stat(resolved).catch(() => null);
                 if (existing) {
                     const stats = isSymbolicLink(existing) ? (await resolve(this, path, false, $ex)).stats : existing;
                     if (!stats)
@@ -209,7 +215,7 @@ export async function mkdir(path, options = {}) {
                 if (followed && (await fs.exists(join(parentPath, basename(path)))))
                     throw UV('ENOTDIR', 'mkdir', path);
             }
-            if (checkAccess && !hasAccess(this, parent, constants.W_OK))
+            if (checkAccess && !hasAccess(this, parent, constants.W_OK | constants.X_OK))
                 throw UV('EACCES', 'mkdir', path);
             const inode = await fs
                 .mkdir(resolved, {
@@ -237,7 +243,7 @@ export async function mkdir(path, options = {}) {
 export async function readdir(path, options = {}) {
     path = normalizePath.call(this, path);
     const $ex = { syscall: 'scandir', path };
-    const { fs, path: resolved, stats } = await resolve(this, path, false, $ex);
+    const { fs, cache, path: resolved, stats } = await resolve(this, path, false, $ex);
     if (!stats)
         throw UV('ENOENT', $ex);
     if (checkAccess && !hasAccess(this, stats, constants.R_OK))
@@ -248,7 +254,7 @@ export async function readdir(path, options = {}) {
     {
         const env_3 = { stack: [], error: void 0, hasError: false };
         try {
-            const _ = __addDisposableResource(env_3, await lockPath(fs, resolved, 'ro', stats), false);
+            const _ = __addDisposableResource(env_3, await cache.lock(resolved, 'ro', stats), false);
             entries = await fs.readdir(resolved);
         }
         catch (e_3) {
@@ -261,7 +267,7 @@ export async function readdir(path, options = {}) {
     }
     const values = [];
     const addEntry = async (entry) => {
-        const entryStats = await fs.stat(join(resolved, entry)).catch((e) => {
+        const entryStats = await cache.stat(join(resolved, entry), $ex).catch((e) => {
             if (e.code == 'ENOENT')
                 return;
             throw e;
@@ -290,7 +296,7 @@ export async function rename(oldPath, newPath) {
         newPath = normalizePath.call(this, newPath);
         const $ex = { syscall: 'rename', path: oldPath, dest: newPath };
         const src = await resolve(this, oldPath, true, $ex);
-        const dst = resolveMount(newPath, this, $ex);
+        const dst = await resolve(this, newPath, true, $ex);
         if (src.fs.uuid !== dst.fs.uuid)
             throw UV('EXDEV', $ex);
         // A directory can not be moved inside itself
@@ -298,22 +304,26 @@ export async function rename(oldPath, newPath) {
             throw UV('EINVAL', $ex);
         if (!src.stats)
             throw UV('ENOENT', $ex);
-        const fs = src.fs;
-        const oldParent = await fs.stat(dirname(src.path));
-        const newParent = await fs.stat(dirname(dst.path));
-        const newStats = await fs.stat(dst.path).catch((e) => {
+        const srcDir = dirname(src.path);
+        const dstDir = dirname(dst.path);
+        const oldParent = await src.cache.stat(srcDir, $ex);
+        const newParent = await src.cache.stat(dstDir, $ex);
+        const newStats = await src.cache.stat(dst.path, $ex).catch((e) => {
             if (e.code == 'ENOENT')
                 return null;
             throw e;
         });
-        if (checkAccess && (!hasAccess(this, oldParent, constants.R_OK) || !hasAccess(this, newParent, constants.W_OK)))
+        assertRemovable(this, oldParent, src.stats, $ex);
+        if (newStats)
+            assertRemovable(this, newParent, newStats, $ex);
+        if (checkAccess && !hasAccess(this, newParent, constants.W_OK | constants.X_OK))
+            throw UV('EACCES', $ex);
+        if (checkAccess && isDirectory(src.stats) && srcDir != dstDir && !hasAccess(this, src.stats, constants.W_OK))
             throw UV('EACCES', $ex);
         if (newStats && !isDirectory(src.stats) && isDirectory(newStats))
             throw UV('EISDIR', $ex);
         if (newStats && isDirectory(src.stats) && !isDirectory(newStats))
             throw UV('ENOTDIR', $ex);
-        const srcDir = dirname(src.path);
-        const dstDir = dirname(dst.path);
         // Lock both parent directories, ordered by inode number to avoid ABBA deadlocks (like Linux's `lock_two_nondirectories`)
         const parents = [
             [srcDir, oldParent],
@@ -321,10 +331,10 @@ export async function rename(oldPath, newPath) {
         ];
         if (oldParent.ino > newParent.ino)
             parents.reverse();
-        const _first = __addDisposableResource(env_4, await lockPath(fs, parents[0][0], 'rw', parents[0][1]), false);
-        const _second = __addDisposableResource(env_4, oldParent.ino == newParent.ino ? null : await lockPath(fs, parents[1][0], 'rw', parents[1][1]), false);
+        const _first = __addDisposableResource(env_4, await src.cache.lock(parents[0][0], 'rw', parents[0][1]), false);
+        const _second = __addDisposableResource(env_4, oldParent.ino == newParent.ino ? null : await src.cache.lock(parents[1][0], 'rw', parents[1][1]), false);
         await src.fs.rename(src.path, dst.path);
-        cacheOf(fs).rename(src.path, dst.path);
+        src.cache.rename(src.path, dst.path);
         emitChange(this, 'rename', oldPath);
         emitChange(this, 'rename', newPath);
     }
@@ -342,24 +352,24 @@ export async function link(target, link) {
         target = normalizePath.call(this, target);
         link = normalizePath.call(this, link);
         const $ex = { syscall: 'link', path: target, dest: link };
-        const { fs, path: resolved } = resolveMount(target, this, $ex);
-        const dst = resolveMount(link, this, $ex);
+        const { fs, cache, path: resolved } = await resolve(this, target, true, $ex);
+        const dst = await resolve(this, link, true, $ex);
         if (fs.uuid != dst.fs.uuid)
             throw UV('EXDEV', $ex);
-        const stats = await fs.stat(resolved);
+        const stats = await cache.stat(resolved, $ex);
         if (checkAccess) {
             if (!hasAccess(this, stats, constants.R_OK))
                 throw UV('EACCES', $ex);
-            const dirStats = await fs.stat(dirname(resolved));
+            const dirStats = await cache.stat(dirname(resolved), $ex);
             if (!hasAccess(this, dirStats, constants.R_OK))
                 throw UV('EACCES', $ex);
-            const destStats = await fs.stat(dirname(dst.path));
+            const destStats = await cache.stat(dirname(dst.path), $ex);
             if (!hasAccess(this, destStats, constants.W_OK))
                 throw UV('EACCES', $ex);
         }
-        const _ = __addDisposableResource(env_5, await lockPath(fs, dirname(dst.path), 'rw'), false);
+        const _ = __addDisposableResource(env_5, await cache.lock(dirname(dst.path), 'rw'), false);
         await fs.link(resolved, dst.path);
-        cacheOf(fs).link(resolved, dst.path);
+        cache.link(resolved, dst.path);
     }
     catch (e_5) {
         env_5.error = e_5;
@@ -377,13 +387,16 @@ export async function stat(path, lstat) {
         stats = (await resolve(this, path, false, extra)).stats;
     else {
         const { base, dir } = parse(path);
-        const { fs, path: parent } = await resolve(this, dir, false, extra);
-        const target = base ? join(parent, base) : parent;
-        stats = cacheOf(fs).get(target)?.inode ?? (await fs.stat(target).catch(rethrow(extra)));
+        const parent = await resolve(this, dir, false, extra);
+        if (parent.stats && isDirectory(parent.stats))
+            assertSearchable(this, parent.stats, extra);
+        const { root, mounts } = contextOf(this);
+        const mounted = base && mounts.get(join(root, parent.fullPath, base));
+        const fs = mounted || parent.fs;
+        const target = mounted ? '/' : join(parent.path, base);
+        stats = await cacheOf(fs).stat(target).catch(rethrow(extra));
     }
     if (!stats)
         throw UV('ENOENT', extra);
-    if (checkAccess && !hasAccess(this, stats, constants.R_OK))
-        throw UV('EACCES', extra);
     return stats;
 }

package/dist/vfs/config.d.ts

@@ -1,6 +1,15 @@
 /** Whether to perform access checks */
 export declare let checkAccess: boolean;
+/** If set, path resolution will always do a full walk. More correct but potentially very slow. */
+export declare let resolveFullWalk: boolean;
 /**
  * @internal @hidden
  */
-export declare function _setAccessChecks(value: boolean): void;
+export interface _VFSConfig {
+    checkAccess: boolean;
+    resolveFullWalk: boolean;
+}
+/**
+ * @internal @hidden
+ */
+export declare function _setVFSConfig(cfg: _VFSConfig): void;

package/dist/vfs/config.js

@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 /** Whether to perform access checks */
 export let checkAccess = true;
+/** If set, path resolution will always do a full walk. More correct but potentially very slow. */
+export let resolveFullWalk = false;
 /**
  * @internal @hidden
  */
-export function _setAccessChecks(value) {
-    checkAccess = value;
+export function _setVFSConfig(cfg) {
+    checkAccess = cfg.checkAccess;
+    resolveFullWalk = cfg.resolveFullWalk;
 }

package/dist/vfs/file.js

@@ -89,7 +89,7 @@ import { UV, withErrno } from 'kerium';
 import { memoize } from 'utilium';
 import * as c from '../constants.js';
 import { contextOf } from '../internal/contexts.js';
-import { _chown, InodeFlags, isBlockDevice, isCharacterDevice } from '../internal/inode.js';
+import { _chmod, _chown, assertCanChown, assertOwner, InodeFlags, isBlockDevice, isCharacterDevice } from '../internal/inode.js';
 import '../polyfills.js';
 import { validateFD } from '../utils.js';
 import { cacheOf } from './vcache.js';
@@ -328,9 +328,10 @@ let Handle = (() => {
             try {
                 if (this.closed)
                     throw UV('EBADF', 'chmod', this.path);
+                assertOwner(this.context, this.inode, { syscall: 'chmod', path: this.path });
                 const _ = __addDisposableResource(env_5, this.vnode.lockSync('rw'), false);
                 this.vnode.metadataDirty = true;
-                this.inode.mode = (this.inode.mode & (mode > c.S_IFMT ? ~c.S_IFMT : c.S_IFMT)) | mode;
+                _chmod(this.context, this.inode, mode);
                 if (this._isSync || mode > c.S_IFMT)
                     this.vnode.syncSync();
             }
@@ -346,7 +347,8 @@ let Handle = (() => {
             const env_6 = { stack: [], error: void 0, hasError: false };
             try {
                 if (this.closed)
-                    throw UV('EBADF', 'chmod', this.path);
+                    throw UV('EBADF', 'chown', this.path);
+                assertCanChown(this.context, this.inode, uid, gid, { syscall: 'chown', path: this.path });
                 const _ = __addDisposableResource(env_6, this.vnode.lockSync('rw'), false);
                 this.vnode.metadataDirty = true;
                 _chown(this.inode, uid, gid);
@@ -369,6 +371,7 @@ let Handle = (() => {
             try {
                 if (this.closed)
                     throw UV('EBADF', 'utimes', this.path);
+                assertOwner(this.context, this.inode, { syscall: 'utimes', path: this.path });
                 const _ = __addDisposableResource(env_7, this.vnode.lockSync('rw'), false);
                 this.vnode.metadataDirty = true;
                 this.inode.atimeMs = atime;
@@ -542,9 +545,10 @@ let Handle = (() => {
             try {
                 if (this.closed)
                     throw UV('EBADF', 'chmod', this.path);
+                assertOwner(this.context, this.inode, { syscall: 'chmod', path: this.path });
                 const _ = __addDisposableResource(env_12, await this.vnode.lock('rw'), false);
                 this.vnode.metadataDirty = true;
-                this.inode.mode = (this.inode.mode & (mode > c.S_IFMT ? ~c.S_IFMT : c.S_IFMT)) | mode;
+                _chmod(this.context, this.inode, mode);
                 if (this._isSync || mode > c.S_IFMT)
                     await this.vnode.sync();
             }
@@ -561,6 +565,7 @@ let Handle = (() => {
             try {
                 if (this.closed)
                     throw UV('EBADF', 'chown', this.path);
+                assertCanChown(this.context, this.inode, uid, gid, { syscall: 'chown', path: this.path });
                 const _ = __addDisposableResource(env_13, await this.vnode.lock('rw'), false);
                 this.vnode.metadataDirty = true;
                 _chown(this.inode, uid, gid);
@@ -583,6 +588,7 @@ let Handle = (() => {
             try {
                 if (this.closed)
                     throw UV('EBADF', 'utimes', this.path);
+                assertOwner(this.context, this.inode, { syscall: 'utimes', path: this.path });
                 const _ = __addDisposableResource(env_14, await this.vnode.lock('rw'), false);
                 this.vnode.metadataDirty = true;
                 this.inode.atimeMs = atime;

package/dist/vfs/ioctl.js

@@ -30,7 +30,7 @@ export async function ioctl(path, command, ...args) {
         const mnt = await resolveAsync(this, path, false, { syscall: 'ioctl', path });
         if (!mnt.stats)
             throw UV('ENOENT', { syscall: 'ioctl', path });
-        vcache = cacheOf(mnt.fs);
+        vcache = mnt.cache;
         vnode = vcache.ref(mnt.path, vcache.get(mnt.path)?.inode ?? mnt.stats);
     }
     const context = {
@@ -68,7 +68,7 @@ export function ioctlSync(path, command, ...args) {
         const mnt = resolveSync(this, path, false, { syscall: 'ioctl', path });
         if (!mnt.stats)
             throw UV('ENOENT', { syscall: 'ioctl', path });
-        vcache = cacheOf(mnt.fs);
+        vcache = mnt.cache;
         vnode = vcache.ref(mnt.path, vcache.get(mnt.path)?.inode ?? mnt.stats);
     }
     const context = {

package/dist/vfs/shared.d.ts

@@ -4,6 +4,7 @@ import type { FileSystem } from '../internal/filesystem.js';
 import type { InodeLike } from '../internal/inode.js';
 import { type ExceptionExtra } from 'kerium';
 import { type AbsolutePath } from '../path.js';
+import { VCache } from './vcache.js';
 /**
  * @internal @hidden
  */
@@ -33,6 +34,7 @@ export declare function umount(this: V_Context, mountPoint: string): void;
  */
 export interface ResolvedMount {
     fs: FileSystem;
+    cache: VCache;
     path: string;
     mountPoint: string;
     root: string;

package/dist/vfs/shared.js

@@ -9,7 +9,7 @@ import { credentialsAllowRoot } from '../internal/credentials.js';
 import { withExceptionContext } from '../internal/error.js';
 import { join, resolve } from '../path.js';
 import { normalizePath } from '../utils.js';
-import { caches, VCache } from './vcache.js';
+import { cacheOf, caches, VCache } from './vcache.js';
 /**
  * The map of mount points
  * @category Backends and Configuration
@@ -34,8 +34,7 @@ export function mount(mountPoint, fs) {
         throw err(withErrno('EINVAL', 'Mount point is already in use: ' + mountPoint));
     fs._mountPoint = mountPoint;
     $.mounts.set(mountPoint, fs);
-    if (!caches.has(fs.uuid))
-        caches.set(fs.uuid, new VCache(fs));
+    caches.getOrInsertComputed(fs.uuid, () => new VCache(fs));
     info(`Mounted ${fs.name} on ${mountPoint}`);
     debug(`${fs.name} attributes: ${[...fs.attributes].map(([k, v]) => (v !== undefined && v !== null ? k + '=' + v : k)).join(', ')}`);
 }
@@ -91,7 +90,7 @@ export function resolveMount(path, ctx, extra) {
             path = path.toLowerCase();
         if (case_fold === 'upper')
             path = path.toUpperCase();
-        return { fs: withExceptionContext(fs, _exceptionContext), path, mountPoint, root };
+        return { fs: withExceptionContext(fs, _exceptionContext), cache: cacheOf(fs), path, mountPoint, root };
     }
     throw alert(new Exception(Errno.EIO, 'No file system for ' + path));
 }