@lordbex/thelounge 4.4.3-blowfish → 4.4.4-blowfish

package/README.md

@@ -17,7 +17,7 @@
 		•
 		<a href="https://demo.thelounge.chat/">Demo</a>
     •
-		<a href="https://github.com/thelounge/thelounge-docker">Docker</a>
+		<a href="https://github.com/LordBex/thelounge-docker">Docker</a>
 	</strong>
 </p>
 <p align="center">
@@ -27,15 +27,39 @@
 	<a href="https://yarn.pm/thelounge"><img
 		alt="npm version"
 		src="https://img.shields.io/npm/v/thelounge.svg?colorA=333a41&maxAge=3600"></a>
-	<a href="https://github.com/thelounge/thelounge/actions"><img
+	<a href="https://github.com/LordBex/thelounge/actions"><img
 		alt="Build Status"
-		src="https://github.com/thelounge/thelounge/workflows/Build/badge.svg"></a>
+		src="https://github.com/LordBex/thelounge/workflows/Build/badge.svg"></a>
 </p>
 
 <p align="center">
 	<img src="https://raw.githubusercontent.com/thelounge/thelounge.github.io/master/img/thelounge-screenshot.png" width="550">
 </p>
 
+## 🔐 FiSH Blowfish Fork
+
+**This is a fork of The Lounge with integrated FiSH Blowfish encryption support.**
+
+This enhanced version adds IRC message encryption capabilities using the FiSH (Blowfish) encryption protocol, compatible with popular IRC clients like HexChat, mIRC, and others.
+
+### FiSH Features
+
+- **Per-channel encryption** - Set individual encryption keys for each channel or query
+- **Global encryption key** - Apply a default key across all channels
+- **Automatic encryption/decryption** - Seamlessly encrypts outgoing and decrypts incoming messages
+- **mIRC compatibility** - Full compatibility with standard FiSH implementations
+- **Easy key management** - Simple `/blow` commands for setting and clearing keys
+
+### Usage
+
+```
+/blow <key>          # Set encryption key for current channel
+/blow off            # Disable encryption for current channel
+/blow                # Show current encryption status
+```
+
+Keys can also be configured via the network settings in the web interface.
+
 ## Overview
 
 - **Modern features brought to IRC.** Push notifications, link previews, new message markers, and more bring IRC to the 21st century.
@@ -63,7 +87,7 @@ Please refer to the [install and upgrade documentation on our website](https://t
 The following commands install and run the development version of The Lounge:
 
 ```sh
-git clone https://github.com/thelounge/thelounge.git
+git clone https://github.com/yourusername/thelounge.git
 cd thelounge
 yarn install
 NODE_ENV=production yarn build
@@ -82,7 +106,7 @@ fork.
 
 Before submitting any change, make sure to:
 
-- Read the [Contributing instructions](https://github.com/thelounge/thelounge/blob/master/.github/CONTRIBUTING.md#contributing)
+- Read the [Contributing instructions](https://github.com/LordBex/thelounge/blob/master/.github/CONTRIBUTING.md#contributing)
 - Run `yarn test` to execute linters and the test suite
   - Run `yarn format:prettier` if linting fails
 - Run `yarn build:client` if you change or add anything in `client/js` or `client/components`

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@lordbex/thelounge",
     "description": "The self-hosted Web IRC client",
-    "version": "4.4.3-blowfish",
+    "version": "4.4.4-blowfish",
     "preferGlobal": true,
     "bin": {
         "thelounge": "index.js"
@@ -170,5 +170,6 @@
         "webpack-cli": "4.9.2",
         "webpack-dev-middleware": "5.3.4",
         "webpack-hot-middleware": "2.25.4"
-    }
+    },
+    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

package/dist/server/clientManager.js

@@ -64,24 +64,23 @@ class ClientManager {
         }
     }
     autoloadUsers() {
-        fs_1.default.watch(config_1.default.getUsersPath(), lodash_1.default.debounce(() => {
-            const loaded = this.clients.map((c) => c.name);
-            const updatedUsers = this.getUsers();
-            if (updatedUsers.length === 0) {
-                log_1.default.info(`There are currently no users. Create one with ${chalk_1.default.bold("thelounge add <name>")}.`);
+        fs_1.default.watch(config_1.default.getUsersPath(), (_eventType, file) => {
+            if (!file.endsWith(".json")) {
+                return;
             }
-            // Reload all users. Existing users will only have their passwords reloaded.
-            updatedUsers.forEach((name) => this.loadUser(name));
-            // Existing users removed since last time users were loaded
-            lodash_1.default.difference(loaded, updatedUsers).forEach((name) => {
-                const client = lodash_1.default.find(this.clients, { name });
-                if (client) {
-                    client.quit(true);
-                    this.clients = lodash_1.default.without(this.clients, client);
-                    log_1.default.info(`User ${chalk_1.default.bold(name)} disconnected and removed.`);
-                }
-            });
-        }, 1000, { maxWait: 10000 }));
+            const name = file.slice(0, -5);
+            const userPath = config_1.default.getUserConfigPath(name);
+            if (fs_1.default.existsSync(userPath)) {
+                this.loadUser(name);
+                return;
+            }
+            const client = lodash_1.default.find(this.clients, { name });
+            if (client) {
+                client.quit(true);
+                this.clients = lodash_1.default.without(this.clients, client);
+                log_1.default.info(`User ${chalk_1.default.bold(name)} disconnected and removed.`);
+            }
+        });
     }
     loadUser(name) {
         const userConfig = this.readUserConfig(name);
@@ -132,9 +131,11 @@ class ClientManager {
             log: enableLog,
         };
         try {
-            fs_1.default.writeFileSync(userPath, JSON.stringify(user, null, "\t"), {
+            const tmpPath = userPath + ".tmp";
+            fs_1.default.writeFileSync(tmpPath, JSON.stringify(user, null, "\t"), {
                 mode: 0o600,
             });
+            fs_1.default.renameSync(tmpPath, userPath);
         }
         catch (e) {
             log_1.default.error(`Failed to create user ${chalk_1.default.green(name)} (${e})`);

package/dist/server/identification.js

@@ -108,7 +108,7 @@ class Identification {
                 // Race condition: this can happen when more than one socket gets disconnected at
                 // once, since we `refresh()` for each one being added/removed. This results
                 // in there possibly being one or more disconnected sockets remaining when we get here.
-                log_1.default.warn(`oidentd: socket has no remote or local port (id=${id}). See https://github.com/thelounge/thelounge/pull/4695.`);
+                log_1.default.warn(`oidentd: socket has no remote or local port (id=${id}). See https://github.com/lordbex/thelounge/pull/4695.`);
                 return;
             }
             if (!connection.socket.remoteAddress) {

package/dist/server/models/network.js

@@ -222,7 +222,10 @@ class Network {
         }
         if (!this.sasl) {
             delete this.irc.options.sasl_mechanism;
-            delete this.irc.options.account;
+            // irc-framework has a funny fallback where it uses nick + server pw
+            // in the sasl handshake, if account is undefined, so we need an empty
+            // object here to really turn it off
+            this.irc.options.account = {};
         }
         else if (this.sasl === "external") {
             this.irc.options.sasl_mechanism = "EXTERNAL";
@@ -309,25 +312,19 @@ class Network {
         if (Object.prototype.hasOwnProperty.call(args, "fishGlobalKey")) {
             this.fishGlobalKey = String(args.fishGlobalKey || "").trim();
         }
-        if (Object.prototype.hasOwnProperty.call(args, "fishKeysText")) {
-            const fishKeysText = String(args.fishKeysText || "").replace(/\r\n|\r|\n/g, "\n");
+        // FiSH: read per-target keys (only update when provided)
+        if (Object.prototype.hasOwnProperty.call(args, "fishKeys")) {
+            const value = args.fishKeys;
             const map = {};
-            fishKeysText.split("\n").forEach((line) => {
-                const trimmed = line.trim();
-                if (!trimmed) {
-                    return;
-                }
-                const spaceIdx = trimmed.indexOf(" ");
-                if (spaceIdx === -1) {
-                    return;
-                }
-                const name = trimmed.substring(0, spaceIdx).toLowerCase();
-                const key = trimmed.substring(spaceIdx + 1).trim();
-                if (!name || !key) {
-                    return;
+            if (value && typeof value === "object") {
+                for (const [rawName, rawKey] of Object.entries(value)) {
+                    const name = String(rawName).trim().toLowerCase();
+                    const key = String(rawKey ?? "").trim();
+                    if (name && key) {
+                        map[name] = key;
+                    }
                 }
-                map[name] = key;
-            });
+            }
             this.fishKeys = map;
         }
         // Sync lobby channel name
@@ -482,8 +479,7 @@ class Network {
         data.hasSTSPolicy = !!sts_1.default.get(this.host);
         // Include FiSH fields for editing UI
         data.fishGlobalKey = this.fishGlobalKey || "";
-        const lines = Object.entries(this.fishKeys || {}).map(([name, key]) => `${name} ${key}`);
-        data.fishKeysText = lines.join("\n");
+        data.fishKeys = { ...(this.fishKeys || {}) };
         return data;
     }
     export() {

package/dist/server/plugins/changelog.js

@@ -32,7 +32,7 @@ async function fetch() {
         return versions;
     }
     try {
-        const response = await (0, got_1.default)("https://api.github.com/repos/thelounge/thelounge/releases", {
+        const response = await (0, got_1.default)("https://api.github.com/repos/lordbex/thelounge/releases", {
             headers: {
                 Accept: "application/vnd.github.v3.html", // Request rendered markdown
                 "User-Agent": package_json_1.default.name + "; +" + package_json_1.default.repository.url, // Identify the client

package/dist/server/plugins/inputs/action.js

@@ -29,7 +29,7 @@ const input = function ({ irc }, chan, cmd, args) {
             // If FiSH key is set, encrypt CTCP ACTION and send as normal PRIVMSG with +OK
             if (chan.blowfishKey) {
                 const ctcp = "\x01ACTION " + text + "\x01";
-                const toSend = "+OK " + (0, fish_1.fishEncryptPayload)(ctcp, chan.blowfishKey);
+                const toSend = (0, fish_1.createFishMessage)(ctcp, chan.blowfishKey);
                 irc.say(chan.name, toSend);
             }
             else {

package/dist/server/plugins/inputs/msg.js

@@ -74,7 +74,7 @@ const input = function (network, chan, cmd, args) {
     // Determine if we should encrypt using FiSH for this target
     const targetChan = network.getChannel(targetName) || (chan.name === targetName ? chan : undefined);
     const key = targetChan?.blowfishKey;
-    const toSend = key ? "+OK " + (0, fish_1.fishEncryptPayload)(msg, key) : msg;
+    const toSend = key ? (0, fish_1.createFishMessage)(msg, key) : msg;
     network.irc.say(targetName, toSend);
     // If the IRCd does not support echo-message, simulate the message
     // being sent back to us. Emit the same text we sent (encrypted or plain)

package/dist/server/plugins/inputs/notice.js

@@ -11,7 +11,7 @@ const input = function (network, chan, cmd, args) {
     // Encrypt if a FiSH key is set for the target channel/query
     const targetChan = network.getChannel(targetName) || (chan.name === targetName ? chan : undefined);
     const key = targetChan?.blowfishKey;
-    const toSend = key ? "+OK " + (0, fish_1.fishEncryptPayload)(message, key) : message;
+    const toSend = key ? (0, fish_1.createFishMessage)(message, key) : message;
     network.irc.notice(targetName, toSend);
     // If the IRCd does not support echo-message, simulate the message
     // being sent back to us.

package/dist/server/plugins/irc-events/link.js

@@ -65,23 +65,57 @@ function default_1(client, chan, msg, cleanText) {
             shown: null,
         };
         cleanLinks.push(preview);
-        fetch(url, {
-            accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-            language: client.config.browser?.language || "",
-        })
-            .then((res) => {
-            parse(msg, chan, preview, res, client);
-        })
-            .catch((err) => {
-            preview.type = "error";
-            preview.error = "message";
-            preview.message = err.message;
-            emitPreview(client, chan, msg, preview);
-        });
+        const urlObj = new url_1.URL(url);
+        if ((urlObj.hostname.endsWith("youtube.com") && urlObj.pathname.includes("watch")) ||
+            urlObj.hostname.endsWith("youtu.be")) {
+            fetchYoutube(url, msg, chan, preview, client);
+        }
+        else {
+            fetchUrl(url, msg, chan, preview, client);
+        }
         return cleanLinks;
     }, []);
 }
 exports.default = default_1;
+function fetchUrl(url, msg, chan, preview, client) {
+    fetch(url, {
+        accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+        language: client.config.browser?.language || "",
+    })
+        .then((res) => {
+        parse(msg, chan, preview, res, client);
+    })
+        .catch((err) => {
+        preview.type = "error";
+        preview.error = "message";
+        preview.message = err.message;
+        emitPreview(client, chan, msg, preview);
+    });
+}
+function fetchYoutube(url, msg, chan, preview, client) {
+    const api_url = `https://www.youtube.com/oembed?url=${encodeURIComponent(url)}&format=json`;
+    fetch(api_url, {
+        accept: "application/json",
+        language: client.config.browser?.language || "",
+    })
+        .then((res) => {
+        const data = JSON.parse(res.data.toString());
+        let author = data.author_name || "";
+        author = author ? ` ~ ${author}` : "";
+        preview.type = "link";
+        preview.link = url;
+        preview.thumbActualUrl = data.thumbnail_url || "";
+        preview.head = data.title || "";
+        preview.body = author;
+        handlePreview(client, chan, msg, preview, res);
+    })
+        .catch((err) => {
+        preview.type = "error";
+        preview.error = "message";
+        preview.message = err.message;
+        emitPreview(client, chan, msg, preview);
+    });
+}
 function parseHtml(preview, res, client) {
     // TODO:
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
@@ -330,7 +364,7 @@ function getRequestHeaders(headers) {
     const formattedHeaders = {
         // Certain websites like Amazon only add <meta> tags to known bots,
         // lets pretend to be them to get the metadata
-        "User-Agent": "Mozilla/5.0 (compatible; The Lounge IRC Client; +https://github.com/thelounge/thelounge)" +
+        "User-Agent": "Mozilla/5.0 (compatible; The Lounge IRC Client; +https://github.com/lordbex/thelounge)" +
             " facebookexternalhit/1.1 Twitterbot/1.0",
         Accept: headers.accept || "*/*",
         "X-Purpose": "preview",

package/dist/server/plugins/webpush.js

@@ -69,7 +69,7 @@ class WebPush {
             });
             log_1.default.info("New VAPID key pair has been generated for use with push subscription.");
         }
-        web_push_1.default.setVapidDetails("https://github.com/thelounge/thelounge", this.vapidKeys.publicKey, this.vapidKeys.privateKey);
+        web_push_1.default.setVapidDetails("https://github.com/lordbex/thelounge", this.vapidKeys.publicKey, this.vapidKeys.privateKey);
     }
     push(client, payload, onlyToOffline) {
         lodash_1.default.forOwn(client.config.sessions, ({ pushSubscription }, token) => {