hfs 0.42.3 → 0.43.0

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.walkNode = exports.statusCodeForMissingPerm = exports.hasPermission = exports.nodeIsDirectory = exports.getNodeName = exports.saveVfs = exports.vfs = exports.urlToNode = exports.isSameFilenameAs = exports.MIME_AUTO = exports.defaultPerms = void 0;
+exports.masksCouldGivePermission = exports.walkNode = exports.statusCodeForMissingPerm = exports.hasPermission = exports.nodeIsDirectory = exports.getNodeName = exports.saveVfs = exports.vfs = exports.urlToNode = exports.isSameFilenameAs = exports.MIME_AUTO = exports.defaultPerms = exports.WHO_ANY_ACCOUNT = exports.WHO_NO_ONE = exports.WHO_ANYONE = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = require("path");
 const misc_1 = require("./misc");
@@ -13,15 +13,15 @@ const config_1 = require("./config");
 const const_1 = require("./const");
 const events_1 = __importDefault(require("./events"));
 const perm_1 = require("./perm");
-const WHO_ANYONE = true;
-const WHO_NO_ONE = false;
-const WHO_ANY_ACCOUNT = '*';
+exports.WHO_ANYONE = true;
+exports.WHO_NO_ONE = false;
+exports.WHO_ANY_ACCOUNT = '*';
 exports.defaultPerms = {
-    can_see: WHO_ANYONE,
-    can_read: WHO_ANYONE,
-    can_list: WHO_ANYONE,
-    can_upload: WHO_NO_ONE,
-    can_delete: WHO_NO_ONE,
+    can_see: exports.WHO_ANYONE,
+    can_read: exports.WHO_ANYONE,
+    can_list: exports.WHO_ANYONE,
+    can_upload: exports.WHO_NO_ONE,
+    can_delete: exports.WHO_NO_ONE,
 };
 exports.MIME_AUTO = 'auto';
 function inheritFromParent(parent, child) {
@@ -139,10 +139,6 @@ exports.statusCodeForMissingPerm = statusCodeForMissingPerm;
 // Too many parameters: consider object, but benchmark against degraded recursion on huge folders.
 async function* walkNode(parent, ctx, depth = 0, prefixPath = '', requiredPerm) {
     var _a;
-    if (requiredPerm && ctx
-        && !hasPermission(parent, requiredPerm, ctx)
-        && !masksCouldGivePermission(parent.masks))
-        return; // no permission, no reason to continue
     const { children, source } = parent;
     const took = prefixPath ? undefined : new Set();
     if (children)
@@ -162,6 +158,10 @@ async function* walkNode(parent, ctx, depth = 0, prefixPath = '', requiredPerm)
         }
     if (!source)
         return;
+    if (requiredPerm && ctx // no permission, no reason to continue (at least for dynamic elements)
+        && !hasPermission(parent, requiredPerm, ctx)
+        && !masksCouldGivePermission(parent.masks, requiredPerm))
+        return;
     try {
         let lastDir = prefixPath.slice(0, -1) || '.';
         const map = new Map();
@@ -203,20 +203,12 @@ async function* walkNode(parent, ctx, depth = 0, prefixPath = '', requiredPerm)
         item.isTemp = true;
         return item;
     }
-    function masksCouldGivePermission(masks) {
-        if (!masks)
-            return false;
-        for (const [, props] of Object.entries(masks)) {
-            const v = props[requiredPerm];
-            if (v && (!ctx || matchWho(v, ctx))) // without ctx we can't say, so it could
-                return true;
-            if (masksCouldGivePermission(props.masks))
-                return true;
-        }
-        return false;
-    }
 }
 exports.walkNode = walkNode;
+function masksCouldGivePermission(masks, perm) {
+    return masks !== undefined && Object.values(masks).some(props => props[perm] || masksCouldGivePermission(props.masks, perm));
+}
+exports.masksCouldGivePermission = masksCouldGivePermission;
 function applyMasks(item, parent, virtualBasename) {
     const { masks } = parent;
     if (!masks)
@@ -248,8 +240,8 @@ function renameUnderPath(rename, path) {
     return lodash_1.default.isEmpty(rename) ? undefined : rename;
 }
 function matchWho(who, ctx) {
-    return who === WHO_ANYONE
-        || who === WHO_ANY_ACCOUNT && Boolean(ctx.state.account)
+    return who === exports.WHO_ANYONE
+        || who === exports.WHO_ANY_ACCOUNT && Boolean(ctx.state.account)
         || Array.isArray(who) // check if I or any ancestor match `who`, but cache ancestors' usernames inside context state
             && (0, misc_1.getOrSet)(ctx.state, 'usernames', () => (0, perm_1.getCurrentUsernameExpanded)(ctx)).some((u) => who.includes(u));
 }

package/admin/assets/index-94bbe0be.css

@@ -1 +0,0 @@
-:root{height:100dvh}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;height:100vh;background:#000}#root{min-height:100%;display:flex}code{font-family:source-code-pro,Menlo,Monaco,Consolas,Courier New,monospace}.MuiTreeItem-content{box-sizing:border-box}ol,ul{margin-top:.2em}.dialog-backdrop{position:fixed;inset:0;background:#888a;display:flex;justify-content:center;align-items:center;z-index:1000}.dialog{background:#fff;background:var(--bg);padding:max(.5em,1vw);border-radius:1em;position:relative;margin:0 3vw;overflow:hidden;max-height:calc(100vh - 2em);display:flex;justify-content:center}.dialog-icon{color:#fff;background-color:var(--color);position:absolute;top:0;width:2em;height:1.8em;text-align:center;border-radius:.8em 0}.dialog-title{font-size:120%;position:absolute;top:5px}.dialog-icon~.dialog-title{text-align:center}.dialog-closer{border-radius:0 .8em;right:0;padding:0;background-color:#c88}.dialog-icon~.dialog-content{margin-top:2em}.dialog-type{left:0;top:0;overflow:hidden;line-height:1.8em;opacity:.8}.dialog-content{overflow:auto;max-height:calc(100vh - 4.5em)}.dialog-content p{white-space:pre-wrap;margin:.5em 0}.dialog-confirm .dialog-content button{margin-top:1em}.dialog-alert-info{--color: #282 }.dialog-alert-warning{--color: #c91 }.dialog-alert-error{--color: #822}@media (max-width: 42em){.dialog-icon{font-size:120%}.dialog-icon~.dialog-content{margin-top:2.5em}.dialog-title{top:5px}}.dialog-prompt label{display:block;margin-bottom:.5em;margin-left:.1em}