cryptpad-server 0.0.3 → 0.0.5

package/build/core.js

@@ -1354,6 +1354,9 @@ function requireWsConnector() {
                 cb(void 0, ctx.self);
             };
             const port = config.wsPort || config.port;
+            httpServer.on("error", e => {
+                cb(e);
+            });
             httpServer.listen(port, config.host, onServerReady);
         },
         initClient: (ctx, config, id, onConnected, cb) => {
@@ -2895,8 +2898,9 @@ function requireSchedule() {
         };
         var runOnceUnblocked = function(local, task) {
             var uid = unusedUid(local.blocked);
-            local.blocked[uid] = function() {
-                runImmediately(local, task);
+            local.blocked[uid] = function(next) {
+                delete local.blocked[uid];
+                task(next);
             };
         };
         var Unordered = function(id, task) {
@@ -3153,6 +3157,14 @@ function requireFile() {
             writeLinkedFile(env, path, content, cb);
         });
     };
+    const hasLinkedDocuments = (env, channelId) => {
+        const path = mkLinkedPath(env, channelId);
+        try {
+            return Fs.existsSync(path);
+        } catch (e) {
+            return false;
+        }
+    };
     const getLinkedDocuments = (env, channelId, cb) => {
         const path = mkLinkedPath(env, channelId);
         readLinkedFile(env, path, cb);
@@ -4225,6 +4237,7 @@ function requireFile() {
                         writeMetadata(env, channelName, data, Util.both(cb, next));
                     });
                 },
+                hasLinkedDocuments: channelId => hasLinkedDocuments(env, channelId),
                 getLinkedDocuments: (channelId, cb) => {
                     if (!isValidChannelId(channelId)) {
                         return cb(new Error("EINVAL"));
@@ -7682,7 +7695,7 @@ function requireHttpCommands() {
     return httpCommands;
 }
 
-var version = "0.0.3";
+var version = "0.0.5";
 
 var require$$2 = {
     version
@@ -9077,7 +9090,6 @@ function requireCore() {
         };
         const {challengePath} = Core.getPaths(mainConfig);
         Env.challengePath = challengePath;
-        Env.workers = WorkerModule(workerConfig);
         let queriesToStorage = [];
         let queriesToFront = [];
         let eventsToStorage = [];
@@ -9122,11 +9134,13 @@ function requireCore() {
                 Env.Log.error("INTERFACE_INIT_ERROR", err);
                 return;
             }
+            Env.workers = WorkerModule(workerConfig);
             if (process.send !== undefined) {
                 process.send({
                     type: "core",
                     index,
-                    msg: "READY"
+                    msg: "READY",
+                    pid: process.pid
                 });
             }
             checkCacheInterval();

package/build/core.worker.js

@@ -970,6 +970,10 @@ function requireWorker() {
                 txid: obj.txid,
                 pid: obj.pid,
                 value
+            }, e => {
+                if (e) {
+                    console.error("E_RESPONSE", Util.serializeError(e));
+                }
             });
         };
         if (!ready) {
@@ -986,6 +990,9 @@ function requireWorker() {
         }
         command(data, cb);
     });
+    process.on("disconnect", () => {
+        process.exit(0);
+    });
     process.on("uncaughtException", function(err) {
         console.error("[%s] UNCAUGHT EXCEPTION IN DB WORKER", new Date);
         console.error(err);

package/build/front.js

@@ -1358,6 +1358,9 @@ function requireWsConnector() {
                 cb(void 0, ctx.self);
             };
             const port = config.wsPort || config.port;
+            httpServer.on("error", e => {
+                cb(e);
+            });
             httpServer.listen(port, config.host, onServerReady);
         },
         initClient: (ctx, config, id, onConnected, cb) => {
@@ -2514,8 +2517,9 @@ function requireSchedule() {
         };
         var runOnceUnblocked = function(local, task) {
             var uid = unusedUid(local.blocked);
-            local.blocked[uid] = function() {
-                runImmediately(local, task);
+            local.blocked[uid] = function(next) {
+                delete local.blocked[uid];
+                task(next);
             };
         };
         var Unordered = function(id, task) {
@@ -2772,6 +2776,14 @@ function requireFile() {
             writeLinkedFile(env, path, content, cb);
         });
     };
+    const hasLinkedDocuments = (env, channelId) => {
+        const path = mkLinkedPath(env, channelId);
+        try {
+            return Fs.existsSync(path);
+        } catch (e) {
+            return false;
+        }
+    };
     const getLinkedDocuments = (env, channelId, cb) => {
         const path = mkLinkedPath(env, channelId);
         readLinkedFile(env, path, cb);
@@ -3844,6 +3856,7 @@ function requireFile() {
                         writeMetadata(env, channelName, data, Util.both(cb, next));
                     });
                 },
+                hasLinkedDocuments: channelId => hasLinkedDocuments(env, channelId),
                 getLinkedDocuments: (channelId, cb) => {
                     if (!isValidChannelId(channelId)) {
                         return cb(new Error("EINVAL"));
@@ -4049,7 +4062,7 @@ function requireLogger() {
     return logger;
 }
 
-var version = "0.0.3";
+var version = "0.0.5";
 
 var require$$2 = {
     version
@@ -5052,13 +5065,16 @@ function requireNetwork() {
             };
         };
         const serveConfig = makeRouteCache(function() {
-            const ssoList = Env.sso && Env.sso.enabled && Array.isArray(Env.sso.list) && Env.sso.list.map(function(obj) {
+            const ssoList = Env.sso && Array.isArray(Env.sso.list) && Env.sso.list.map(function(obj) {
                 return obj.name;
             }) || [];
-            const SSOUtils = Env?.plugins?.SSO?.utils;
-            const ssoCfg = SSOUtils && ssoList.length ? {
-                force: Env.sso && Env.sso.enforced && 1 || 0,
-                password: Env.sso && Env.sso.cpPassword && (Env.sso.forceCpPassword ? 2 : 1) || 0,
+            let forceSso = Env?.sso?.enforced ?? true;
+            let allowPw = Env?.sso?.cpPassword ?? true;
+            let forcePw = Env?.sso?.forceCpPassword ?? true;
+            const ssoCfg = Env?.sso?.enabled ? {
+                enabled: Env?.sso?.enabled,
+                force: forceSso ? 1 : 0,
+                password: allowPw && (forcePw ? 2 : 1) || 0,
                 list: ssoList
             } : false;
             return [ "define(function(){", "return " + JSON.stringify({
@@ -5135,7 +5151,7 @@ function requireNetwork() {
         });
         app.use(Express.json());
         app.post("/api/auth", (req, res) => {
-            const body = Util.clone(req.body);
+            const body = Util.clone(req.body) || {};
             const cookies = req.cookies;
             body._cookies = cookies;
             events.httpCommand.fire(body, (err, response) => {
@@ -5795,7 +5811,8 @@ function requireFront() {
                 process.send({
                     type: "front",
                     index,
-                    msg: "READY"
+                    msg: "READY",
+                    pid: process.pid
                 });
             } else {
                 Env.Log.info("SINGLE_FRONT_STARTED", Env.myId);

package/build/http.js

@@ -1942,8 +1942,9 @@ function requireSchedule() {
         };
         var runOnceUnblocked = function(local, task) {
             var uid = unusedUid(local.blocked);
-            local.blocked[uid] = function() {
-                runImmediately(local, task);
+            local.blocked[uid] = function(next) {
+                delete local.blocked[uid];
+                task(next);
             };
         };
         var Unordered = function(id, task) {
@@ -2200,6 +2201,14 @@ function requireFile() {
             writeLinkedFile(env, path, content, cb);
         });
     };
+    const hasLinkedDocuments = (env, channelId) => {
+        const path = mkLinkedPath(env, channelId);
+        try {
+            return Fs.existsSync(path);
+        } catch (e) {
+            return false;
+        }
+    };
     const getLinkedDocuments = (env, channelId, cb) => {
         const path = mkLinkedPath(env, channelId);
         readLinkedFile(env, path, cb);
@@ -3272,6 +3281,7 @@ function requireFile() {
                         writeMetadata(env, channelName, data, Util.both(cb, next));
                     });
                 },
+                hasLinkedDocuments: channelId => hasLinkedDocuments(env, channelId),
                 getLinkedDocuments: (channelId, cb) => {
                     if (!isValidChannelId(channelId)) {
                         return cb(new Error("EINVAL"));
@@ -3477,7 +3487,7 @@ function requireLogger() {
     return logger;
 }
 
-var version = "0.0.3";
+var version = "0.0.5";
 
 var require$$2 = {
     version
@@ -5172,6 +5182,9 @@ function requireWsConnector() {
                 cb(void 0, ctx.self);
             };
             const port = config.wsPort || config.port;
+            httpServer.on("error", e => {
+                cb(e);
+            });
             httpServer.listen(port, config.host, onServerReady);
         },
         initClient: (ctx, config, id, onConnected, cb) => {
@@ -5313,7 +5326,8 @@ function requireHttpServer() {
                 type: "http",
                 index: 0,
                 dev: Env.DEV_MODE,
-                msg: "READY"
+                msg: "READY",
+                pid: process.pid
             });
         });
     };

package/build/http.worker.js

@@ -1952,8 +1952,9 @@ function requireSchedule() {
         };
         var runOnceUnblocked = function(local, task) {
             var uid = unusedUid(local.blocked);
-            local.blocked[uid] = function() {
-                runImmediately(local, task);
+            local.blocked[uid] = function(next) {
+                delete local.blocked[uid];
+                task(next);
             };
         };
         var Unordered = function(id, task) {
@@ -2210,6 +2211,14 @@ function requireFile() {
             writeLinkedFile(env, path, content, cb);
         });
     };
+    const hasLinkedDocuments = (env, channelId) => {
+        const path = mkLinkedPath(env, channelId);
+        try {
+            return Fs.existsSync(path);
+        } catch (e) {
+            return false;
+        }
+    };
     const getLinkedDocuments = (env, channelId, cb) => {
         const path = mkLinkedPath(env, channelId);
         readLinkedFile(env, path, cb);
@@ -3282,6 +3291,7 @@ function requireFile() {
                         writeMetadata(env, channelName, data, Util.both(cb, next));
                     });
                 },
+                hasLinkedDocuments: channelId => hasLinkedDocuments(env, channelId),
                 getLinkedDocuments: (channelId, cb) => {
                     if (!isValidChannelId(channelId)) {
                         return cb(new Error("EINVAL"));
@@ -3529,7 +3539,7 @@ function requireDefaults() {
     return defaults.exports;
 }
 
-var version = "0.0.3";
+var version = "0.0.5";
 
 var require$$2 = {
     version
@@ -4611,6 +4621,10 @@ function requireWorker() {
                 txid: obj.txid,
                 pid: obj.pid,
                 value
+            }, e => {
+                if (e) {
+                    console.error("E_RESPONSE", Util.serializeError(e));
+                }
             });
         };
         if (!ready) {

package/build/storage.cluster.js

@@ -2879,7 +2879,7 @@ function requireMfa() {
     return mfa.exports;
 }
 
-var version = "0.0.3";
+var version = "0.0.5";
 
 var require$$2 = {
     version
@@ -2991,8 +2991,9 @@ function requireSchedule() {
         };
         var runOnceUnblocked = function(local, task) {
             var uid = unusedUid(local.blocked);
-            local.blocked[uid] = function() {
-                runImmediately(local, task);
+            local.blocked[uid] = function(next) {
+                delete local.blocked[uid];
+                task(next);
             };
         };
         var Unordered = function(id, task) {
@@ -4473,6 +4474,14 @@ function requireFile() {
             writeLinkedFile(env, path, content, cb);
         });
     };
+    const hasLinkedDocuments = (env, channelId) => {
+        const path = mkLinkedPath(env, channelId);
+        try {
+            return Fs.existsSync(path);
+        } catch (e) {
+            return false;
+        }
+    };
     const getLinkedDocuments = (env, channelId, cb) => {
         const path = mkLinkedPath(env, channelId);
         readLinkedFile(env, path, cb);
@@ -5545,6 +5554,7 @@ function requireFile() {
                         writeMetadata(env, channelName, data, Util.both(cb, next));
                     });
                 },
+                hasLinkedDocuments: channelId => hasLinkedDocuments(env, channelId),
                 getLinkedDocuments: (channelId, cb) => {
                     if (!isValidChannelId(channelId)) {
                         return cb(new Error("EINVAL"));

package/build/storage.js

@@ -1944,8 +1944,9 @@ function requireSchedule() {
         };
         var runOnceUnblocked = function(local, task) {
             var uid = unusedUid(local.blocked);
-            local.blocked[uid] = function() {
-                runImmediately(local, task);
+            local.blocked[uid] = function(next) {
+                delete local.blocked[uid];
+                task(next);
             };
         };
         var Unordered = function(id, task) {
@@ -2202,6 +2203,14 @@ function requireFile() {
             writeLinkedFile(env, path, content, cb);
         });
     };
+    const hasLinkedDocuments = (env, channelId) => {
+        const path = mkLinkedPath(env, channelId);
+        try {
+            return Fs.existsSync(path);
+        } catch (e) {
+            return false;
+        }
+    };
     const getLinkedDocuments = (env, channelId, cb) => {
         const path = mkLinkedPath(env, channelId);
         readLinkedFile(env, path, cb);
@@ -3274,6 +3283,7 @@ function requireFile() {
                         writeMetadata(env, channelName, data, Util.both(cb, next));
                     });
                 },
+                hasLinkedDocuments: channelId => hasLinkedDocuments(env, channelId),
                 getLinkedDocuments: (channelId, cb) => {
                     if (!isValidChannelId(channelId)) {
                         return cb(new Error("EINVAL"));
@@ -5025,10 +5035,17 @@ function requireChannelManager() {
                     }
                 }));
             }).nThen(function(w) {
+                if (!store.hasLinkedDocuments(channel)) {
+                    return;
+                }
                 Linked.trimHistory(Env, {
                     channel
                 }, w());
             }).nThen(function() {
+                Env.Log.info("HK_TRIM_HISTORY_START", {
+                    unsafeKey,
+                    channel
+                });
                 store.trimChannel(channel, hash, err => {
                     Env.Log.info("HK_TRIM_HISTORY", {
                         unsafeKey,
@@ -6695,7 +6712,7 @@ function requireMfaManager() {
     return mfaManager;
 }
 
-var version = "0.0.3";
+var version = "0.0.5";
 
 var require$$2 = {
     version
@@ -7924,6 +7941,9 @@ function requireWsConnector() {
                 cb(void 0, ctx.self);
             };
             const port = config.wsPort || config.port;
+            httpServer.on("error", e => {
+                cb(e);
+            });
             httpServer.listen(port, config.host, onServerReady);
         },
         initClient: (ctx, config, id, onConnected, cb) => {
@@ -12113,7 +12133,8 @@ function requireStorage() {
                 process.send({
                     type: "storage",
                     index,
-                    msg: "READY"
+                    msg: "READY",
+                    pid: process.pid
                 });
             } else {
                 console.log(myId, "started");

package/build/storage.worker.js

@@ -1946,8 +1946,9 @@ function requireSchedule() {
         };
         var runOnceUnblocked = function(local, task) {
             var uid = unusedUid(local.blocked);
-            local.blocked[uid] = function() {
-                runImmediately(local, task);
+            local.blocked[uid] = function(next) {
+                delete local.blocked[uid];
+                task(next);
             };
         };
         var Unordered = function(id, task) {
@@ -2204,6 +2205,14 @@ function requireFile() {
             writeLinkedFile(env, path, content, cb);
         });
     };
+    const hasLinkedDocuments = (env, channelId) => {
+        const path = mkLinkedPath(env, channelId);
+        try {
+            return Fs.existsSync(path);
+        } catch (e) {
+            return false;
+        }
+    };
     const getLinkedDocuments = (env, channelId, cb) => {
         const path = mkLinkedPath(env, channelId);
         readLinkedFile(env, path, cb);
@@ -3276,6 +3285,7 @@ function requireFile() {
                         writeMetadata(env, channelName, data, Util.both(cb, next));
                     });
                 },
+                hasLinkedDocuments: channelId => hasLinkedDocuments(env, channelId),
                 getLinkedDocuments: (channelId, cb) => {
                     if (!isValidChannelId(channelId)) {
                         return cb(new Error("EINVAL"));
@@ -4731,7 +4741,7 @@ function requireTasks() {
     return tasks.exports;
 }
 
-var version = "0.0.3";
+var version = "0.0.5";
 
 var require$$2 = {
     version
@@ -5589,10 +5599,11 @@ function requirePinManager() {
     hasRequiredPinManager = 1;
     (function(module) {
         const Pins = module.exports;
-        __require$2();
-        __require$1();
-        requireCommonUtil$1();
-        requireFile();
+        const Fs = __require$2();
+        const Path = __require$1();
+        const Util = requireCommonUtil$1();
+        const Semaphore = require$$4;
+        const nThen = require$$3;
         const createLineHandler = Pins.createLineHandler = (ref, errorHandler) => {
             let fileName;
             if (typeof errorHandler === "string") {
@@ -5712,8 +5723,72 @@ function requirePinManager() {
             const ref = processPinFile(pinFile, fileName);
             return Object.keys(ref.pins);
         };
-        Pins.load = (cb, config) => {
-            throw new Error("EVICTION NOT IMPLEMENTED");
+        Pins.load = (Env, cb, config) => {
+            const sema = Semaphore.create(config.workers || 5);
+            let dirList;
+            const fileList = [];
+            const pinned = {};
+            var done = Util.once(cb);
+            var handler = config.handler;
+            let store = Env.pinStore;
+            let pinPath = Env.paths.pin;
+            nThen(waitFor => {
+                Fs.readdir(pinPath, waitFor((err, list) => {
+                    if (err) {
+                        if (err.code === "ENOENT") {
+                            dirList = [];
+                            return;
+                        }
+                        waitFor.abort();
+                        return void done(err);
+                    }
+                    dirList = list;
+                }));
+            }).nThen(waitFor => {
+                dirList.forEach(f => {
+                    sema.take(returnAfter => {
+                        Fs.readdir(Path.join(pinPath, f), waitFor(returnAfter((err, list2) => {
+                            if (err) {
+                                waitFor.abort();
+                                return void done(err);
+                            }
+                            list2.forEach(ff => {
+                                if (config && config.exclude && config.exclude.indexOf(ff) > -1) {
+                                    return;
+                                }
+                                fileList.push(ff.replace(/(\.ndjson)$/, ""));
+                            });
+                        })));
+                    });
+                });
+            }).nThen(waitFor => {
+                fileList.forEach(id => {
+                    sema.take(returnAfter => {
+                        var next = waitFor(returnAfter());
+                        var ref = {};
+                        var h = createLineHandler(ref, id);
+                        store.readMessagesBin(id, 0, (msgObj, next) => {
+                            h(msgObj.buff.toString("utf8"));
+                            next();
+                        }, err => {
+                            if (err) {
+                                waitFor.abort();
+                                return void done(err);
+                            }
+                            if (handler) {
+                                return void handler(ref, id, next);
+                            }
+                            const hashes = Object.keys(ref.pins);
+                            hashes.forEach(x => {
+                                (pinned[x] = pinned[x] || {})[id] = 1;
+                            });
+                            next();
+                        });
+                    });
+                });
+            }).nThen(() => {
+                done(void 0, pinned);
+            });
         };
     })(pinManager);
     return pinManager.exports;
@@ -6519,6 +6594,10 @@ function requireWorker() {
                 txid: obj.txid,
                 pid: obj.pid,
                 value
+            }, e => {
+                if (e) {
+                    console.error("E_RESPONSE", Util.serializeError(e));
+                }
             });
         };
         if (!ready) {
@@ -6535,6 +6614,9 @@ function requireWorker() {
         }
         command(data, cb);
     });
+    process.on("disconnect", () => {
+        process.exit(0);
+    });
     process.on("uncaughtException", function(err) {
         console.error("[%s] UNCAUGHT EXCEPTION IN DB WORKER", new Date);
         console.error(err);