hfs 3.2.0-alpha1.1 → 3.2.0-beta3

package/src/vfs.js

@@ -15,10 +15,11 @@ exports.getNodeByName = getNodeByName;
 exports.isRoot = isRoot;
 exports.getNodeName = getNodeName;
 exports.nodeIsFolder = nodeIsFolder;
-exports.hasDefaultFile = hasDefaultFile;
+exports.getDefaultFile = getDefaultFile;
 exports.nodeIsLink = nodeIsLink;
 exports.hasPermission = hasPermission;
 exports.statusCodeForMissingPerm = statusCodeForMissingPerm;
+exports.simpleWhoToError = simpleWhoToError;
 exports.walkNode = walkNode;
 exports.masksCouldGivePermission = masksCouldGivePermission;
 exports.parentMaskApplier = parentMaskApplier;
@@ -35,6 +36,7 @@ const fswin_1 = __importDefault(require("fswin"));
 const comments_1 = require("./comments");
 const walkDir_1 = require("./walkDir");
 const node_stream_1 = require("node:stream");
+const adminApis_1 = require("./adminApis");
 const showHiddenFiles = (0, config_1.defineConfig)('show_hidden_files', false);
 function permsFromParent(parent, child) {
     const ret = {};
@@ -225,7 +227,7 @@ function nodeIsFolder(node) {
         return undefined;
     }
 }
-async function hasDefaultFile(node, ctx) {
+async function getDefaultFile(node, ctx) {
     return node.default && nodeIsFolder(node) && await urlToNode(node.default, ctx, node) || undefined;
 }
 function nodeIsLink(node) {
@@ -254,7 +256,7 @@ function statusCodeForMissingPerm(node, perm, ctx, assign = true) {
             if ((0, misc_1.isWhoObject)(who))
                 who = who.this;
             who ??= misc_1.defaultPerms[cur];
-            if (typeof who !== 'string' || who === misc_1.WHO_ANY_ACCOUNT)
+            if (typeof who !== 'string' || who === misc_1.WHO_ANY_ACCOUNT || who === misc_1.WHO_ADMIN)
                 break;
             if (!max--) {
                 console.error(`Endless loop in permission ${perm}=${node[perm] ?? misc_1.defaultPerms[perm]} for ${node.url || getNodeName(node)}`);
@@ -262,19 +264,29 @@ function statusCodeForMissingPerm(node, perm, ctx, assign = true) {
             }
             cur = who;
         } while (1);
+        if ((0, misc_1.isWhoObject)(who) || isWhoVfsPerms(who))
+            throw Error(`permission type-guard: ${JSON.stringify(who)}`);
         const eventName = 'checkVfsPermission';
         if (events_1.default.anyListener(eventName)) {
             const first = lodash_1.default.max(events_1.default.emit(eventName, { who, node, perm, ctx }));
             if (first !== undefined)
                 return first;
         }
-        if (Array.isArray(who))
-            return (0, perm_1.ctxBelongsTo)(ctx, who) ? 0 : const_1.HTTP_UNAUTHORIZED;
-        return typeof who === 'boolean' ? (who ? 0 : const_1.HTTP_FORBIDDEN)
-            : who === misc_1.WHO_ANY_ACCOUNT ? ((0, auth_1.getCurrentUsername)(ctx) ? 0 : const_1.HTTP_UNAUTHORIZED)
-                : (0, misc_1.throw_)(Error(`invalid permission: ${perm}=${(0, misc_1.try_)(() => JSON.stringify(who))}`));
+        return simpleWhoToError(who, ctx)
+            ?? (0, misc_1.throw_)(Error(`invalid permission: ${perm}=${(0, misc_1.try_)(() => JSON.stringify(who))}`));
     }
 }
+function simpleWhoToError(who, ctx) {
+    if (Array.isArray(who))
+        return (0, perm_1.ctxBelongsTo)(ctx, who) ? 0 : const_1.HTTP_UNAUTHORIZED;
+    return typeof who === 'boolean' ? (who ? 0 : const_1.HTTP_FORBIDDEN)
+        : who === misc_1.WHO_ANY_ACCOUNT ? ((0, auth_1.getCurrentUsername)(ctx) ? 0 : const_1.HTTP_UNAUTHORIZED)
+            : who === misc_1.WHO_ADMIN ? ((0, adminApis_1.ctxAdminAccess)(ctx) ? 0 : const_1.HTTP_UNAUTHORIZED)
+                : undefined;
+}
+function isWhoVfsPerms(who) {
+    return typeof who === 'string' && misc_1.PERM_KEYS.includes(who);
+}
 // it's the responsibility of the caller to verify you have list permission on parent, as callers have different needs.
 async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requiredPerm, onlyFolders = false, onlyFiles = false, parallelizeRecursion = true, } = {}) {
     let started = false;

package/src/zip.js

@@ -40,7 +40,7 @@ async function zipStreamFromFolder(node, ctx) {
                 if ((0, vfs_1.nodeIsFolder)(subNode)) { // a directory needs to be walked
                     if ((0, vfs_1.hasPermission)(subNode, 'can_list', ctx) && (0, vfs_1.hasPermission)(subNode, 'can_archive', ctx)) {
                         yield subNode; // it could be empty
-                        yield* (0, vfs_1.walkNode)(subNode, { ctx, prefixPath: decodeURI(uri) + '/', requiredPerm: 'can_archive' });
+                        yield* (0, vfs_1.walkNode)(subNode, { ctx, prefixPath: (0, misc_1.pathDecodeSegments)(uri) + '/', requiredPerm: 'can_archive' });
                     }
                     continue;
                 }