hfs 0.49.2 → 0.50.0-alpha1

package/src/vfs.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parentMaskApplier = exports.masksCouldGivePermission = exports.walkNode = exports.statusCodeForMissingPerm = exports.hasPermission = exports.nodeIsDirectory = exports.getNodeName = exports.saveVfs = exports.vfs = exports.urlToNode = exports.applyParentToChild = exports.isSameFilenameAs = exports.permsFromParent = exports.MIME_AUTO = void 0;
+exports.parentMaskApplier = exports.masksCouldGivePermission = exports.walkNode = exports.statusCodeForMissingPerm = exports.hasPermission = exports.nodeIsLink = exports.nodeIsDirectory = exports.getNodeName = exports.saveVfs = exports.vfs = exports.urlToNode = exports.applyParentToChild = exports.isSameFilenameAs = exports.permsFromParent = exports.MIME_AUTO = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = require("path");
 const misc_1 = require("./misc");
@@ -13,6 +13,7 @@ const config_1 = require("./config");
 const const_1 = require("./const");
 const events_1 = __importDefault(require("./events"));
 const perm_1 = require("./perm");
+const auth_1 = require("./auth");
 exports.MIME_AUTO = 'auto';
 function permsFromParent(parent, child) {
     const ret = {};
@@ -119,12 +120,6 @@ async function urlToNode(url, ctx, parent = exports.vfs, getRest) {
 exports.urlToNode = urlToNode;
 exports.vfs = {};
 (0, config_1.defineConfig)('vfs', {}).sub(data => exports.vfs = (function recur(node) {
-    if (node.propagate) { // legacy pre-0.47
-        for (const [k, v] of (0, misc_1.typedEntries)(node.propagate))
-            if (v === false)
-                node[k] = { this: node[k] };
-        delete node.propagate;
-    }
     if (node.children)
         for (const c of node.children)
             recur(c);
@@ -154,14 +149,15 @@ async function nodeIsDirectory(node) {
     var _a;
     if (node.isFolder !== undefined)
         return node.isFolder;
-    const isFolder = Boolean(((_a = node.children) === null || _a === void 0 ? void 0 : _a.length) || !node.source || await (0, misc_1.isDirectory)(node.source));
-    if (node.isTemp)
-        node.isFolder = isFolder;
-    else
-        (0, misc_1.setHidden)(node, { isFolder }); // don't make it to the storage
+    const isFolder = Boolean(((_a = node.children) === null || _a === void 0 ? void 0 : _a.length) || !nodeIsLink(node) && (!node.source || await (0, misc_1.isDirectory)(node.source)));
+    (0, misc_1.setHidden)(node, { isFolder }); // don't make it to the storage (a node.isTemp doesn't need it to be hidden)
     return isFolder;
 }
 exports.nodeIsDirectory = nodeIsDirectory;
+function nodeIsLink(node) {
+    return node.url;
+}
+exports.nodeIsLink = nodeIsLink;
 function hasPermission(node, perm, ctx) {
     return !statusCodeForMissingPerm(node, perm, ctx, false);
 }
@@ -189,12 +185,12 @@ function statusCodeForMissingPerm(node, perm, ctx, assign = true) {
         if (Array.isArray(who)) {
             const arr = who; // shut up ts
             // check if I or any ancestor match `who`, but cache ancestors' usernames inside context state
-            const some = (0, misc_1.getOrSet)(ctx.state, 'usernames', () => (0, perm_1.expandUsername)((0, perm_1.getCurrentUsername)(ctx)))
+            const some = (0, misc_1.getOrSet)(ctx.state, 'usernames', () => (0, perm_1.expandUsername)((0, auth_1.getCurrentUsername)(ctx)))
                 .some((u) => arr.includes(u));
             return some ? 0 : const_1.HTTP_UNAUTHORIZED;
         }
         return typeof who === 'boolean' ? (who ? 0 : const_1.HTTP_FORBIDDEN)
-            : who === misc_1.WHO_ANY_ACCOUNT ? (ctx.state.account ? 0 : const_1.HTTP_UNAUTHORIZED)
+            : who === misc_1.WHO_ANY_ACCOUNT ? ((0, auth_1.getCurrentUsername)(ctx) ? 0 : const_1.HTTP_UNAUTHORIZED)
                 : (0, misc_1.throw_)(Error('invalid permission: ' + JSON.stringify(who)));
     }
 }

package/src/zip.js

@@ -43,6 +43,8 @@ async function zipStreamFromFolder(node, ctx) {
             }
         })();
     const mappedWalker = (0, misc_1.filterMapGenerator)(walker, async (el) => {
+        if ((0, vfs_1.nodeIsLink)(el))
+            return;
         if (!(0, vfs_1.hasPermission)(el, 'can_archive', ctx))
             return; // the fact you see it doesn't mean you can get it
         const { source } = el;