cryptpad-server 0.0.1 → 0.0.3

package/build/http.js

@@ -996,7 +996,6 @@ function requireCore() {
         const Util = requireCommonUtil$1();
         const Constants = requireConstants();
         const escapeKeyCharacters = Util.escapeKeyCharacters;
-        __require$5();
         const Crypto = __require$4();
         const Keys = requireKeys();
         Core.DEFAULT_LIMIT = 50 * 1024 * 1024;
@@ -1116,8 +1115,7 @@ function requireCore() {
             cb();
         };
         Core.getPaths = (mainConfig, isEnv) => {
-            const {index, config} = mainConfig;
-            Constants.paths;
+            const {config} = mainConfig;
             const all = {
                 basePath: config.basePath || config.base || "./data",
                 filePath: config.filePath || "./datastore",
@@ -3479,7 +3477,7 @@ function requireLogger() {
     return logger;
 }
 
-var version = "0.0.1";
+var version = "0.0.3";
 
 var require$$2 = {
     version
@@ -4649,60 +4647,69 @@ var hasRequiredCrypto;
 function requireCrypto() {
     if (hasRequiredCrypto) return crypto;
     hasRequiredCrypto = 1;
-    crypto = cryptoLib => {
-        let exports = {};
-        exports.decodeBase64 = msg => Buffer.from(msg, "base64");
-        exports.encodeBase64 = msg => Buffer.from(msg).toString("base64");
-        exports.decodeUTF8 = msg => Buffer.from(msg, "utf8");
-        exports.encodeUTF8 = msg => Buffer.from(msg).toString("utf8");
+    const loadSodium = cryptoLib => {
+        let sodiumLib = {};
         let SodiumNative, NaCl;
         switch (cryptoLib) {
           case "sodiumnative":
-            SodiumNative = require("sodium-native");
-            exports.sigVerify = (signedMessage, validateKey) => {
-                let msg = signedMessage.subarray(64);
-                let ok = SodiumNative.crypto_sign_open(msg, signedMessage, validateKey);
-                if (!ok) {
-                    return false;
-                }
-                return msg;
-            };
-            exports.detachedVerify = (signedBuffer, signatureBuffer, validateKey) => SodiumNative.crypto_sign_verify_detached(signatureBuffer, signedBuffer, validateKey);
-            exports.secretbox = (message, nonce, secretKey) => {
-                let secretBox = Buffer.alloc(message.length + SodiumNative.crypto_box_MACBYTES);
-                SodiumNative.crypto_secretbox_easy(secretBox, message, nonce, secretKey);
-                return secretBox;
-            };
-            exports.secretboxOpen = (secretBox, nonce, secretKey) => {
-                let msg = Buffer.alloc(secretBox.length - SodiumNative.crypto_secretbox_MACBYTES);
-                if (SodiumNative.crypto_secretbox_open_easy(msg, secretBox, nonce, secretKey)) {
+            try {
+                SodiumNative = require("sodium-native");
+                sodiumLib.sigVerify = (signedMessage, validateKey) => {
+                    let msg = signedMessage.subarray(64);
+                    let ok = SodiumNative.crypto_sign_open(msg, signedMessage, validateKey);
+                    if (!ok) {
+                        return false;
+                    }
                     return msg;
-                } else {
-                    return void 0;
-                }
-            };
-            exports.publicKeyFromSecretKey = secretKey => {
-                let pk = new Uint8Array(SodiumNative.crypto_sign_PUBLICKEYBYTES);
-                SodiumNative.crypto_sign_ed25519_sk_to_pk(pk, secretKey);
-                return pk;
-            };
-            exports.hash = message => {
-                let out = Buffer.alloc(SodiumNative.crypto_hash_sha512_BYTES);
-                SodiumNative.crypto_hash_sha512(out, message);
-                return out;
-            };
+                };
+                sodiumLib.detachedVerify = (signedBuffer, signatureBuffer, validateKey) => SodiumNative.crypto_sign_verify_detached(signatureBuffer, signedBuffer, validateKey);
+                sodiumLib.secretbox = (message, nonce, secretKey) => {
+                    let secretBox = Buffer.alloc(message.length + SodiumNative.crypto_box_MACBYTES);
+                    SodiumNative.crypto_secretbox_easy(secretBox, message, nonce, secretKey);
+                    return secretBox;
+                };
+                sodiumLib.secretboxOpen = (secretBox, nonce, secretKey) => {
+                    let msg = Buffer.alloc(secretBox.length - SodiumNative.crypto_secretbox_MACBYTES);
+                    if (SodiumNative.crypto_secretbox_open_easy(msg, secretBox, nonce, secretKey)) {
+                        return msg;
+                    } else {
+                        return void 0;
+                    }
+                };
+                sodiumLib.publicKeyFromSecretKey = secretKey => {
+                    let pk = new Uint8Array(SodiumNative.crypto_sign_PUBLICKEYBYTES);
+                    SodiumNative.crypto_sign_ed25519_sk_to_pk(pk, secretKey);
+                    return pk;
+                };
+                sodiumLib.hash = message => {
+                    let out = Buffer.alloc(SodiumNative.crypto_hash_sha512_BYTES);
+                    SodiumNative.crypto_hash_sha512(out, message);
+                    return out;
+                };
+            } catch (err) {
+                console.error("Error in loading sodium-native: fallback on tweetnacl");
+                return loadSodium("");
+            }
             break;
 
           default:
             NaCl = require$$0$2;
-            exports.sigVerify = NaCl.sign.open;
-            exports.detachedVerify = NaCl.sign.detached.verify;
-            exports.secretbox = NaCl.secretbox;
-            exports.secretboxOpen = (secretBox, nonce, secretKey) => Buffer.from(NaCl.secretbox.open(secretBox, nonce, secretKey));
-            exports.publicKeyFromSecretKey = secretKey => NaCl.sign?.keyPair?.fromSecretKey(secretKey)?.publicKey;
-            exports.hash = msg => Buffer.from(NaCl.hash(msg));
+            sodiumLib.sigVerify = NaCl.sign.open;
+            sodiumLib.detachedVerify = NaCl.sign.detached.verify;
+            sodiumLib.secretbox = NaCl.secretbox;
+            sodiumLib.secretboxOpen = (secretBox, nonce, secretKey) => Buffer.from(NaCl.secretbox.open(secretBox, nonce, secretKey));
+            sodiumLib.publicKeyFromSecretKey = secretKey => NaCl.sign?.keyPair?.fromSecretKey(secretKey)?.publicKey;
+            sodiumLib.hash = msg => Buffer.from(NaCl.hash(msg));
             break;
         }
+        return sodiumLib;
+    };
+    crypto = cryptoLib => {
+        const exports = loadSodium(cryptoLib);
+        exports.decodeBase64 = msg => Buffer.from(msg, "base64");
+        exports.encodeBase64 = msg => Buffer.from(msg).toString("base64");
+        exports.decodeUTF8 = msg => Buffer.from(msg, "utf8");
+        exports.encodeUTF8 = msg => Buffer.from(msg).toString("utf8");
         return exports;
     };
     return crypto;
@@ -4754,13 +4761,13 @@ function require_interface() {
             return;
         }
         const {type: rcvType, idx, challenge: challengeBase64, nonce: nonceBase64} = data;
-        const challenge = new Uint8Array(Buffer.from(challengeBase64, "base64"));
-        const nonce = new Uint8Array(Buffer.from(nonceBase64, "base64"));
+        const challenge = new Uint8Array(Crypto.decodeBase64(challengeBase64));
+        const nonce = new Uint8Array(Crypto.decodeBase64(nonceBase64));
         if (ctx.ChallengesCache[challengeBase64]) {
             other.disconnect();
             return ctx.Log.error("INTERFACE_CHALLENGE_ERROR", "Reused challenge");
         }
-        const msg = Buffer.from(Crypto.secretboxOpen(challenge, nonce, ctx.nodes_key));
+        const msg = Crypto.secretboxOpen(challenge, nonce, ctx.nodes_key);
         if (!msg) {
             other.disconnect();
             return ctx.Log.error("INTERFACE_CHALLENGE_ERROR", "Bad challenge answer");
@@ -4835,13 +4842,13 @@ function require_interface() {
         let uid = Util.guid(ctx.pendingConnections);
         ctx.pendingConnections[uid] = coreId;
         const nonce = NodeCrypto.randomBytes(24);
-        const msg = Buffer.from(`${ctx.myType}:${ctx.myNumber}:${String(Date.now())}`, "utf-8");
-        const challenge = Crypto.secretbox(msg, nonce, ctx.nodes_key).toString("base64");
+        const msg = Crypto.decodeUTF8(`${ctx.myType}:${ctx.myNumber}:${String(Date.now())}`);
+        const challenge = Crypto.encodeBase64(Crypto.secretbox(msg, nonce, ctx.nodes_key));
         createHandlers(ctx, other);
         other.send([ uid, "IDENTITY", {
             type: ctx.myType,
             idx: ctx.myNumber,
-            nonce: nonce.toString("base64"),
+            nonce: Crypto.encodeBase64(nonce),
             challenge
         } ]);
     };

package/build/http.worker.js

@@ -2,6 +2,8 @@
 
 var require$$0$2 = require("express");
 
+var require$$1$2 = require("mime-types");
+
 var node_module = require("node:module");
 
 var require$$1$1 = require("fs-extra");
@@ -16,9 +18,9 @@ var require$$0$1 = require("stream-to-pull-stream");
 
 var require$$1 = require("pull-stream");
 
-var require$$5 = require("http-proxy-middleware");
+var require$$6 = require("http-proxy-middleware");
 
-var require$$7 = require("connect-gzip-static");
+var require$$8 = require("connect-gzip-static");
 
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 
@@ -1004,7 +1006,6 @@ function requireCore() {
         const Util = requireCommonUtil$1();
         const Constants = requireConstants();
         const escapeKeyCharacters = Util.escapeKeyCharacters;
-        __require$2();
         const Crypto = __require();
         const Keys = requireKeys();
         Core.DEFAULT_LIMIT = 50 * 1024 * 1024;
@@ -1124,8 +1125,7 @@ function requireCore() {
             cb();
         };
         Core.getPaths = (mainConfig, isEnv) => {
-            const {index, config} = mainConfig;
-            Constants.paths;
+            const {config} = mainConfig;
             const all = {
                 basePath: config.basePath || config.base || "./data",
                 filePath: config.filePath || "./datastore",
@@ -3529,7 +3529,7 @@ function requireDefaults() {
     return defaults.exports;
 }
 
-var version = "0.0.1";
+var version = "0.0.3";
 
 var require$$2 = {
     version
@@ -4330,14 +4330,16 @@ function requireWorker() {
     if (hasRequiredWorker) return worker$1;
     hasRequiredWorker = 1;
     const Express = require$$0$2;
+    const Mime = require$$1$2;
     const Http = require("node:http");
+    const Https = require("node:https");
     const Path = __require$2();
     const Fs = __require$1();
     const Logger = requireLogger();
     const Util = requireCommonUtil$1();
-    const {createProxyMiddleware} = require$$5;
+    const {createProxyMiddleware} = require$$6;
     const Default = requireDefaults();
-    const gzipStatic = require$$7;
+    const gzipStatic = require$$8;
     const Environment = requireEnv();
     const {setHeaders} = requireHeaders();
     const COMMANDS = {};
@@ -4350,9 +4352,7 @@ function requireWorker() {
         warn: () => {},
         info: () => {}
     };
-    Express.static.mime.define({
-        "application/wasm": [ "wasm" ]
-    });
+    Mime.lookup("wasm");
     const initFeedback = (Env, app) => {
         if (!Env.logFeedback) {
             return;
@@ -4422,6 +4422,28 @@ function requireWorker() {
         app.use("/cryptpad_websocket", wsProxy);
         app.use("/extensions.js", httpProxy);
         app.use("/api", httpProxy);
+        const checkAllStores = (req, res) => {
+            setHeaders(Env, req, res);
+            const promiseResponses = storageList.map(baseUrl => new Promise((res, rej) => {
+                const protocol = new URL(baseUrl).protocol;
+                if (![ "http:", "https:" ].includes(protocol)) {
+                    return rej();
+                }
+                const H = protocol === "http:" ? Http : Https;
+                H.get(new URL(req.url, baseUrl), {
+                    method: "HEAD"
+                }, resp => {
+                    const {statusCode} = resp;
+                    if (statusCode !== 200) {
+                        return rej();
+                    }
+                    res();
+                });
+            }));
+            Promise.all(promiseResponses).then(() => res.status(200).send("PLACEHOLDER")).catch(() => res.status(404).end());
+        };
+        app.get("/blob/placeholder.txt", checkAllStores);
+        app.get("/block/placeholder.txt", checkAllStores);
         const storeProxy = createProxyMiddleware({
             router: req => {
                 const split = req.url.split("/");

package/build/storage.cluster.js

@@ -18,8 +18,6 @@ var require$$1$1 = require("pull-stream");
 
 var require$$0$2 = require("tweetnacl/nacl-fast");
 
-var require$$11 = require("body-parser");
-
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 
 function getDefaultExportFromCjs(x) {
@@ -981,7 +979,6 @@ function requireCore() {
         const Util = requireCommonUtil$1();
         const Constants = requireConstants();
         const escapeKeyCharacters = Util.escapeKeyCharacters;
-        __require$2();
         const Crypto = __require$1();
         const Keys = requireKeys();
         Core.DEFAULT_LIMIT = 50 * 1024 * 1024;
@@ -1101,8 +1098,7 @@ function requireCore() {
             cb();
         };
         Core.getPaths = (mainConfig, isEnv) => {
-            const {index, config} = mainConfig;
-            Constants.paths;
+            const {config} = mainConfig;
             const all = {
                 basePath: config.basePath || config.base || "./data",
                 filePath: config.filePath || "./datastore",
@@ -1425,6 +1421,27 @@ function requireBlock$1() {
                 }, cb);
             });
         };
+        Block.rootPlaceholderCreate = (Env, _cb) => {
+            const cb = Util.once(Util.mkAsync(_cb));
+            nThen(w => {
+                Fse.mkdirp(Env.paths.block, w(err => {
+                    if (err) {
+                        Env.Log.error("BLOCK_FOLDER_CREATE_FAILED", err);
+                        w.abort();
+                        return cb(err);
+                    }
+                }));
+            }).nThen(w => {
+                const fullPath = Path.join(Env.paths.block, "placeholder.txt");
+                Fs.writeFile(fullPath, "PLACEHOLDER\n", w(err => {
+                    if (err) {
+                        Env.Log.error("BLOCK_PLACEHOLDER_CREATE_FAILED", err);
+                        w.abort();
+                        return cb(err);
+                    }
+                }));
+            }).nThen(() => cb());
+        };
     })(block$1);
     return block$1.exports;
 }
@@ -2528,60 +2545,69 @@ var hasRequiredCrypto;
 function requireCrypto() {
     if (hasRequiredCrypto) return crypto;
     hasRequiredCrypto = 1;
-    crypto = cryptoLib => {
-        let exports = {};
-        exports.decodeBase64 = msg => Buffer.from(msg, "base64");
-        exports.encodeBase64 = msg => Buffer.from(msg).toString("base64");
-        exports.decodeUTF8 = msg => Buffer.from(msg, "utf8");
-        exports.encodeUTF8 = msg => Buffer.from(msg).toString("utf8");
+    const loadSodium = cryptoLib => {
+        let sodiumLib = {};
         let SodiumNative, NaCl;
         switch (cryptoLib) {
           case "sodiumnative":
-            SodiumNative = require("sodium-native");
-            exports.sigVerify = (signedMessage, validateKey) => {
-                let msg = signedMessage.subarray(64);
-                let ok = SodiumNative.crypto_sign_open(msg, signedMessage, validateKey);
-                if (!ok) {
-                    return false;
-                }
-                return msg;
-            };
-            exports.detachedVerify = (signedBuffer, signatureBuffer, validateKey) => SodiumNative.crypto_sign_verify_detached(signatureBuffer, signedBuffer, validateKey);
-            exports.secretbox = (message, nonce, secretKey) => {
-                let secretBox = Buffer.alloc(message.length + SodiumNative.crypto_box_MACBYTES);
-                SodiumNative.crypto_secretbox_easy(secretBox, message, nonce, secretKey);
-                return secretBox;
-            };
-            exports.secretboxOpen = (secretBox, nonce, secretKey) => {
-                let msg = Buffer.alloc(secretBox.length - SodiumNative.crypto_secretbox_MACBYTES);
-                if (SodiumNative.crypto_secretbox_open_easy(msg, secretBox, nonce, secretKey)) {
+            try {
+                SodiumNative = require("sodium-native");
+                sodiumLib.sigVerify = (signedMessage, validateKey) => {
+                    let msg = signedMessage.subarray(64);
+                    let ok = SodiumNative.crypto_sign_open(msg, signedMessage, validateKey);
+                    if (!ok) {
+                        return false;
+                    }
                     return msg;
-                } else {
-                    return void 0;
-                }
-            };
-            exports.publicKeyFromSecretKey = secretKey => {
-                let pk = new Uint8Array(SodiumNative.crypto_sign_PUBLICKEYBYTES);
-                SodiumNative.crypto_sign_ed25519_sk_to_pk(pk, secretKey);
-                return pk;
-            };
-            exports.hash = message => {
-                let out = Buffer.alloc(SodiumNative.crypto_hash_sha512_BYTES);
-                SodiumNative.crypto_hash_sha512(out, message);
-                return out;
-            };
+                };
+                sodiumLib.detachedVerify = (signedBuffer, signatureBuffer, validateKey) => SodiumNative.crypto_sign_verify_detached(signatureBuffer, signedBuffer, validateKey);
+                sodiumLib.secretbox = (message, nonce, secretKey) => {
+                    let secretBox = Buffer.alloc(message.length + SodiumNative.crypto_box_MACBYTES);
+                    SodiumNative.crypto_secretbox_easy(secretBox, message, nonce, secretKey);
+                    return secretBox;
+                };
+                sodiumLib.secretboxOpen = (secretBox, nonce, secretKey) => {
+                    let msg = Buffer.alloc(secretBox.length - SodiumNative.crypto_secretbox_MACBYTES);
+                    if (SodiumNative.crypto_secretbox_open_easy(msg, secretBox, nonce, secretKey)) {
+                        return msg;
+                    } else {
+                        return void 0;
+                    }
+                };
+                sodiumLib.publicKeyFromSecretKey = secretKey => {
+                    let pk = new Uint8Array(SodiumNative.crypto_sign_PUBLICKEYBYTES);
+                    SodiumNative.crypto_sign_ed25519_sk_to_pk(pk, secretKey);
+                    return pk;
+                };
+                sodiumLib.hash = message => {
+                    let out = Buffer.alloc(SodiumNative.crypto_hash_sha512_BYTES);
+                    SodiumNative.crypto_hash_sha512(out, message);
+                    return out;
+                };
+            } catch (err) {
+                console.error("Error in loading sodium-native: fallback on tweetnacl");
+                return loadSodium("");
+            }
             break;
 
           default:
             NaCl = require$$0$2;
-            exports.sigVerify = NaCl.sign.open;
-            exports.detachedVerify = NaCl.sign.detached.verify;
-            exports.secretbox = NaCl.secretbox;
-            exports.secretboxOpen = (secretBox, nonce, secretKey) => Buffer.from(NaCl.secretbox.open(secretBox, nonce, secretKey));
-            exports.publicKeyFromSecretKey = secretKey => NaCl.sign?.keyPair?.fromSecretKey(secretKey)?.publicKey;
-            exports.hash = msg => Buffer.from(NaCl.hash(msg));
+            sodiumLib.sigVerify = NaCl.sign.open;
+            sodiumLib.detachedVerify = NaCl.sign.detached.verify;
+            sodiumLib.secretbox = NaCl.secretbox;
+            sodiumLib.secretboxOpen = (secretBox, nonce, secretKey) => Buffer.from(NaCl.secretbox.open(secretBox, nonce, secretKey));
+            sodiumLib.publicKeyFromSecretKey = secretKey => NaCl.sign?.keyPair?.fromSecretKey(secretKey)?.publicKey;
+            sodiumLib.hash = msg => Buffer.from(NaCl.hash(msg));
             break;
         }
+        return sodiumLib;
+    };
+    crypto = cryptoLib => {
+        const exports = loadSodium(cryptoLib);
+        exports.decodeBase64 = msg => Buffer.from(msg, "base64");
+        exports.encodeBase64 = msg => Buffer.from(msg).toString("base64");
+        exports.decodeUTF8 = msg => Buffer.from(msg, "utf8");
+        exports.encodeUTF8 = msg => Buffer.from(msg).toString("utf8");
         return exports;
     };
     return crypto;
@@ -2853,7 +2879,7 @@ function requireMfa() {
     return mfa.exports;
 }
 
-var version = "0.0.1";
+var version = "0.0.3";
 
 var require$$2 = {
     version
@@ -7973,7 +7999,6 @@ function requireCluster() {
     const Util = requireCommonUtil$1();
     const MFA = requireMfa();
     const Sessions = requireSessions();
-    const bodyParser = require$$11;
     const Fs = __require();
     const Environment = requireEnv();
     const Logger = requireLogger();
@@ -8008,7 +8033,7 @@ function requireCluster() {
         Env.Log.error("WORKER__" + errLabel, info);
     });
     const initServerHandlers = (Env, app) => {
-        app.use(bodyParser.urlencoded({
+        app.use(Express.urlencoded({
             extended: true
         }));
         app.use("/blob", function(req, res, next) {
@@ -8235,7 +8260,7 @@ function requireCluster() {
                 res.statusCode = 204;
                 return void res.end();
             }
-            const {chunk, sig, edPublic} = req.body;
+            const {chunk, sig, edPublic} = req.body || {};
             const forbidden = reason => void res.status(403).send({
                 error: reason
             });