hfs 0.57.0-beta2 → 0.57.0-beta4

package/src/perm.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.changeSrpHelper = exports.accountCanLoginAdmin = exports.accountCanLogin = exports.accountHasPassword = exports.getFromAccount = exports.delAccount = exports.addAccount = exports.renameAccount = exports.normalizeUsername = exports.accountsConfig = exports.updateAccount = exports.createAdmin = exports.saveSrpInfo = exports.getAccount = exports.getUsernames = exports.ctxBelongsTo = exports.expandUsername = void 0;
+exports.changeSrpHelper = exports.accountCanLoginAdmin = exports.accountCanLogin = exports.accountHasPassword = exports.getFromAccount = exports.delAccount = exports.addAccount = exports.renameAccount = exports.normalizeUsername = exports.accounts = exports.updateAccount = exports.createAdmin = exports.saveSrpInfo = exports.getAccount = exports.getUsernames = exports.ctxBelongsTo = exports.expandUsername = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const misc_1 = require("./misc");
 const config_1 = require("./config");
@@ -12,7 +12,6 @@ const tssrp6a_1 = require("tssrp6a");
 const events_1 = __importDefault(require("./events"));
 const apiMiddleware_1 = require("./apiMiddleware");
 const auth_1 = require("./auth");
-let accounts = {};
 // provides the username and all other usernames it inherits based on the 'belongs' attribute. Useful to check permissions
 function expandUsername(who) {
     const ret = [];
@@ -36,13 +35,13 @@ function ctxBelongsTo(ctx, usernames) {
 }
 exports.ctxBelongsTo = ctxBelongsTo;
 function getUsernames() {
-    return Object.keys(accounts);
+    return Object.keys(exports.accounts.get());
 }
 exports.getUsernames = getUsernames;
 function getAccount(username, normalize = true) {
     if (normalize)
         username = normalizeUsername(username);
-    return username ? accounts[username] : undefined;
+    return username ? exports.accounts.get()[username] : undefined;
 }
 exports.getAccount = getAccount;
 function saveSrpInfo(account, salt, verifier) {
@@ -83,7 +82,7 @@ async function updateAccount(account, change) {
     if (account.belongs) {
         account.belongs = (0, misc_1.wantArray)(account.belongs);
         lodash_1.default.remove(account.belongs, b => {
-            if (accounts.hasOwnProperty(b))
+            if (exports.accounts.get().hasOwnProperty(b))
                 return;
             console.error(`account ${username} belongs to non-existing ${b}`);
             return true;
@@ -99,10 +98,10 @@ async function updateAccount(account, change) {
 }
 exports.updateAccount = updateAccount;
 const saveAccountsAsap = config_1.saveConfigAsap;
-exports.accountsConfig = (0, config_1.defineConfig)('accounts', {});
-exports.accountsConfig.sub(obj => {
-    // consider some validation here
-    lodash_1.default.each(accounts = obj, (rec, k) => {
+exports.accounts = (0, config_1.defineConfig)('accounts', {});
+exports.accounts.sub(lodash_1.default.debounce(obj => {
+    // consider some validation here, in case of manual edit of the config
+    lodash_1.default.each(obj, (rec, k) => {
         const norm = normalizeUsername(k);
         if ((rec === null || rec === void 0 ? void 0 : rec.username) !== norm) {
             if (!rec) // an empty object in yaml is parsed as null
@@ -113,32 +112,32 @@ exports.accountsConfig.sub(obj => {
         }
         void updateAccount(rec, {}); // work fields
     });
-});
+})); // don't trigger in the middle of a series of deletion, as we may have an inconsistent state
 function normalizeUsername(username) {
     return username.toLocaleLowerCase();
 }
 exports.normalizeUsername = normalizeUsername;
 function renameAccount(from, to) {
+    var _a;
     from = normalizeUsername(from);
+    const as = exports.accounts.get();
     to = normalizeUsername(to);
-    if (!to || !accounts[from] || accounts[to])
+    if (!to || !as[from] || as[to])
         return false;
     if (to === from)
         return true;
-    (0, misc_1.objRenameKey)(accounts, from, to);
-    updateReferences();
+    (0, misc_1.objRenameKey)(as, from, to);
+    (0, misc_1.setHidden)(as[to], { username: to });
+    // update references
+    for (const a of Object.values(as)) {
+        const idx = (_a = a.belongs) === null || _a === void 0 ? void 0 : _a.indexOf(from);
+        if (idx !== undefined && idx >= 0)
+            a.belongs[idx] = to;
+    }
+    exports.accounts.set(as);
+    events_1.default.emit('accountRenamed', from, to); // everybody, take care of your stuff
     saveAccountsAsap();
     return true;
-    function updateReferences() {
-        var _a;
-        (0, misc_1.setHidden)(accounts[to], { username: to });
-        for (const a of Object.values(accounts)) {
-            const idx = (_a = a.belongs) === null || _a === void 0 ? void 0 : _a.indexOf(from);
-            if (idx !== undefined && idx >= 0)
-                a.belongs[idx] = to;
-        }
-        events_1.default.emit('accountRenamed', from, to); // everybody, take care of your stuff
-    }
 }
 exports.renameAccount = renameAccount;
 function addAccount(username, props, updateExisting = false) {
@@ -150,14 +149,14 @@ function addAccount(username, props, updateExisting = false) {
         return;
     account = (0, misc_1.setHidden)(account || {}, { username }); // hidden so that stringification won't include it
     Object.assign(account, lodash_1.default.pickBy(props, Boolean));
-    exports.accountsConfig.set(accounts => Object.assign(accounts, { [username]: account }));
+    exports.accounts.set(accounts => Object.assign(accounts, { [username]: account }));
     return updateAccount(account, account).then(() => account);
 }
 exports.addAccount = addAccount;
 function delAccount(username) {
     if (!getAccount(username))
         return false;
-    exports.accountsConfig.set(accounts => lodash_1.default.omit(accounts, normalizeUsername(username)));
+    exports.accounts.set(x => lodash_1.default.omit(x, normalizeUsername(username)));
     saveAccountsAsap();
     return true;
 }

package/src/plugins.js

@@ -209,7 +209,7 @@ const pluginsMiddleware = async (ctx, next) => {
                 warnOnce(`plugin ${id} is using deprecated API (return true on middleware) and may not work with future versions (check for an update to "${id}")`);
             }
             // don't just check ctx.isStopped, as the async plugin that called ctx.stop will reach here after sync ones
-            if (res === true && !ctx.pluginBlockedRequest)
+            if (ctx.isStopped && !ctx.pluginBlockedRequest)
                 console.debug("plugin blocked request", ctx.pluginBlockedRequest = id);
             if (typeof res === 'function')
                 after[id] = res;
@@ -219,7 +219,7 @@ const pluginsMiddleware = async (ctx, next) => {
         }
     }));
     // expose public plugins' files`
-    if (!ctx.pluginBlockedRequest) {
+    if (!ctx.isStopped) {
         const { path } = ctx;
         if (path.startsWith(const_1.PLUGINS_PUB_URI)) {
             const a = path.substring(const_1.PLUGINS_PUB_URI.length).split('/');

package/src/roots.js

@@ -12,7 +12,7 @@ const lodash_1 = __importDefault(require("lodash"));
 exports.roots = (0, config_1.defineConfig)(misc_1.CFG.roots, {}, map => {
     const list = Object.keys(map);
     const matchers = list.map(hostMask => (0, misc_1.makeMatcher)(hostMask));
-    const values = Object.values(map);
+    const values = Object.values(map).map(x => (0, misc_1.enforceFinal)('/', (0, misc_1.enforceStarting)('/', x)));
     return (host) => values[matchers.findIndex(m => m(host))];
 });
 const forceAddress = (0, config_1.defineConfig)(misc_1.CFG.force_address, false);
@@ -35,7 +35,7 @@ const rootsMiddleware = (ctx, next) => (() => {
     }
     if (lodash_1.default.isEmpty(exports.roots.get()))
         return;
-    const root = (_a = exports.roots.compiled()) === null || _a === void 0 ? void 0 : _a(ctx.host);
+    const root = ctx.state.root = (_a = exports.roots.compiled()) === null || _a === void 0 ? void 0 : _a(ctx.host);
     if (!ctx.state.skipFilters && forceAddress.get())
         if (root === undefined && !(0, misc_1.isLocalHost)(ctx) && ctx.host !== listen_1.baseUrl.compiled()) {
             (0, connections_1.disconnect)(ctx, forceAddress.key());

package/src/serveFile.js

@@ -121,9 +121,10 @@ exports.monitorAsDownload = monitorAsDownload;
 function applyRange(ctx, totalSize = ctx.response.length) {
     ctx.set('Accept-Ranges', 'bytes');
     const { range } = ctx.request.header;
-    if (!range) {
+    if (!range || isNaN(totalSize)) {
         ctx.state.includesLastByte = true;
-        ctx.response.length = totalSize;
+        if (!isNaN(totalSize))
+            ctx.response.length = totalSize;
         return;
     }
     const [unit, ranges] = range.split('=');

package/src/serveGuiAndSharedFiles.js

@@ -60,7 +60,7 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
     if (ctx.method === 'PUT') { // curl -T file url/
         const decPath = decodeURIComponent(path);
         let rest = (0, path_1.basename)(decPath);
-        const folderUri = (0, path_1.dirname)(path);
+        const folderUri = (0, misc_1.pathEncode)((0, path_1.dirname)(decPath)); // re-encode to get readable urls
         const folder = await (0, vfs_1.urlToNode)(folderUri, ctx, vfs_1.vfs, v => rest = v + '/' + rest);
         if (!folder)
             return (0, errorPages_1.sendErrorPage)(ctx, cross_const_1.HTTP_NOT_FOUND);
@@ -77,7 +77,7 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
         }
         return;
     }
-    if (/^\/favicon.ico(\??.*)/.test(ctx.originalUrl) && adminApis_1.favicon.get()) // originalUrl to not be subject to changes (vhosting plugin)
+    if (/^\/favicon.ico(\??.*)/.test(ctx.originalUrl) && adminApis_1.favicon.get() && ctx.method === 'GET') // originalUrl to not be subject to changes (vhosting plugin)
         return (0, serveFile_1.serveFile)(ctx, adminApis_1.favicon.get());
     let node = await (0, vfs_1.urlToNode)(path, ctx);
     if (!node)

package/src/serveGuiFiles.js

@@ -74,9 +74,9 @@ async function treatIndex(ctx, filesUri, body) {
     const plugins = Object.fromEntries((0, misc_1.onlyTruthy)((0, plugins_1.mapPlugins)((pl, name) => {
         var _a, _b;
         let configs = (0, misc_1.newObj)((0, plugins_1.getPluginConfigFields)(name), (v, k, skip) => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c;
             return !v.frontend ? skip() :
-                ((_c = (_b = (_a = plugins_1.pluginsConfig.get()) === null || _a === void 0 ? void 0 : _a[name]) === null || _b === void 0 ? void 0 : _b[k]) !== null && _c !== void 0 ? _c : (_e = (_d = pl.getData().config) === null || _d === void 0 ? void 0 : _d[k]) === null || _e === void 0 ? void 0 : _e.defaultValue);
+                adjustValueByConfig((_b = (_a = plugins_1.pluginsConfig.get()) === null || _a === void 0 ? void 0 : _a[name]) === null || _b === void 0 ? void 0 : _b[k], (_c = pl.getData().config) === null || _c === void 0 ? void 0 : _c[k]);
         });
         configs = ((_b = (_a = (0, plugins_1.getPluginInfo)(name)).onFrontendConfig) === null || _b === void 0 ? void 0 : _b.call(_a, configs)) || configs;
         return !lodash_1.default.isEmpty(configs) && [name, configs];
@@ -142,6 +142,24 @@ async function treatIndex(ctx, filesUri, body) {
             return (0, customHtml_1.getSection)('bottom') + all;
         return all; // unchanged
     });
+    function adjustValueByConfig(v, cfg) {
+        v !== null && v !== void 0 ? v : (v = cfg.defaultValue);
+        const { type } = cfg;
+        if (v && type === 'vfs_path') {
+            v = (0, misc_1.enforceStarting)('/', v);
+            const { root } = ctx.state;
+            if (root)
+                if (v.startsWith(root))
+                    v = v.slice(root.length - 1);
+                else
+                    return;
+            if (ctx.state.revProxyPath)
+                v = ctx.state.revProxyPath + v;
+        }
+        else if (type === 'array' && Array.isArray(v))
+            v = v.map(x => (0, misc_1.objSameKeys)(x, (xv, xk) => adjustValueByConfig(xv, cfg.fields[xk])));
+        return v;
+    }
 }
 function serializeCss(v) {
     var _a;

package/src/util-http.js

@@ -45,7 +45,7 @@ function httpStream(url, { body, jar, noRedirect, httpThrow, proxy, ...options }
         if (jar)
             options.headers.cookie = lodash_1.default.map(jar, (v, k) => `${k}=${v}; `).join('')
                 + (options.headers.cookie || ''); // preserve parameter
-        Object.assign(options, lodash_1.default.pick((0, node_url_1.parse)(proxy || url), ['hostname', 'port', 'path', 'protocol']));
+        Object.assign(options, lodash_1.default.pick((0, node_url_1.parse)(proxy || url), ['hostname', 'port', 'path', 'protocol', 'auth']));
         if (proxy) {
             options.path = url;
             (_d = (_g = options.headers).host) !== null && _d !== void 0 ? _d : (_g.host = (0, node_url_1.parse)(url).host || undefined);

package/src/vfs.js

@@ -250,6 +250,7 @@ async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requi
     const stream = new node_stream_1.Readable({
         objectMode: true,
         async read() {
+            var _a;
             if (started)
                 return; // for simplicity, we care about starting, and never suspend
             started = true;
@@ -266,11 +267,11 @@ async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requi
                     const item = { ...child, name };
                     if (await cantSee(item))
                         continue;
-                    if (item.source) // real items must be accessible
+                    if (item.source && !((_a = item.children) === null || _a === void 0 ? void 0 : _a.length)) // real items must be accessible, unless there's more to it
                         try {
                             await promises_1.default.access(item.source);
                         }
-                        catch (_a) {
+                        catch (_b) {
                             continue;
                         }
                     const isFolder = await nodeIsDirectory(child);

package/src/zip.js

@@ -82,7 +82,6 @@ async function zipStreamFromFolder(node, ctx) {
     const zip = new QuickZipStream_1.QuickZipStream(mappedWalker);
     const time = 1000 * zipSeconds.get();
     const size = await zip.calculateSize(time);
-    ctx.response.length = size;
     const range = (0, serveFile_1.applyRange)(ctx, size); // keep var size as ctx.response.length won't preserve a NaN
     if (ctx.status >= 400)
         return;