+
{{#if unread}}{{roundBadgeNumber unread}}{{/if}}
{{name}}
diff --git a/client/views/chat.tpl b/client/views/chat.tpl
index 9ccb6391..35ebce8c 100644
--- a/client/views/chat.tpl
+++ b/client/views/chat.tpl
@@ -13,14 +13,20 @@
-
- Show older messages
-
+ Show older messages
+ {{#equal type "channel"}}
+ {{/equal}}
-
+
diff --git a/client/views/image_viewer.tpl b/client/views/image_viewer.tpl
new file mode 100644
index 00000000..aa6f8409
--- /dev/null
+++ b/client/views/image_viewer.tpl
@@ -0,0 +1,21 @@
+
+
+{{#if hasPreviousImage}}
+
+{{/if}}
+
+{{#if hasNextImage}}
+
+{{/if}}
+
+
+
+
+
+ {{#equal type "image"}}
+ Open image
+ {{else}}
+ Visit page
+ {{/equal}}
+
diff --git a/client/views/index.js b/client/views/index.js
index 2890dea9..aae3c78b 100644
--- a/client/views/index.js
+++ b/client/views/index.js
@@ -1,6 +1,9 @@
+"use strict";
+
module.exports = {
actions: {
action: require("./actions/action.tpl"),
+ ban_list: require("./actions/ban_list.tpl"),
channel_list: require("./actions/channel_list.tpl"),
ctcp: require("./actions/ctcp.tpl"),
invite: require("./actions/invite.tpl"),
@@ -22,9 +25,15 @@ module.exports = {
date_marker: require("./date-marker.tpl"),
msg: require("./msg.tpl"),
msg_action: require("./msg_action.tpl"),
+ msg_condensed_toggle: require("./msg_condensed_toggle.tpl"),
+ msg_condensed: require("./msg_condensed.tpl"),
+ msg_preview: require("./msg_preview.tpl"),
+ msg_preview_toggle: require("./msg_preview_toggle.tpl"),
msg_unhandled: require("./msg_unhandled.tpl"),
network: require("./network.tpl"),
- toggle: require("./toggle.tpl"),
+ image_viewer: require("./image_viewer.tpl"),
unread_marker: require("./unread_marker.tpl"),
user: require("./user.tpl"),
+ user_filtered: require("./user_filtered.tpl"),
+ user_name: require("./user_name.tpl"),
};
diff --git a/client/views/msg.tpl b/client/views/msg.tpl
index 72811106..9b5b13f2 100644
--- a/client/views/msg.tpl
+++ b/client/views/msg.tpl
@@ -1,23 +1,17 @@
-
-
+
+
{{tz time}}
{{#if from}}
- {{mode}}{{from}}
+ {{> user_name nick=from}}
{{/if}}
- {{#equal type "toggle"}}
-
-
- ···
-
- {{#if toggle}}
- {{> toggle}}
- {{/if}}
-
- {{else}}
+
{{{parse text}}}
- {{/equal}}
+
+ {{#each previews}}
+
+ {{/each}}
-
+
+
{{tz time}}
diff --git a/client/views/msg_condensed.tpl b/client/views/msg_condensed.tpl
new file mode 100644
index 00000000..e2becd66
--- /dev/null
+++ b/client/views/msg_condensed.tpl
@@ -0,0 +1,7 @@
+
+ {{tz time}}
+
+
+
diff --git a/client/views/msg_condensed_toggle.tpl b/client/views/msg_condensed_toggle.tpl
new file mode 100644
index 00000000..2c740773
--- /dev/null
+++ b/client/views/msg_condensed_toggle.tpl
@@ -0,0 +1 @@
+
+ {{#equal type "image"}}
+
+
+ {{else}}
+ {{#if thumb}}
+
+
+ {{/if}}
+
+ {{head}}
+ {{body}}
+
+ {{/equal}}
+
-
+
+
{{tz time}}
[{{command}}]
-
+
{{#each params}}
{{this}}
{{/each}}
diff --git a/client/views/network.tpl b/client/views/network.tpl
index 9da98019..05885d47 100644
--- a/client/views/network.tpl
+++ b/client/views/network.tpl
@@ -1,5 +1,5 @@
{{#each networks}}
-
+
{{/each}}
diff --git a/client/views/toggle.tpl b/client/views/toggle.tpl
deleted file mode 100644
index 1c51c5f5..00000000
--- a/client/views/toggle.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{#toggle}}
-
-{{/toggle}}
diff --git a/client/views/user.tpl b/client/views/user.tpl
index 23a3a9f0..7779601a 100644
--- a/client/views/user.tpl
+++ b/client/views/user.tpl
@@ -1,18 +1,11 @@
-{{#if users.length}}
-
-
-{{/if}}
-
- {{#diff "reset"}}{{/diff}}
- {{#each users}}
- {{#diff mode}}
- {{#unless @first}}
-
- {{/unless}}
-
- {{/diff}}
- {{mode}}{{name}}
- {{/each}}
-
+{{#diff "reset"}}{{/diff}}
+{{#each users}}
+ {{#diff mode}}
+ {{#unless @first}}
+
+ {{/diff}}
+ {{> user_name}}
+{{/each}}
diff --git a/client/views/user_filtered.tpl b/client/views/user_filtered.tpl
new file mode 100644
index 00000000..c684e3a2
--- /dev/null
+++ b/client/views/user_filtered.tpl
@@ -0,0 +1,5 @@
+
+{{#each matches}}
+ {{{string}}}
+{{/each}}
+
diff --git a/client/views/user_name.tpl b/client/views/user_name.tpl
new file mode 100644
index 00000000..e24850df
--- /dev/null
+++ b/client/views/user_name.tpl
@@ -0,0 +1 @@
+{{mode}}{{nick}}
diff --git a/defaults/config.js b/defaults/config.js
index 742449f7..eeb02ea5 100644
--- a/defaults/config.js
+++ b/defaults/config.js
@@ -8,9 +8,9 @@ module.exports = {
// Set to 'false' to enable users.
//
// @type boolean
- // @default true
+ // @default false
//
- public: true,
+ public: false,
//
// IP address or hostname for the web server to listen on.
@@ -66,11 +66,28 @@ module.exports = {
//
prefetch: false,
+ //
+ // Store and proxy prefetched images and thumbnails.
+ // This improves security and privacy by not exposing client IP address,
+ // and always loading images from The Lounge instance and making all assets secure,
+ // which in result fixes mixed content warnings.
+ //
+ // If storage is enabled, The Lounge will fetch and store images and thumbnails
+ // in the `${LOUNGE_HOME}/storage` folder.
+ //
+ // Images are deleted when they are no longer referenced by any message (controlled by maxHistory),
+ // and the folder is cleaned up on every The Lounge restart.
+ //
+ // @type boolean
+ // @default false
+ //
+ prefetchStorage: false,
+
//
// Prefetch URLs Image Preview size limit
//
// If prefetch is enabled, The Lounge will only display content under the maximum size.
- // Default value is 512 (in kB)
+ // Specified value is in kilobytes. Default value is 512 kilobytes.
//
// @type int
// @default 512
@@ -287,9 +304,26 @@ module.exports = {
// @example "sslcert/key-cert.pem"
// @default ""
//
- certificate: ""
+ certificate: "",
+
+ //
+ // Path to the CA bundle.
+ //
+ // @type string
+ // @example "sslcert/bundle.pem"
+ // @default ""
+ //
+ ca: ""
},
+ //
+ // Default quit and part message if none is provided.
+ //
+ // @type string
+ // @default "The Lounge - https://thelounge.github.io"
+ //
+ leaveMessage: "The Lounge - https://thelounge.github.io",
+
//
// Run The Lounge with identd support.
//
diff --git a/package.json b/package.json
index ce8a9b98..cabf7a65 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "thelounge",
"description": "The self-hosted Web IRC client",
- "version": "2.2.2",
+ "version": "2.4.0",
"preferGlobal": true,
"bin": {
"lounge": "index.js"
@@ -17,7 +17,7 @@
"start-dev": "npm-run-all --parallel watch start",
"build": "npm-run-all build:*",
"build:font-awesome": "node scripts/build-fontawesome.js",
- "build:webpack": "webpack",
+ "build:webpack": "webpack --progress",
"watch": "webpack --watch",
"test": "npm-run-all -c test:* lint",
"test:mocha": "mocha",
@@ -40,41 +40,48 @@
"node": ">=4.2.0"
},
"dependencies": {
- "bcrypt-nodejs": "0.0.3",
+ "bcryptjs": "2.4.3",
"cheerio": "0.22.0",
"colors": "1.1.2",
- "commander": "2.9.0",
+ "commander": "2.11.0",
"event-stream": "3.3.4",
- "express": "4.15.2",
- "fs-extra": "2.0.0",
- "irc-framework": "2.6.1",
+ "express": "4.15.4",
+ "express-handlebars": "3.0.0",
+ "fs-extra": "4.0.1",
+ "irc-framework": "2.9.1",
"ldapjs": "1.0.1",
"lodash": "4.17.4",
- "moment": "2.17.1",
+ "moment": "2.18.1",
"read": "1.0.7",
"request": "2.81.0",
- "semver": "5.3.0",
- "socket.io": "1.7.3",
- "spdy": "3.4.4"
+ "semver": "5.4.1",
+ "socket.io": "1.7.4",
+ "spdy": "3.4.7",
+ "ua-parser-js": "0.7.14",
+ "urijs": "1.18.12",
+ "web-push": "3.2.2"
},
"devDependencies": {
- "babel-core": "6.23.1",
- "babel-loader": "6.4.0",
- "babel-preset-es2015": "6.22.0",
- "chai": "3.5.0",
- "eslint": "3.17.1",
+ "babel-core": "6.26.0",
+ "babel-loader": "7.1.2",
+ "babel-preset-env": "1.6.0",
+ "chai": "4.1.1",
+ "emoji-regex": "6.5.1",
+ "eslint": "4.5.0",
"font-awesome": "4.7.0",
- "handlebars": "4.0.6",
- "handlebars-loader": "1.4.0",
- "jquery": "3.1.1",
+ "fuzzy": "0.1.3",
+ "handlebars": "4.0.10",
+ "handlebars-loader": "1.5.0",
+ "jquery": "3.2.1",
+ "jquery-textcomplete": "1.8.2",
"jquery-ui": "1.12.1",
- "mocha": "3.2.0",
- "mousetrap": "1.6.0",
- "npm-run-all": "4.0.2",
- "nyc": "10.1.2",
- "socket.io-client": "1.7.3",
- "stylelint": "7.9.0",
- "urijs": "1.18.9",
- "webpack": "2.2.1"
+ "mocha": "3.5.0",
+ "mousetrap": "1.6.1",
+ "npm-run-all": "4.1.1",
+ "nyc": "11.1.0",
+ "socket.io-client": "1.7.4",
+ "stylelint": "8.0.0",
+ "stylelint-config-standard": "17.0.0",
+ "webpack": "3.5.5"
}
}
diff --git a/scripts/noop.js b/scripts/noop.js
new file mode 100644
index 00000000..bf1c83cb
--- /dev/null
+++ b/scripts/noop.js
@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = function() {
+ return function() {};
+};
diff --git a/scripts/run-pr.sh b/scripts/run-pr.sh
index e8e65c5d..de020c75 100755
--- a/scripts/run-pr.sh
+++ b/scripts/run-pr.sh
@@ -9,7 +9,8 @@ fi
git fetch https://github.com/thelounge/lounge.git refs/pull/${1}/head
git checkout FETCH_HEAD
+git rebase master
npm install
-npm run build
+NODE_ENV=production npm run build
npm test || true
npm start
diff --git a/src/client.js b/src/client.js
index b7e1b3ef..ef3f5ce2 100644
--- a/src/client.js
+++ b/src/client.js
@@ -10,6 +10,7 @@ var Msg = require("./models/msg");
var Network = require("./models/network");
var ircFramework = require("irc-framework");
var Helper = require("./helper");
+const UAParser = require("ua-parser-js");
module.exports = Client;
@@ -17,6 +18,7 @@ var id = 0;
var events = [
"connection",
"unhandled",
+ "banlist",
"ctcp",
"error",
"invite",
@@ -35,6 +37,7 @@ var events = [
"whois"
];
var inputs = [
+ "ban",
"ctcp",
"msg",
"part",
@@ -56,7 +59,7 @@ var inputs = [
].reduce(function(plugins, name) {
var path = "./plugins/inputs/" + name;
var plugin = require(path);
- plugin.commands.forEach(command => plugins[command] = plugin);
+ plugin.commands.forEach((command) => plugins[command] = plugin);
return plugins;
}, {});
@@ -64,7 +67,9 @@ function Client(manager, name, config) {
if (typeof config !== "object") {
config = {};
}
+
_.merge(this, {
+ awayMessage: config.awayMessage || "",
lastActiveChannel: -1,
attachedClients: {},
config: config,
@@ -77,25 +82,33 @@ function Client(manager, name, config) {
var client = this;
- if (client.name && !client.config.token) {
- client.updateToken(function(token) {
- client.manager.updateUser(client.name, {token: token});
- });
- }
-
var delay = 0;
- (client.config.networks || []).forEach(n => {
+ (client.config.networks || []).forEach((n) => {
setTimeout(function() {
client.connect(n);
}, delay);
delay += 1000;
});
+ if (typeof client.config.sessions !== "object") {
+ client.config.sessions = {};
+ }
+
+ _.forOwn(client.config.sessions, (session) => {
+ if (session.pushSubscription) {
+ this.registerPushSubscription(session, session.pushSubscription, true);
+ }
+ });
+
if (client.name) {
log.info(`User ${colors.bold(client.name)} loaded`);
}
}
+Client.prototype.isRegistered = function() {
+ return this.name.length > 0;
+};
+
Client.prototype.emit = function(event, data) {
if (this.sockets !== null) {
this.sockets.in(this.id).emit(event, data);
@@ -151,14 +164,15 @@ Client.prototype.connect = function(args) {
if (args.channels) {
var badName = false;
- args.channels.forEach(chan => {
+ args.channels.forEach((chan) => {
if (!chan.name) {
badName = true;
return;
}
channels.push(new Chan({
- name: chan.name
+ name: chan.name,
+ key: chan.key || "",
}));
});
@@ -182,7 +196,7 @@ Client.prototype.connect = function(args) {
args.hostname = args.hostname || (client.config && client.config.hostname) || client.hostname;
var network = new Network({
- name: args.name || "",
+ name: args.name || (config.displayNetwork ? "" : config.defaults.name) || "",
host: args.host || "",
port: parseInt(args.port, 10) || (args.tls ? 6697 : 6667),
tls: !!args.tls,
@@ -261,7 +275,6 @@ Client.prototype.connect = function(args) {
auto_reconnect: true,
auto_reconnect_wait: 10000 + Math.floor(Math.random() * 1000), // If multiple users are connected to the same network, randomize their reconnections a little
auto_reconnect_max_retries: 360, // At least one hour (plus timeouts) worth of reconnections
- ping_interval: 0, // Disable client ping timeouts due to buggy implementation
webirc: webirc,
});
@@ -269,7 +282,7 @@ Client.prototype.connect = function(args) {
"znc.in/self-message", // Legacy echo-message for ZNc
]);
- events.forEach(plugin => {
+ events.forEach((plugin) => {
var path = "./plugins/irc-events/" + plugin;
require(path).apply(client, [
network.irc,
@@ -282,40 +295,57 @@ Client.prototype.connect = function(args) {
client.save();
};
-Client.prototype.updateToken = function(callback) {
- var client = this;
-
- crypto.randomBytes(48, function(err, buf) {
+Client.prototype.generateToken = function(callback) {
+ crypto.randomBytes(48, (err, buf) => {
if (err) {
throw err;
}
- callback(client.config.token = buf.toString("hex"));
+ callback(buf.toString("hex"));
});
};
+Client.prototype.updateSession = function(token, ip, request) {
+ const client = this;
+ const agent = UAParser(request.headers["user-agent"] || "");
+ let friendlyAgent = "";
+
+ if (agent.browser.name) {
+ friendlyAgent = `${agent.browser.name} ${agent.browser.major}`;
+ } else {
+ friendlyAgent = "Unknown browser";
+ }
+
+ if (agent.os.name) {
+ friendlyAgent += ` on ${agent.os.name} ${agent.os.version}`;
+ }
+
+ client.config.sessions[token] = _.assign({
+ lastUse: Date.now(),
+ ip: ip,
+ agent: friendlyAgent,
+ }, client.config.sessions[token]);
+};
+
Client.prototype.setPassword = function(hash, callback) {
var client = this;
- client.updateToken(function(token) {
- client.manager.updateUser(client.name, {
- token: token,
- password: hash
- }, function(err) {
- if (err) {
- log.error("Failed to update password of", client.name, err);
- return callback(false);
- }
+ client.manager.updateUser(client.name, {
+ password: hash
+ }, function(err) {
+ if (err) {
+ log.error("Failed to update password of", client.name, err);
+ return callback(false);
+ }
- client.config.password = hash;
- return callback(true);
- });
+ client.config.password = hash;
+ return callback(true);
});
};
Client.prototype.input = function(data) {
var client = this;
- data.text.split("\n").forEach(line => {
+ data.text.split("\n").forEach((line) => {
data.text = line;
client.inputLine(data);
});
@@ -373,14 +403,19 @@ Client.prototype.inputLine = function(data) {
};
Client.prototype.more = function(data) {
- var client = this;
- var target = client.find(data.target);
+ const client = this;
+ const target = client.find(data.target);
+
if (!target) {
return;
}
- var chan = target.chan;
- var count = chan.messages.length - (data.count || 0);
- var messages = chan.messages.slice(Math.max(0, count - 100), count);
+
+ const chan = target.chan;
+ const index = chan.messages.findIndex((val) => val.id === data.lastId);
+
+ // If we don't find the requested message, send an empty array
+ const messages = index > 0 ? chan.messages.slice(Math.max(0, index - 100), index) : [];
+
client.emit("more", {
chan: chan.id,
messages: messages
@@ -390,7 +425,7 @@ Client.prototype.more = function(data) {
Client.prototype.open = function(socketId, target) {
// Opening a window like settings
if (target === null) {
- this.attachedClients[socketId] = -1;
+ this.attachedClients[socketId].openChannel = -1;
return;
}
@@ -403,51 +438,43 @@ Client.prototype.open = function(socketId, target) {
target.chan.unread = 0;
target.chan.highlight = false;
- this.attachedClients[socketId] = target.chan.id;
+ this.attachedClients[socketId].openChannel = target.chan.id;
this.lastActiveChannel = target.chan.id;
this.emit("open", target.chan.id);
};
Client.prototype.sort = function(data) {
- var self = this;
+ const order = data.order;
- var type = data.type;
- var order = data.order || [];
- var sorted = [];
+ if (!_.isArray(order)) {
+ return;
+ }
- switch (type) {
+ switch (data.type) {
case "networks":
- order.forEach(i => {
- var find = _.find(self.networks, {id: i});
- if (find) {
- sorted.push(find);
- }
- });
- self.networks = sorted;
+ this.networks.sort((a, b) => order.indexOf(a.id) - order.indexOf(b.id));
+
+ // Sync order to connected clients
+ this.emit("sync_sort", {order: this.networks.map((obj) => obj.id), type: data.type, target: data.target});
+
break;
case "channels":
- var target = data.target;
- var network = _.find(self.networks, {id: target});
+ var network = _.find(this.networks, {id: data.target});
if (!network) {
return;
}
- order.forEach(i => {
- var find = _.find(network.channels, {id: i});
- if (find) {
- sorted.push(find);
- }
- });
- network.channels = sorted;
+
+ network.channels.sort((a, b) => order.indexOf(a.id) - order.indexOf(b.id));
+
+ // Sync order to connected clients
+ this.emit("sync_sort", {order: network.channels.map((obj) => obj.id), type: data.type, target: data.target});
+
break;
}
- self.save();
-
- // Sync order to connected clients
- const syncOrder = sorted.map(obj => obj.id);
- self.emit("sync_sort", {order: syncOrder, type: type, target: data.target});
+ this.save();
};
Client.prototype.names = function(data) {
@@ -472,21 +499,36 @@ Client.prototype.quit = function() {
socket.disconnect();
}
}
- this.networks.forEach(network => {
+ this.networks.forEach((network) => {
if (network.irc) {
- network.irc.quit("Page closed");
+ network.irc.quit(Helper.config.leaveMessage);
}
+
+ network.destroy();
});
};
-Client.prototype.clientAttach = function(socketId) {
+Client.prototype.clientAttach = function(socketId, token) {
var client = this;
var save = false;
- client.attachedClients[socketId] = client.lastActiveChannel;
+ if (client.awayMessage && _.size(client.attachedClients) === 0) {
+ client.networks.forEach(function(network) {
+ // Only remove away on client attachment if
+ // there is no away message on this network
+ if (!network.awayMessage) {
+ network.irc.raw("AWAY");
+ }
+ });
+ }
+
+ client.attachedClients[socketId] = {
+ token: token,
+ openChannel: client.lastActiveChannel
+ };
// Update old networks to store ip and hostmask
- client.networks.forEach(network => {
+ client.networks.forEach((network) => {
if (!network.ip) {
save = true;
network.ip = (client.config && client.config.ip) || client.ip;
@@ -508,7 +550,53 @@ Client.prototype.clientAttach = function(socketId) {
};
Client.prototype.clientDetach = function(socketId) {
+ const client = this;
+
delete this.attachedClients[socketId];
+
+ if (client.awayMessage && _.size(client.attachedClients) === 0) {
+ client.networks.forEach(function(network) {
+ // Only set away on client deattachment if
+ // there is no away message on this network
+ if (!network.awayMessage) {
+ network.irc.raw("AWAY", client.awayMessage);
+ }
+ });
+ }
+};
+
+Client.prototype.registerPushSubscription = function(session, subscription, noSave) {
+ if (!_.isPlainObject(subscription) || !_.isPlainObject(subscription.keys)
+ || typeof subscription.endpoint !== "string" || !/^https?:\/\//.test(subscription.endpoint)
+ || typeof subscription.keys.p256dh !== "string" || typeof subscription.keys.auth !== "string") {
+ session.pushSubscription = null;
+ return;
+ }
+
+ const data = {
+ endpoint: subscription.endpoint,
+ keys: {
+ p256dh: subscription.keys.p256dh,
+ auth: subscription.keys.auth
+ }
+ };
+
+ session.pushSubscription = data;
+
+ if (!noSave) {
+ this.manager.updateUser(this.name, {
+ sessions: this.config.sessions
+ });
+ }
+
+ return data;
+};
+
+Client.prototype.unregisterPushSubscription = function(token) {
+ this.config.sessions[token].pushSubscription = null;
+ this.manager.updateUser(this.name, {
+ sessions: this.config.sessions
+ });
};
Client.prototype.save = _.debounce(function SaveClient() {
@@ -517,7 +605,7 @@ Client.prototype.save = _.debounce(function SaveClient() {
}
const client = this;
- let json = {};
- json.networks = this.networks.map(n => n.export());
+ const json = {};
+ json.networks = this.networks.map((n) => n.export());
client.manager.updateUser(client.name, json);
}, 1000, {maxWait: 10000});
diff --git a/src/clientManager.js b/src/clientManager.js
index 578972c3..6211fb46 100644
--- a/src/clientManager.js
+++ b/src/clientManager.js
@@ -5,6 +5,7 @@ var colors = require("colors/safe");
var fs = require("fs");
var Client = require("./client");
var Helper = require("./helper");
+const WebPush = require("./plugins/webpush");
module.exports = ClientManager;
@@ -15,8 +16,9 @@ function ClientManager() {
ClientManager.prototype.init = function(identHandler, sockets) {
this.sockets = sockets;
this.identHandler = identHandler;
+ this.webPush = new WebPush();
- if (!Helper.config.public) {
+ if (!Helper.config.public && !Helper.config.ldap.enable) {
if ("autoload" in Helper.config) {
log.warn(`Autoloading users is now always enabled. Please remove the ${colors.yellow("autoload")} option from your configuration file.`);
}
@@ -25,28 +27,39 @@ ClientManager.prototype.init = function(identHandler, sockets) {
}
};
-ClientManager.prototype.findClient = function(name, token) {
- for (var i in this.clients) {
- var client = this.clients[i];
- if (client.name === name || (token && token === client.config.token)) {
- return client;
- }
- }
- return false;
+ClientManager.prototype.findClient = function(name) {
+ return this.clients.find((u) => u.name === name);
};
ClientManager.prototype.autoloadUsers = function() {
- this.getUsers().forEach(name => this.loadUser(name));
+ const users = this.getUsers();
+ const noUsersWarning = `There are currently no users. Create one with ${colors.bold("lounge add ")}.`;
+
+ // There was an error, already logged, but we have to crash the server as
+ // user directory could not be accessed
+ if (users === undefined) {
+ process.exit(1);
+ }
+
+ if (users.length === 0) {
+ log.info(noUsersWarning);
+ }
+
+ users.forEach((name) => this.loadUser(name));
fs.watch(Helper.USERS_PATH, _.debounce(() => {
- const loaded = this.clients.map(c => c.name);
+ const loaded = this.clients.map((c) => c.name);
const updatedUsers = this.getUsers();
+ if (updatedUsers.length === 0) {
+ log.info(noUsersWarning);
+ }
+
// New users created since last time users were loaded
- _.difference(updatedUsers, loaded).forEach(name => this.loadUser(name));
+ _.difference(updatedUsers, loaded).forEach((name) => this.loadUser(name));
// Existing users removed since last time users were loaded
- _.difference(loaded, updatedUsers).forEach(name => {
+ _.difference(loaded, updatedUsers).forEach((name) => {
const client = _.find(this.clients, {name: name});
if (client) {
client.quit();
@@ -78,13 +91,13 @@ ClientManager.prototype.getUsers = function() {
var users = [];
try {
var files = fs.readdirSync(Helper.USERS_PATH);
- files.forEach(file => {
+ files.forEach((file) => {
if (file.indexOf(".json") !== -1) {
users.push(file.replace(".json", ""));
}
});
} catch (e) {
- log.error("Failed to get users", e);
+ log.error(`Failed to get users (${e})`);
return;
}
return users;
@@ -96,7 +109,6 @@ ClientManager.prototype.addUser = function(name, password, enableLog) {
return false;
}
try {
-
if (require("path").basename(name) !== name) {
throw new Error(name + " is an invalid username.");
}
@@ -105,7 +117,9 @@ ClientManager.prototype.addUser = function(name, password, enableLog) {
user: name,
password: password || "",
log: enableLog,
- networks: []
+ awayMessage: "",
+ networks: [],
+ sessions: {},
};
fs.writeFileSync(
Helper.getUserConfigPath(name),
@@ -127,7 +141,7 @@ ClientManager.prototype.updateUser = function(name, opts, callback) {
return false;
}
- let user = this.readUserConfig(name);
+ const user = this.readUserConfig(name);
const currentUser = JSON.stringify(user, null, "\t");
_.assign(user, opts);
const newUser = JSON.stringify(user, null, "\t");
diff --git a/src/command-line/add.js b/src/command-line/add.js
index 7c0214c5..894e5f88 100644
--- a/src/command-line/add.js
+++ b/src/command-line/add.js
@@ -1,20 +1,39 @@
"use strict";
-var ClientManager = new require("../clientManager");
-var colors = require("colors/safe");
-var program = require("commander");
-var Helper = require("../helper");
+const colors = require("colors/safe");
+const program = require("commander");
+const fs = require("fs");
+const Helper = require("../helper");
+const Utils = require("./utils");
program
.command("add ")
.description("Add a new user")
+ .on("--help", Utils.extraHelp)
.action(function(name) {
- var manager = new ClientManager();
- var users = manager.getUsers();
+ if (!fs.existsSync(Helper.USERS_PATH)) {
+ log.error(`${Helper.USERS_PATH} does not exist.`);
+ return;
+ }
+
+ const ClientManager = require("../clientManager");
+
+ if (Helper.config.public) {
+ log.warn(`Users have no effect in ${colors.bold("public")} mode.`);
+ }
+
+ const manager = new ClientManager();
+ const users = manager.getUsers();
+
+ if (users === undefined) { // There was an error, already logged
+ return;
+ }
+
if (users.indexOf(name) !== -1) {
log.error(`User ${colors.bold(name)} already exists.`);
return;
}
+
log.prompt({
text: "Enter password:",
silent: true
diff --git a/src/command-line/config.js b/src/command-line/config.js
index 1eae72f2..9b601dc8 100644
--- a/src/command-line/config.js
+++ b/src/command-line/config.js
@@ -1,14 +1,22 @@
"use strict";
-var program = require("commander");
-var child = require("child_process");
-var colors = require("colors/safe");
-var Helper = require("../helper");
+const program = require("commander");
+const child = require("child_process");
+const colors = require("colors/safe");
+const fs = require("fs");
+const Helper = require("../helper");
+const Utils = require("./utils");
program
.command("config")
.description(`Edit configuration file located at ${colors.green(Helper.CONFIG_PATH)}.`)
+ .on("--help", Utils.extraHelp)
.action(function() {
+ if (!fs.existsSync(Helper.CONFIG_PATH)) {
+ log.error(`${Helper.CONFIG_PATH} does not exist.`);
+ return;
+ }
+
var child_spawn = child.spawn(
process.env.EDITOR || "vi",
[Helper.CONFIG_PATH],
diff --git a/src/command-line/edit.js b/src/command-line/edit.js
index f33f9e1c..2b552f6b 100644
--- a/src/command-line/edit.js
+++ b/src/command-line/edit.js
@@ -1,16 +1,30 @@
"use strict";
-var ClientManager = new require("../clientManager");
-var program = require("commander");
-var child = require("child_process");
-var colors = require("colors/safe");
-var Helper = require("../helper");
+const program = require("commander");
+const child = require("child_process");
+const colors = require("colors/safe");
+const fs = require("fs");
+const Helper = require("../helper");
+const Utils = require("./utils");
program
.command("edit ")
.description(`Edit user file located at ${colors.green(Helper.getUserConfigPath(""))}.`)
+ .on("--help", Utils.extraHelp)
.action(function(name) {
+ if (!fs.existsSync(Helper.USERS_PATH)) {
+ log.error(`${Helper.USERS_PATH} does not exist.`);
+ return;
+ }
+
+ const ClientManager = require("../clientManager");
+
var users = new ClientManager().getUsers();
+
+ if (users === undefined) { // There was an error, already logged
+ return;
+ }
+
if (users.indexOf(name) === -1) {
log.error(`User ${colors.bold(name)} does not exist.`);
return;
diff --git a/src/command-line/index.js b/src/command-line/index.js
index 36633c28..285d5fe2 100644
--- a/src/command-line/index.js
+++ b/src/command-line/index.js
@@ -2,33 +2,28 @@
global.log = require("../log.js");
-var program = require("commander");
-var colors = require("colors/safe");
-var fs = require("fs");
-var fsextra = require("fs-extra");
-var path = require("path");
-var Helper = require("../helper");
+const program = require("commander");
+const colors = require("colors/safe");
+const Helper = require("../helper");
+const Utils = require("./utils");
program.version(Helper.getVersion(), "-v, --version")
- .option("--home ", "path to configuration folder")
+ .option("--home ", `${colors.bold("[DEPRECATED]")} Use the ${colors.green("LOUNGE_HOME")} environment variable instead.`)
+ .on("--help", Utils.extraHelp)
.parseOptions(process.argv);
-Helper.setHome(program.home || process.env.LOUNGE_HOME);
-
-if (!fs.existsSync(Helper.CONFIG_PATH)) {
- fsextra.ensureDirSync(Helper.HOME);
- fs.chmodSync(Helper.HOME, "0700");
- fsextra.copySync(path.resolve(path.join(
- __dirname,
- "..",
- "..",
- "defaults",
- "config.js"
- )), Helper.CONFIG_PATH);
- log.info(`Configuration file created at ${colors.green(Helper.CONFIG_PATH)}.`);
+if (program.home) {
+ log.warn(`${colors.green("--home")} is ${colors.bold("deprecated")} and will be removed in a future version.`);
+ log.warn(`Use the ${colors.green("LOUNGE_HOME")} environment variable instead.`);
}
-fsextra.ensureDirSync(Helper.USERS_PATH);
+let home = program.home || process.env.LOUNGE_HOME;
+
+if (!home) {
+ home = Utils.defaultLoungeHome();
+}
+
+Helper.setHome(home);
require("./start");
require("./config");
diff --git a/src/command-line/list.js b/src/command-line/list.js
index 8020edda..d092ad8b 100644
--- a/src/command-line/list.js
+++ b/src/command-line/list.js
@@ -1,20 +1,39 @@
"use strict";
-var ClientManager = new require("../clientManager");
-var program = require("commander");
-var colors = require("colors/safe");
+const colors = require("colors/safe");
+const program = require("commander");
+const fs = require("fs");
+const Helper = require("../helper");
+const Utils = require("./utils");
program
.command("list")
.description("List all users")
+ .on("--help", Utils.extraHelp)
.action(function() {
+ if (!fs.existsSync(Helper.USERS_PATH)) {
+ log.error(`${Helper.USERS_PATH} does not exist.`);
+ return;
+ }
+
+ const ClientManager = require("../clientManager");
+
+ if (Helper.config.public) {
+ log.warn(`Users have no effect in ${colors.bold("public")} mode.`);
+ }
+
var users = new ClientManager().getUsers();
- if (!users.length) {
- log.warn("No users found.");
- } else {
+
+ if (users === undefined) { // There was an error, already logged
+ return;
+ }
+
+ if (users.length > 0) {
log.info("Users:");
- for (var i = 0; i < users.length; i++) {
- log.info(`${i + 1}. ${colors.bold(users[i])}`);
- }
+ users.forEach((user, i) => {
+ log.info(`${i + 1}. ${colors.bold(user)}`);
+ });
+ } else {
+ log.info(`There are currently no users. Create one with ${colors.bold("lounge add ")}.`);
}
});
diff --git a/src/command-line/remove.js b/src/command-line/remove.js
index 3e90b658..beb3f3b1 100644
--- a/src/command-line/remove.js
+++ b/src/command-line/remove.js
@@ -1,17 +1,31 @@
"use strict";
-var ClientManager = new require("../clientManager");
-var program = require("commander");
-var colors = require("colors/safe");
+const colors = require("colors/safe");
+const program = require("commander");
+const fs = require("fs");
+const Helper = require("../helper");
+const Utils = require("./utils");
program
.command("remove ")
.description("Remove an existing user")
+ .on("--help", Utils.extraHelp)
.action(function(name) {
- var manager = new ClientManager();
- if (manager.removeUser(name)) {
- log.info(`User ${colors.bold(name)} removed.`);
- } else {
- log.error(`User ${colors.bold(name)} does not exist.`);
+ if (!fs.existsSync(Helper.USERS_PATH)) {
+ log.error(`${Helper.USERS_PATH} does not exist.`);
+ return;
+ }
+
+ const ClientManager = require("../clientManager");
+ const manager = new ClientManager();
+
+ try {
+ if (manager.removeUser(name)) {
+ log.info(`User ${colors.bold(name)} removed.`);
+ } else {
+ log.error(`User ${colors.bold(name)} does not exist.`);
+ }
+ } catch (e) {
+ // There was an error, already logged
}
});
diff --git a/src/command-line/reset.js b/src/command-line/reset.js
index 8be036e7..a5f4da43 100644
--- a/src/command-line/reset.js
+++ b/src/command-line/reset.js
@@ -1,16 +1,29 @@
"use strict";
-var ClientManager = new require("../clientManager");
-var fs = require("fs");
-var program = require("commander");
-var colors = require("colors/safe");
-var Helper = require("../helper");
+const colors = require("colors/safe");
+const program = require("commander");
+const fs = require("fs");
+const Helper = require("../helper");
+const Utils = require("./utils");
program
.command("reset ")
.description("Reset user password")
+ .on("--help", Utils.extraHelp)
.action(function(name) {
+ if (!fs.existsSync(Helper.USERS_PATH)) {
+ log.error(`${Helper.USERS_PATH} does not exist.`);
+ return;
+ }
+
+ const ClientManager = require("../clientManager");
+
var users = new ClientManager().getUsers();
+
+ if (users === undefined) { // There was an error, already logged
+ return;
+ }
+
if (users.indexOf(name) === -1) {
log.error(`User ${colors.bold(name)} does not exist.`);
return;
@@ -25,7 +38,7 @@ program
return;
}
user.password = Helper.password.hash(password);
- user.token = null; // Will be regenerated when the user is loaded
+ user.sessions = {};
fs.writeFileSync(
file,
JSON.stringify(user, null, "\t")
diff --git a/src/command-line/start.js b/src/command-line/start.js
index f1c6ca10..fbec3f17 100644
--- a/src/command-line/start.js
+++ b/src/command-line/start.js
@@ -1,10 +1,12 @@
"use strict";
-var ClientManager = new require("../clientManager");
-var program = require("commander");
-var colors = require("colors/safe");
-var server = require("../server");
-var Helper = require("../helper");
+const colors = require("colors/safe");
+const fs = require("fs");
+const fsextra = require("fs-extra");
+const path = require("path");
+const program = require("commander");
+const Helper = require("../helper");
+const Utils = require("./utils");
program
.command("start")
@@ -14,8 +16,11 @@ program
.option(" --public", "start in public mode")
.option(" --private", "start in private mode")
.description("Start the server")
+ .on("--help", Utils.extraHelp)
.action(function(options) {
- var users = new ClientManager().getUsers();
+ initalizeConfig();
+
+ const server = require("../server");
var mode = Helper.config.public;
if (options.public) {
@@ -24,13 +29,6 @@ program
mode = false;
}
- if (!mode && !users.length && !Helper.config.ldap.enable) {
- log.warn("No users found.");
- log.info(`Create a new user with ${colors.bold("lounge add ")}.`);
-
- return;
- }
-
Helper.config.host = options.host || Helper.config.host;
Helper.config.port = options.port || Helper.config.port;
Helper.config.bind = options.bind || Helper.config.bind;
@@ -38,3 +36,20 @@ program
server();
});
+
+function initalizeConfig() {
+ if (!fs.existsSync(Helper.CONFIG_PATH)) {
+ fsextra.ensureDirSync(Helper.HOME);
+ fs.chmodSync(Helper.HOME, "0700");
+ fsextra.copySync(path.resolve(path.join(
+ __dirname,
+ "..",
+ "..",
+ "defaults",
+ "config.js"
+ )), Helper.CONFIG_PATH);
+ log.info(`Configuration file created at ${colors.green(Helper.CONFIG_PATH)}.`);
+ }
+
+ fsextra.ensureDirSync(Helper.USERS_PATH);
+}
diff --git a/src/command-line/utils.js b/src/command-line/utils.js
new file mode 100644
index 00000000..8f5676af
--- /dev/null
+++ b/src/command-line/utils.js
@@ -0,0 +1,38 @@
+"use strict";
+
+const colors = require("colors/safe");
+const fs = require("fs");
+const path = require("path");
+
+let loungeHome;
+
+class Utils {
+ static extraHelp() {
+ [
+ "",
+ "",
+ " Environment variable:",
+ "",
+ ` LOUNGE_HOME Path for all configuration files and folders. Defaults to ${colors.green(Utils.defaultLoungeHome())}.`,
+ "",
+ ].forEach((e) => console.log(e));
+ }
+
+ static defaultLoungeHome() {
+ if (loungeHome) {
+ return loungeHome;
+ }
+ const distConfig = path.resolve(path.join(
+ __dirname,
+ "..",
+ "..",
+ ".lounge_home"
+ ));
+
+ loungeHome = fs.readFileSync(distConfig, "utf-8").trim();
+
+ return loungeHome;
+ }
+}
+
+module.exports = Utils;
diff --git a/src/helper.js b/src/helper.js
index c6e971c1..288dcfec 100644
--- a/src/helper.js
+++ b/src/helper.js
@@ -6,17 +6,20 @@ var path = require("path");
var os = require("os");
var fs = require("fs");
var net = require("net");
-var bcrypt = require("bcrypt-nodejs");
+var bcrypt = require("bcryptjs");
+const colors = require("colors/safe");
var Helper = {
config: null,
expandHome: expandHome,
+ getStoragePath: getStoragePath,
getUserConfigPath: getUserConfigPath,
getUserLogsPath: getUserLogsPath,
setHome: setHome,
getVersion: getVersion,
getGitCommit: getGitCommit,
ip2hex: ip2hex,
+ cleanIrcMessage: cleanIrcMessage,
password: {
hash: passwordHash,
@@ -58,14 +61,20 @@ function getGitCommit() {
}
function setHome(homePath) {
- this.HOME = expandHome(homePath || "~/.lounge");
+ this.HOME = expandHome(homePath);
this.CONFIG_PATH = path.join(this.HOME, "config.js");
this.USERS_PATH = path.join(this.HOME, "users");
// Reload config from new home location
if (fs.existsSync(this.CONFIG_PATH)) {
var userConfig = require(this.CONFIG_PATH);
- this.config = _.extend(this.config, userConfig);
+ this.config = _.merge(this.config, userConfig);
+ }
+
+ if (!this.config.displayNetwork && !this.config.lockNetwork) {
+ this.config.lockNetwork = true;
+
+ log.warn(`${colors.bold("displayNetwork")} and ${colors.bold("lockNetwork")} are false, setting ${colors.bold("lockNetwork")} to true.`);
}
// TODO: Remove in future release
@@ -83,6 +92,10 @@ function getUserLogsPath(name, network) {
return path.join(this.HOME, "logs", name, network);
}
+function getStoragePath() {
+ return path.join(this.HOME, "storage");
+}
+
function ip2hex(address) {
// no ipv6 support
if (!net.isIPv4(address)) {
@@ -101,21 +114,19 @@ function ip2hex(address) {
}
function expandHome(shortenedPath) {
- var home;
-
- if (os.homedir) {
- home = os.homedir();
+ if (!shortenedPath) {
+ return "";
}
- if (!home) {
- home = process.env.HOME || "";
- }
-
- home = home.replace("$", "$$$$");
-
+ const home = os.homedir().replace("$", "$$$$");
return path.resolve(shortenedPath.replace(/^~($|\/|\\)/, home + "$1"));
}
+function cleanIrcMessage(message) {
+ // TODO: This does not strip hex based colours
+ return message.replace(/\x02|\x1D|\x1F|\x16|\x0F|\x03(?:[0-9]{1,2}(?:,[0-9]{1,2})?)?/g, "");
+}
+
function passwordRequiresUpdate(password) {
return bcrypt.getRounds(password) !== 11;
}
@@ -125,5 +136,5 @@ function passwordHash(password) {
}
function passwordCompare(password, expected) {
- return bcrypt.compareSync(password, expected);
+ return bcrypt.compare(password, expected);
}
diff --git a/src/identification.js b/src/identification.js
index ea4cca28..8ea51fe7 100644
--- a/src/identification.js
+++ b/src/identification.js
@@ -38,7 +38,7 @@ class Identification {
}
serverConnection(socket) {
- socket.on("data", data => {
+ socket.on("data", (data) => {
this.respondToIdent(socket, data);
socket.end();
});
diff --git a/src/models/chan.js b/src/models/chan.js
index 69e582ab..e06e264f 100644
--- a/src/models/chan.js
+++ b/src/models/chan.js
@@ -2,6 +2,7 @@
var _ = require("lodash");
var Helper = require("../helper");
+const storage = require("../plugins/storage");
module.exports = Chan;
@@ -19,6 +20,7 @@ function Chan(attr) {
id: id++,
messages: [],
name: "",
+ key: "",
topic: "",
type: Chan.Type.CHANNEL,
firstUnread: 0,
@@ -28,6 +30,10 @@ function Chan(attr) {
});
}
+Chan.prototype.destroy = function() {
+ this.dereferencePreviews(this.messages);
+};
+
Chan.prototype.pushMessage = function(client, msg, increasesUnread) {
var obj = {
chan: this.id,
@@ -35,7 +41,7 @@ Chan.prototype.pushMessage = function(client, msg, increasesUnread) {
};
// If this channel is open in any of the clients, do not increase unread counter
- var isOpen = _.includes(client.attachedClients, this.id);
+ const isOpen = _.find(client.attachedClients, {openChannel: this.id}) !== undefined;
if ((increasesUnread || msg.highlight) && !isOpen) {
obj.unread = ++this.unread;
@@ -52,7 +58,13 @@ Chan.prototype.pushMessage = function(client, msg, increasesUnread) {
this.messages.push(msg);
if (Helper.config.maxHistory >= 0 && this.messages.length > Helper.config.maxHistory) {
- this.messages.splice(0, this.messages.length - Helper.config.maxHistory);
+ const deleted = this.messages.splice(0, this.messages.length - Helper.config.maxHistory);
+
+ // If maxHistory is 0, image would be dereferenced before client had a chance to retrieve it,
+ // so for now, just don't implement dereferencing for this edge case.
+ if (Helper.config.prefetch && Helper.config.prefetchStorage && Helper.config.maxHistory > 0) {
+ this.dereferencePreviews(deleted);
+ }
}
if (!msg.self && !isOpen) {
@@ -66,6 +78,15 @@ Chan.prototype.pushMessage = function(client, msg, increasesUnread) {
}
};
+Chan.prototype.dereferencePreviews = function(messages) {
+ messages.forEach((message) => {
+ if (message.preview && message.preview.thumb) {
+ storage.dereference(message.preview.thumb);
+ message.preview.thumb = null;
+ }
+ });
+};
+
Chan.prototype.sortUsers = function(irc) {
var userModeSortPriority = {};
irc.network.options.PREFIX.forEach((prefix, index) => {
@@ -76,15 +97,23 @@ Chan.prototype.sortUsers = function(irc) {
this.users = this.users.sort(function(a, b) {
if (a.mode === b.mode) {
- return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1;
+ return a.nick.toLowerCase() < b.nick.toLowerCase() ? -1 : 1;
}
return userModeSortPriority[a.mode] - userModeSortPriority[b.mode];
});
};
+Chan.prototype.findMessage = function(msgId) {
+ return this.messages.find((message) => message.id === msgId);
+};
+
+Chan.prototype.findUser = function(nick) {
+ return _.find(this.users, {nick: nick});
+};
+
Chan.prototype.getMode = function(name) {
- var user = _.find(this.users, {name: name});
+ var user = this.findUser(name);
if (user) {
return user.mode;
}
@@ -94,6 +123,7 @@ Chan.prototype.getMode = function(name) {
Chan.prototype.toJSON = function() {
var clone = _.clone(this);
+ clone.users = []; // Do not send user list, the client will explicitly request it when needed
clone.messages = clone.messages.slice(-100);
return clone;
};
diff --git a/src/models/msg.js b/src/models/msg.js
index a3ce4bc8..019a7198 100644
--- a/src/models/msg.js
+++ b/src/models/msg.js
@@ -2,6 +2,31 @@
var _ = require("lodash");
+var id = 0;
+
+class Msg {
+ constructor(attr) {
+ _.defaults(this, attr, {
+ from: "",
+ id: id++,
+ previews: [],
+ text: "",
+ type: Msg.Type.MESSAGE,
+ self: false
+ });
+
+ if (this.time > 0) {
+ this.time = new Date(this.time);
+ } else {
+ this.time = new Date();
+ }
+ }
+
+ findPreview(link) {
+ return this.previews.find((preview) => preview.link === link);
+ }
+}
+
Msg.Type = {
UNHANDLED: "unhandled",
ACTION: "action",
@@ -16,29 +41,11 @@ Msg.Type = {
NOTICE: "notice",
PART: "part",
QUIT: "quit",
- TOGGLE: "toggle",
CTCP: "ctcp",
TOPIC: "topic",
TOPIC_SET_BY: "topic_set_by",
- WHOIS: "whois"
+ WHOIS: "whois",
+ BANLIST: "ban_list"
};
module.exports = Msg;
-
-var id = 0;
-
-function Msg(attr) {
- _.defaults(this, attr, {
- from: "",
- id: id++,
- text: "",
- type: Msg.Type.MESSAGE,
- self: false
- });
-
- if (this.time > 0) {
- this.time = new Date(this.time);
- } else {
- this.time = new Date();
- }
-}
diff --git a/src/models/network.js b/src/models/network.js
index 0ddd3530..71a7dd7d 100644
--- a/src/models/network.js
+++ b/src/models/network.js
@@ -14,6 +14,7 @@ function Network(attr) {
port: 6667,
tls: false,
password: "",
+ awayMessage: "",
commands: [],
username: "",
realname: "",
@@ -24,11 +25,15 @@ function Network(attr) {
irc: null,
serverOptions: {
PREFIX: [],
+ NETWORK: "",
},
chanCache: [],
});
- this.name = attr.name || prettify(attr.host);
+ if (!this.name) {
+ this.name = this.host;
+ }
+
this.channels.unshift(
new Chan({
name: this.name,
@@ -37,6 +42,10 @@ function Network(attr) {
);
}
+Network.prototype.destroy = function() {
+ this.channels.forEach((channel) => channel.destroy());
+};
+
Network.prototype.setNick = function(nick) {
this.nick = nick;
this.highlightRegex = new RegExp(
@@ -56,6 +65,7 @@ Network.prototype.setNick = function(nick) {
Network.prototype.toJSON = function() {
return _.omit(this, [
+ "awayMessage",
"chanCache",
"highlightRegex",
"irc",
@@ -65,6 +75,7 @@ Network.prototype.toJSON = function() {
Network.prototype.export = function() {
var network = _.pick(this, [
+ "awayMessage",
"nick",
"name",
"host",
@@ -84,7 +95,8 @@ Network.prototype.export = function() {
})
.map(function(chan) {
return _.pick(chan, [
- "name"
+ "name",
+ "key",
]);
});
@@ -98,17 +110,3 @@ Network.prototype.getChannel = function(name) {
return that.name.toLowerCase() === name;
});
};
-
-function prettify(host) {
- var name = capitalize(host.split(".")[1]);
- if (!name) {
- name = host;
- }
- return name;
-}
-
-function capitalize(str) {
- if (typeof str === "string") {
- return str.charAt(0).toUpperCase() + str.slice(1);
- }
-}
diff --git a/src/models/user.js b/src/models/user.js
index 1585e541..2f8340f0 100644
--- a/src/models/user.js
+++ b/src/models/user.js
@@ -7,13 +7,25 @@ module.exports = User;
function User(attr, prefixLookup) {
_.defaults(this, attr, {
modes: [],
- nick: ""
+ mode: "",
+ nick: "",
+ lastMessage: 0,
});
- // irc-framework sets character mode, but lounge works with symbols
- this.modes = this.modes.map(mode => prefixLookup[mode]);
-
- // TODO: Remove this
- this.name = this.nick;
- this.mode = (this.modes && this.modes[0]) || "";
+ this.setModes(this.modes, prefixLookup);
}
+
+User.prototype.setModes = function(modes, prefixLookup) {
+ // irc-framework sets character mode, but lounge works with symbols
+ this.modes = modes.map((mode) => prefixLookup[mode]);
+
+ this.mode = this.modes[0] || "";
+};
+
+User.prototype.toJSON = function() {
+ return {
+ nick: this.nick,
+ mode: this.mode,
+ lastMessage: this.lastMessage,
+ };
+};
diff --git a/src/plugins/inputs/away.js b/src/plugins/inputs/away.js
index 201559fe..aa4d604b 100644
--- a/src/plugins/inputs/away.js
+++ b/src/plugins/inputs/away.js
@@ -3,17 +3,17 @@
exports.commands = ["away", "back"];
exports.input = function(network, chan, cmd, args) {
- if (cmd === "away") {
- let reason = " ";
+ let reason = "";
- if (args.length > 0) {
- reason = args.join(" ");
- }
+ if (cmd === "away") {
+ reason = args.length > 0 ? args.join(" ") : " ";
network.irc.raw("AWAY", reason);
-
- return;
+ } else { // back command
+ network.irc.raw("AWAY");
}
- network.irc.raw("AWAY");
+ network.awayMessage = reason;
+
+ this.save();
};
diff --git a/src/plugins/inputs/ban.js b/src/plugins/inputs/ban.js
new file mode 100644
index 00000000..b6745652
--- /dev/null
+++ b/src/plugins/inputs/ban.js
@@ -0,0 +1,44 @@
+"use strict";
+
+var Chan = require("../../models/chan");
+var Msg = require("../../models/msg");
+
+exports.commands = [
+ "ban",
+ "unban",
+ "banlist"
+];
+
+exports.input = function(network, chan, cmd, args) {
+ if (chan.type !== Chan.Type.CHANNEL) {
+ chan.pushMessage(this, new Msg({
+ type: Msg.Type.ERROR,
+ text: `${cmd} command can only be used in channels.`
+ }));
+
+ return;
+ }
+
+ if (cmd !== "banlist" && args.length === 0) {
+ if (args.length === 0) {
+ chan.pushMessage(this, new Msg({
+ type: Msg.Type.ERROR,
+ text: `Usage: /${cmd} `
+ }));
+
+ return;
+ }
+ }
+
+ switch (cmd) {
+ case "ban":
+ network.irc.ban(chan.name, args[0]);
+ break;
+ case "unban":
+ network.irc.unban(chan.name, args[0]);
+ break;
+ case "banlist":
+ network.irc.banlist(chan.name);
+ break;
+ }
+};
diff --git a/src/plugins/inputs/disconnect.js b/src/plugins/inputs/disconnect.js
index bd43e40d..5c414884 100644
--- a/src/plugins/inputs/disconnect.js
+++ b/src/plugins/inputs/disconnect.js
@@ -1,9 +1,11 @@
"use strict";
+const Helper = require("../../helper");
+
exports.commands = ["disconnect"];
exports.input = function(network, chan, cmd, args) {
- var quitMessage = args[0] ? args.join(" ") : "";
+ var quitMessage = args[0] ? args.join(" ") : Helper.config.leaveMessage;
network.irc.quit(quitMessage);
};
diff --git a/src/plugins/inputs/list.js b/src/plugins/inputs/list.js
index 79512a48..4ef63b4a 100644
--- a/src/plugins/inputs/list.js
+++ b/src/plugins/inputs/list.js
@@ -4,6 +4,6 @@ exports.commands = ["list"];
exports.input = function(network, chan, cmd, args) {
network.chanCache = [];
- network.irc.list(args);
+ network.irc.list.apply(network.irc, args);
return true;
};
diff --git a/src/plugins/inputs/mode.js b/src/plugins/inputs/mode.js
index b6ee5d80..4e1227ad 100644
--- a/src/plugins/inputs/mode.js
+++ b/src/plugins/inputs/mode.js
@@ -1,7 +1,5 @@
"use strict";
-exports.commands = ["mode", "op", "voice", "deop", "devoice"];
-
var Chan = require("../../models/chan");
var Msg = require("../../models/msg");
diff --git a/src/plugins/inputs/part.js b/src/plugins/inputs/part.js
index 6a837271..88a46563 100644
--- a/src/plugins/inputs/part.js
+++ b/src/plugins/inputs/part.js
@@ -3,6 +3,7 @@
var _ = require("lodash");
var Msg = require("../../models/msg");
var Chan = require("../../models/chan");
+const Helper = require("../../helper");
exports.commands = ["close", "leave", "part"];
exports.allowDisconnected = true;
@@ -17,6 +18,7 @@ exports.input = function(network, chan, cmd, args) {
}
network.channels = _.without(network.channels, chan);
+ chan.destroy();
this.emit("part", {
chan: chan.id
});
@@ -25,7 +27,8 @@ exports.input = function(network, chan, cmd, args) {
this.save();
if (network.irc) {
- network.irc.part(chan.name, args.join(" "));
+ const partMessage = args[0] ? args.join(" ") : Helper.config.leaveMessage;
+ network.irc.part(chan.name, partMessage);
}
}
diff --git a/src/plugins/inputs/quit.js b/src/plugins/inputs/quit.js
index be41378a..8ef2950f 100644
--- a/src/plugins/inputs/quit.js
+++ b/src/plugins/inputs/quit.js
@@ -1,23 +1,24 @@
"use strict";
var _ = require("lodash");
+const Helper = require("../../helper");
exports.commands = ["quit"];
exports.allowDisconnected = true;
exports.input = function(network, chan, cmd, args) {
var client = this;
- var irc = network.irc;
- var quitMessage = args[0] ? args.join(" ") : "";
client.networks = _.without(client.networks, network);
+ network.destroy();
client.save();
client.emit("quit", {
network: network.id
});
- if (irc) {
- irc.quit(quitMessage);
+ if (network.irc) {
+ const quitMessage = args[0] ? args.join(" ") : Helper.config.leaveMessage;
+ network.irc.quit(quitMessage);
}
return true;
diff --git a/src/plugins/inputs/topic.js b/src/plugins/inputs/topic.js
index 8e2327cc..ef7a7cb4 100644
--- a/src/plugins/inputs/topic.js
+++ b/src/plugins/inputs/topic.js
@@ -14,9 +14,6 @@ exports.input = function(network, chan, cmd, args) {
return;
}
-
- var irc = network.irc;
- irc.raw("TOPIC", chan.name, args.join(" "));
-
+ network.irc.setTopic(chan.name, args.join(" "));
return true;
};
diff --git a/src/plugins/irc-events/banlist.js b/src/plugins/irc-events/banlist.js
new file mode 100644
index 00000000..fa5993ea
--- /dev/null
+++ b/src/plugins/irc-events/banlist.js
@@ -0,0 +1,48 @@
+"use strict";
+
+const Chan = require("../../models/chan");
+const Msg = require("../../models/msg");
+
+module.exports = function(irc, network) {
+ const client = this;
+
+ irc.on("banlist", function(banlist) {
+ const channel = banlist.channel;
+ const bans = banlist.bans;
+ if (!bans || bans.length === 0) {
+ const msg = new Msg({
+ time: Date.now(),
+ type: Msg.Type.ERROR,
+ text: "Banlist empty"
+ });
+ network.getChannel(channel).pushMessage(client, msg, true);
+ return;
+ }
+
+ const chanName = `Banlist for ${channel}`;
+ let chan = network.getChannel(chanName);
+ if (typeof chan === "undefined") {
+ chan = new Chan({
+ type: Chan.Type.SPECIAL,
+ name: chanName
+ });
+ network.channels.push(chan);
+ client.emit("join", {
+ network: network.id,
+ chan: chan
+ });
+ }
+
+ chan.pushMessage(client,
+ new Msg({
+ type: Msg.Type.BANLIST,
+ bans: bans.map((data) => ({
+ hostmask: data.banned,
+ banned_by: data.banned_by,
+ banned_at: data.banned_at * 1000
+ }))
+ }),
+ true
+ );
+ });
+};
diff --git a/src/plugins/irc-events/connection.js b/src/plugins/irc-events/connection.js
index a8ecef54..92222117 100644
--- a/src/plugins/irc-events/connection.js
+++ b/src/plugins/irc-events/connection.js
@@ -1,5 +1,6 @@
"use strict";
+var _ = require("lodash");
var Msg = require("../../models/msg");
var Chan = require("../../models/chan");
var Helper = require("../../helper");
@@ -18,10 +19,18 @@ module.exports = function(irc, network) {
}), true);
}
+ // Always restore away message for this network
+ if (network.awayMessage) {
+ irc.raw("AWAY", network.awayMessage);
+ // Only set generic away message if there are no clients attached
+ } else if (client.awayMessage && _.size(client.attachedClients) === 0) {
+ irc.raw("AWAY", client.awayMessage);
+ }
+
var delay = 1000;
var commands = network.commands;
if (Array.isArray(commands)) {
- commands.forEach(cmd => {
+ commands.forEach((cmd) => {
setTimeout(function() {
client.input({
target: network.channels[0].id,
@@ -32,13 +41,13 @@ module.exports = function(irc, network) {
});
}
- network.channels.forEach(chan => {
+ network.channels.forEach((chan) => {
if (chan.type !== Chan.Type.CHANNEL) {
return;
}
setTimeout(function() {
- network.irc.join(chan.name);
+ network.irc.join(chan.name, chan.key);
}, delay);
delay += 1000;
});
@@ -111,17 +120,18 @@ module.exports = function(irc, network) {
});
irc.on("server options", function(data) {
- if (network.serverOptions.PREFIX === data.options.PREFIX) {
+ if (network.serverOptions.PREFIX === data.options.PREFIX && network.serverOptions.NETWORK === data.options.NETWORK) {
return;
}
network.prefixLookup = {};
- data.options.PREFIX.forEach(mode => {
+ data.options.PREFIX.forEach((mode) => {
network.prefixLookup[mode.mode] = mode.symbol;
});
network.serverOptions.PREFIX = data.options.PREFIX;
+ network.serverOptions.NETWORK = data.options.NETWORK;
client.emit("network_changed", {
network: network.id,
diff --git a/src/plugins/irc-events/ctcp.js b/src/plugins/irc-events/ctcp.js
index a4ed7033..8686493c 100644
--- a/src/plugins/irc-events/ctcp.js
+++ b/src/plugins/irc-events/ctcp.js
@@ -1,17 +1,17 @@
"use strict";
-var Msg = require("../../models/msg");
+const Msg = require("../../models/msg");
module.exports = function(irc, network) {
- var client = this;
+ const client = this;
irc.on("ctcp response", function(data) {
- var chan = network.getChannel(data.nick);
+ let chan = network.getChannel(data.nick);
if (typeof chan === "undefined") {
chan = network.channels[0];
}
- var msg = new Msg({
+ const msg = new Msg({
type: Msg.Type.CTCP,
time: data.time,
from: data.nick,
@@ -21,14 +21,20 @@ module.exports = function(irc, network) {
chan.pushMessage(client, msg);
});
- irc.on("ctcp request", function(data) {
+ irc.on("ctcp request", (data) => {
switch (data.type) {
- case "PING":
- var split = data.message.split(" ");
+ case "PING": {
+ const split = data.message.split(" ");
if (split.length === 2) {
irc.ctcpResponse(data.nick, "PING", split[1]);
}
break;
}
+ case "SOURCE": {
+ const packageJson = require("../../../package.json");
+ irc.ctcpResponse(data.nick, "SOURCE", packageJson.repository.url);
+ break;
+ }
+ }
});
};
diff --git a/src/plugins/irc-events/join.js b/src/plugins/irc-events/join.js
index c7f91ec9..1ad88e6f 100644
--- a/src/plugins/irc-events/join.js
+++ b/src/plugins/irc-events/join.js
@@ -18,6 +18,9 @@ module.exports = function(irc, network) {
network: network.id,
chan: chan
});
+
+ // Request channels' modes
+ network.irc.raw("MODE", chan.name);
}
chan.users.push(new User({nick: data.nick}));
chan.sortUsers(irc);
diff --git a/src/plugins/irc-events/kick.js b/src/plugins/irc-events/kick.js
index a02c0363..6b3174e6 100644
--- a/src/plugins/irc-events/kick.js
+++ b/src/plugins/irc-events/kick.js
@@ -11,10 +11,12 @@ module.exports = function(irc, network) {
return;
}
+ const user = chan.findUser(data.kicked);
+
if (data.kicked === irc.user.nick) {
chan.users = [];
} else {
- chan.users = _.without(chan.users, _.find(chan.users, {name: data.kicked}));
+ chan.users = _.without(chan.users, user);
}
client.emit("users", {
@@ -24,7 +26,7 @@ module.exports = function(irc, network) {
var msg = new Msg({
type: Msg.Type.KICK,
time: data.time,
- mode: chan.getMode(data.nick),
+ mode: user.mode,
from: data.nick,
target: data.kicked,
text: data.message || "",
diff --git a/src/plugins/irc-events/link.js b/src/plugins/irc-events/link.js
index 2502446d..06049b15 100644
--- a/src/plugins/irc-events/link.js
+++ b/src/plugins/irc-events/link.js
@@ -1,88 +1,151 @@
"use strict";
const cheerio = require("cheerio");
-const Msg = require("../../models/msg");
const request = require("request");
+const url = require("url");
const Helper = require("../../helper");
+const findLinks = require("../../../client/js/libs/handlebars/ircmessageparser/findLinks");
const es = require("event-stream");
+const storage = require("../storage");
process.setMaxListeners(0);
-module.exports = function(client, chan, originalMsg) {
+module.exports = function(client, chan, msg) {
if (!Helper.config.prefetch) {
return;
}
- const links = originalMsg.text
- .replace(/\x02|\x1D|\x1F|\x16|\x0F|\x03(?:[0-9]{1,2}(?:,[0-9]{1,2})?)?/g, "")
- .split(" ")
- .filter(w => /^https?:\/\//.test(w));
+ // Remove all IRC formatting characters before searching for links
+ const cleanText = Helper.cleanIrcMessage(msg.text);
+
+ // We will only try to prefetch http(s) links
+ const links = findLinks(cleanText).filter((w) => /^https?:\/\//.test(w.link));
if (links.length === 0) {
return;
}
- let msg = new Msg({
- type: Msg.Type.TOGGLE,
- time: originalMsg.time,
- self: originalMsg.self,
- });
- chan.pushMessage(client, msg);
-
- const link = escapeHeader(links[0]);
- fetch(link, function(res) {
- parse(msg, link, res, client);
- });
-};
-
-function parse(msg, url, res, client) {
- var toggle = msg.toggle = {
- id: msg.id,
- type: "",
+ msg.previews = Array.from(new Set( // Remove duplicate links
+ links.map((link) => escapeHeader(link.link))
+ )).map((link) => ({
+ type: "loading",
head: "",
body: "",
thumb: "",
- link: url,
- };
+ link: link,
+ shown: true,
+ })).slice(0, 5); // Only preview the first 5 URLs in message to avoid abuse
+ msg.previews.forEach((preview) => {
+ fetch(preview.link, function(res) {
+ if (res === null) {
+ return;
+ }
+
+ parse(msg, preview, res, client);
+ });
+ });
+};
+
+function parse(msg, preview, res, client) {
switch (res.type) {
case "text/html":
- var $ = cheerio.load(res.text);
- toggle.type = "link";
- toggle.head = $("title").text();
- toggle.body =
- $("meta[name=description]").attr("content")
- || $("meta[property=\"og:description\"]").attr("content")
- || "No description found.";
- toggle.thumb =
+ var $ = cheerio.load(res.data);
+ preview.type = "link";
+ preview.head =
+ $("meta[property=\"og:title\"]").attr("content")
+ || $("title").text()
+ || "";
+ preview.body =
+ $("meta[property=\"og:description\"]").attr("content")
+ || $("meta[name=\"description\"]").attr("content")
+ || "";
+ preview.thumb =
$("meta[property=\"og:image\"]").attr("content")
|| $("meta[name=\"twitter:image:src\"]").attr("content")
+ || $("link[rel=\"image_src\"]").attr("href")
|| "";
+
+ if (preview.thumb.length) {
+ preview.thumb = url.resolve(preview.link, preview.thumb);
+ }
+
+ // Make sure thumbnail is a valid url
+ if (!/^https?:\/\//.test(preview.thumb)) {
+ preview.thumb = "";
+ }
+
+ // Verify that thumbnail pic exists and is under allowed size
+ if (preview.thumb.length) {
+ fetch(escapeHeader(preview.thumb), (resThumb) => {
+ if (resThumb === null
+ || !(/^image\/.+/.test(resThumb.type))
+ || resThumb.size > (Helper.config.prefetchMaxImageSize * 1024)) {
+ preview.thumb = "";
+ }
+
+ handlePreview(client, msg, preview, resThumb);
+ });
+
+ return;
+ }
+
break;
case "image/png":
case "image/gif":
case "image/jpg":
case "image/jpeg":
- if (res.size < (Helper.config.prefetchMaxImageSize * 1024)) {
- toggle.type = "image";
- } else {
+ if (res.size > (Helper.config.prefetchMaxImageSize * 1024)) {
return;
}
+
+ preview.type = "image";
+ preview.thumb = preview.link;
+
break;
default:
return;
}
- client.emit("toggle", toggle);
+ handlePreview(client, msg, preview, res);
}
-function fetch(url, cb) {
+function handlePreview(client, msg, preview, res) {
+ if (!preview.thumb.length || !Helper.config.prefetchStorage) {
+ return emitPreview(client, msg, preview);
+ }
+
+ storage.store(res.data, res.type.replace("image/", ""), (uri) => {
+ preview.thumb = uri;
+
+ emitPreview(client, msg, preview);
+ });
+}
+
+function emitPreview(client, msg, preview) {
+ // If there is no title but there is preview or description, set title
+ // otherwise bail out and show no preview
+ if (!preview.head.length && preview.type === "link") {
+ if (preview.thumb.length || preview.body.length) {
+ preview.head = "Untitled page";
+ } else {
+ return;
+ }
+ }
+
+ client.emit("msg:preview", {
+ id: msg.id,
+ preview: preview
+ });
+}
+
+function fetch(uri, cb) {
let req;
try {
req = request.get({
- url: url,
+ url: uri,
maxRedirects: 5,
timeout: 5000,
headers: {
@@ -90,14 +153,16 @@ function fetch(url, cb) {
}
});
} catch (e) {
- return;
+ return cb(null);
}
var length = 0;
- var limit = 1024 * 10;
+ var limit = Helper.config.prefetchMaxImageSize * 1024;
req
.on("response", function(res) {
- if (!(/(text\/html|application\/json)/.test(res.headers["content-type"]))) {
- res.req.abort();
+ if (!(/^image\/.+/.test(res.headers["content-type"]))) {
+ // if not image, limit download to 50kb, since we need only meta tags
+ // twitter.com sends opengraph meta tags within ~20kb of data for individual tweets
+ limit = 1024 * 50;
}
})
.on("error", function() {})
@@ -110,28 +175,30 @@ function fetch(url, cb) {
}))
.pipe(es.wait(function(err, data) {
if (err) {
- return;
+ return cb(null);
}
- var body;
- var type;
- var size = req.response.headers["content-length"];
- try {
- body = JSON.parse(data);
- } catch (e) {
- body = {};
+ if (req.response.statusCode < 200 || req.response.statusCode > 299) {
+ return cb(null);
}
- try {
+
+ let type = "";
+ let size = parseInt(req.response.headers["content-length"], 10) || length;
+
+ if (size < length) {
+ size = length;
+ }
+
+ if (req.response.headers["content-type"]) {
type = req.response.headers["content-type"].split(/ *; */).shift();
- } catch (e) {
- type = {};
}
+
data = {
- text: data,
- body: body,
+ data: data,
type: type,
size: size
};
+
cb(data);
}));
}
diff --git a/src/plugins/irc-events/list.js b/src/plugins/irc-events/list.js
index 0dbf2881..848f912d 100644
--- a/src/plugins/irc-events/list.js
+++ b/src/plugins/irc-events/list.js
@@ -5,7 +5,7 @@ var Msg = require("../../models/msg");
module.exports = function(irc, network) {
var client = this;
- var MAX_CHANS = 1000;
+ var MAX_CHANS = 500;
irc.on("channel list start", function() {
network.chanCache = [];
@@ -23,7 +23,9 @@ module.exports = function(irc, network) {
irc.on("channel list end", function() {
updateListStatus(new Msg({
type: "channel_list",
- channels: network.chanCache.slice(0, MAX_CHANS)
+ channels: network.chanCache.sort(function(a, b) {
+ return b.num_users - a.num_users;
+ }).slice(0, MAX_CHANS)
}));
if (network.chanCache.length > MAX_CHANS) {
diff --git a/src/plugins/irc-events/message.js b/src/plugins/irc-events/message.js
index f83f1b4a..fbfc7102 100644
--- a/src/plugins/irc-events/message.js
+++ b/src/plugins/irc-events/message.js
@@ -3,6 +3,7 @@
const Chan = require("../../models/chan");
const Msg = require("../../models/msg");
const LinkPrefetch = require("./link");
+const Helper = require("../../helper");
module.exports = function(irc, network) {
var client = this;
@@ -71,6 +72,12 @@ module.exports = function(irc, network) {
// Query messages (unless self) always highlight
if (chan.type === Chan.Type.QUERY) {
highlight = !self;
+ } else if (chan.type === Chan.Type.CHANNEL) {
+ const user = chan.findUser(data.nick);
+
+ if (user) {
+ user.lastMessage = data.time || Date.now();
+ }
}
}
@@ -89,11 +96,31 @@ module.exports = function(irc, network) {
self: self,
highlight: highlight
});
- chan.pushMessage(client, msg, !self);
// No prefetch URLs unless are simple MESSAGE or ACTION types
if ([Msg.Type.MESSAGE, Msg.Type.ACTION].indexOf(data.type) !== -1) {
LinkPrefetch(client, chan, msg);
}
+
+ chan.pushMessage(client, msg, !self);
+
+ // Do not send notifications for messages older than 15 minutes (znc buffer for example)
+ if (highlight && (!data.time || data.time > Date.now() - 900000)) {
+ let title = data.nick;
+
+ if (chan.type !== Chan.Type.QUERY) {
+ title += ` (${chan.name}) mentioned you`;
+ } else {
+ title += " sent you a message";
+ }
+
+ client.manager.webPush.push(client, {
+ type: "notification",
+ chanId: chan.id,
+ timestamp: data.time || Date.now(),
+ title: `The Lounge: ${title}`,
+ body: Helper.cleanIrcMessage(data.message)
+ }, true);
+ }
}
};
diff --git a/src/plugins/irc-events/mode.js b/src/plugins/irc-events/mode.js
index b47985c9..266515bb 100644
--- a/src/plugins/irc-events/mode.js
+++ b/src/plugins/irc-events/mode.js
@@ -1,13 +1,40 @@
"use strict";
-var _ = require("lodash");
-var Chan = require("../../models/chan");
-var Msg = require("../../models/msg");
+const _ = require("lodash");
+const Chan = require("../../models/chan");
+const Msg = require("../../models/msg");
module.exports = function(irc, network) {
- var client = this;
+ const client = this;
+
+ // The following saves the channel key based on channel mode instead of
+ // extracting it from `/join #channel key`. This lets us not have to
+ // temporarily store the key until successful join, but also saves the key
+ // if a key is set or changed while being on the channel.
+ irc.on("channel info", function(data) {
+ if (!data.modes) {
+ return;
+ }
+
+ const targetChan = network.getChannel(data.channel);
+ if (typeof targetChan === "undefined") {
+ return;
+ }
+
+ data.modes.forEach((mode) => {
+ const text = mode.mode;
+ const add = text[0] === "+";
+ const char = text[1];
+
+ if (char === "k") {
+ targetChan.key = add ? mode.param : "";
+ client.save();
+ }
+ });
+ });
+
irc.on("mode", function(data) {
- var targetChan;
+ let targetChan;
if (data.target === irc.user.nick) {
targetChan = network.channels[0];
@@ -18,23 +45,29 @@ module.exports = function(irc, network) {
}
}
- var usersUpdated;
- var supportsMultiPrefix = network.irc.network.cap.isEnabled("multi-prefix");
- var userModeSortPriority = {};
+ let usersUpdated;
+ const userModeSortPriority = {};
+ const supportsMultiPrefix = network.irc.network.cap.isEnabled("multi-prefix");
irc.network.options.PREFIX.forEach((prefix, index) => {
userModeSortPriority[prefix.symbol] = index;
});
- for (var i = 0; i < data.modes.length; i++) {
- var mode = data.modes[i];
- var text = mode.mode;
+ data.modes.forEach((mode) => {
+ let text = mode.mode;
+ const add = text[0] === "+";
+ const char = text[1];
+
+ if (char === "k") {
+ targetChan.key = add ? mode.param : "";
+ client.save();
+ }
if (mode.param) {
text += " " + mode.param;
}
- var msg = new Msg({
+ const msg = new Msg({
time: data.time,
type: Msg.Type.MODE,
mode: (targetChan.type !== Chan.Type.LOBBY && targetChan.getMode(data.nick)) || "",
@@ -45,22 +78,21 @@ module.exports = function(irc, network) {
targetChan.pushMessage(client, msg);
if (!mode.param) {
- continue;
+ return;
}
- var user = _.find(targetChan.users, {name: mode.param});
+ const user = targetChan.findUser(mode.param);
if (!user) {
- continue;
+ return;
}
usersUpdated = true;
if (!supportsMultiPrefix) {
- continue;
+ return;
}
- var add = mode.mode[0] === "+";
- var changedMode = network.prefixLookup[mode.mode[1]];
+ const changedMode = network.prefixLookup[char];
if (!add) {
_.pull(user.modes, changedMode);
@@ -73,7 +105,7 @@ module.exports = function(irc, network) {
// TODO: remove in future
user.mode = (user.modes && user.modes[0]) || "";
- }
+ });
if (!usersUpdated) {
return;
diff --git a/src/plugins/irc-events/motd.js b/src/plugins/irc-events/motd.js
index 0d777869..062943b3 100644
--- a/src/plugins/irc-events/motd.js
+++ b/src/plugins/irc-events/motd.js
@@ -8,7 +8,7 @@ module.exports = function(irc, network) {
var lobby = network.channels[0];
if (data.motd) {
- data.motd.split("\n").forEach(text => {
+ data.motd.split("\n").forEach((text) => {
var msg = new Msg({
type: Msg.Type.MOTD,
text: text
diff --git a/src/plugins/irc-events/names.js b/src/plugins/irc-events/names.js
index daae14b3..c75f860f 100644
--- a/src/plugins/irc-events/names.js
+++ b/src/plugins/irc-events/names.js
@@ -1,16 +1,39 @@
"use strict";
-var User = require("../../models/user");
+const User = require("../../models/user");
module.exports = function(irc, network) {
- var client = this;
+ const client = this;
+
irc.on("userlist", function(data) {
- var chan = network.getChannel(data.channel);
+ const chan = network.getChannel(data.channel);
if (typeof chan === "undefined") {
return;
}
- chan.users = data.users.map(u => new User(u, network.prefixLookup));
+ // Create lookup map of current users,
+ // as we need to keep certain properties
+ // and we can recycle existing User objects
+ const oldUsers = new Map();
+
+ chan.users.forEach((user) => {
+ oldUsers.set(user.nick, user);
+ });
+
+ chan.users = data.users.map((user) => {
+ const oldUser = oldUsers.get(user.nick);
+
+ // For existing users, we only need to update mode
+ if (oldUser) {
+ oldUser.setModes(user.modes, network.prefixLookup);
+ return oldUser;
+ }
+
+ return new User({
+ nick: user.nick,
+ modes: user.modes,
+ }, network.prefixLookup);
+ });
chan.sortUsers(irc);
diff --git a/src/plugins/irc-events/nick.js b/src/plugins/irc-events/nick.js
index c8519530..af10f233 100644
--- a/src/plugins/irc-events/nick.js
+++ b/src/plugins/irc-events/nick.js
@@ -1,6 +1,5 @@
"use strict";
-var _ = require("lodash");
var Msg = require("../../models/msg");
module.exports = function(irc, network) {
@@ -24,12 +23,12 @@ module.exports = function(irc, network) {
});
}
- network.channels.forEach(chan => {
- var user = _.find(chan.users, {name: data.nick});
+ network.channels.forEach((chan) => {
+ const user = chan.findUser(data.nick);
if (typeof user === "undefined") {
return;
}
- user.name = data.new_nick;
+ user.nick = data.new_nick;
chan.sortUsers(irc);
client.emit("users", {
chan: chan.id
diff --git a/src/plugins/irc-events/part.js b/src/plugins/irc-events/part.js
index 6711aced..09053687 100644
--- a/src/plugins/irc-events/part.js
+++ b/src/plugins/irc-events/part.js
@@ -13,12 +13,13 @@ module.exports = function(irc, network) {
var from = data.nick;
if (from === irc.user.nick) {
network.channels = _.without(network.channels, chan);
+ chan.destroy();
client.save();
client.emit("part", {
chan: chan.id
});
} else {
- var user = _.find(chan.users, {name: from});
+ const user = chan.findUser(from);
chan.users = _.without(chan.users, user);
client.emit("users", {
chan: chan.id
diff --git a/src/plugins/irc-events/quit.js b/src/plugins/irc-events/quit.js
index 1684f132..fd0c3caa 100644
--- a/src/plugins/irc-events/quit.js
+++ b/src/plugins/irc-events/quit.js
@@ -6,9 +6,8 @@ var Msg = require("../../models/msg");
module.exports = function(irc, network) {
var client = this;
irc.on("quit", function(data) {
- network.channels.forEach(chan => {
- var from = data.nick;
- var user = _.find(chan.users, {name: from});
+ network.channels.forEach((chan) => {
+ const user = chan.findUser(data.nick);
if (typeof user === "undefined") {
return;
}
@@ -22,7 +21,7 @@ module.exports = function(irc, network) {
mode: user.mode || "",
text: data.message || "",
hostmask: data.ident + "@" + data.hostname,
- from: from
+ from: data.nick
});
chan.pushMessage(client, msg);
});
diff --git a/src/plugins/storage.js b/src/plugins/storage.js
new file mode 100644
index 00000000..b96bf7af
--- /dev/null
+++ b/src/plugins/storage.js
@@ -0,0 +1,75 @@
+"use strict";
+
+const fs = require("fs");
+const fsextra = require("fs-extra");
+const path = require("path");
+const crypto = require("crypto");
+const helper = require("../helper");
+
+class Storage {
+ constructor() {
+ this.references = new Map();
+
+ // Ensures that a directory is empty.
+ // Deletes directory contents if the directory is not empty.
+ // If the directory does not exist, it is created.
+ fsextra.emptyDirSync(helper.getStoragePath());
+ }
+
+ dereference(url) {
+ const references = (this.references.get(url) || 0) - 1;
+
+ if (references < 0) {
+ return log.warn("Tried to dereference a file that has no references", url);
+ }
+
+ if (references > 0) {
+ return this.references.set(url, references);
+ }
+
+ this.references.delete(url);
+
+ // Drop "storage/" from url and join it with full storage path
+ const filePath = path.join(helper.getStoragePath(), url.substring(8));
+
+ fs.unlink(filePath, (err) => {
+ if (err) {
+ log.error("Failed to delete stored file", err);
+ }
+ });
+ }
+
+ store(data, extension, callback) {
+ const hash = crypto.createHash("sha256").update(data).digest("hex");
+ const a = hash.substring(0, 2);
+ const b = hash.substring(2, 4);
+ const folder = path.join(helper.getStoragePath(), a, b);
+ const filePath = path.join(folder, `${hash.substring(4)}.${extension}`);
+ const url = `storage/${a}/${b}/${hash.substring(4)}.${extension}`;
+
+ this.references.set(url, 1 + (this.references.get(url) || 0));
+
+ // If file with this name already exists, we don't need to write it again
+ if (fs.existsSync(filePath)) {
+ return callback(url);
+ }
+
+ fsextra.ensureDir(folder).then(() => {
+ fs.writeFile(filePath, data, (err) => {
+ if (err) {
+ log.error("Failed to store a file", err);
+
+ return callback("");
+ }
+
+ callback(url);
+ });
+ }).catch((err) => {
+ log.error("Failed to create storage folder", err);
+
+ return callback("");
+ });
+ }
+}
+
+module.exports = new Storage();
diff --git a/src/plugins/webpush.js b/src/plugins/webpush.js
new file mode 100644
index 00000000..4b867e95
--- /dev/null
+++ b/src/plugins/webpush.js
@@ -0,0 +1,73 @@
+"use strict";
+
+const _ = require("lodash");
+const fs = require("fs");
+const path = require("path");
+const WebPushAPI = require("web-push");
+const Helper = require("../helper");
+
+class WebPush {
+ constructor() {
+ const vapidPath = path.join(Helper.HOME, "vapid.json");
+
+ if (fs.existsSync(vapidPath)) {
+ const data = fs.readFileSync(vapidPath, "utf-8");
+ const parsedData = JSON.parse(data);
+
+ if (typeof parsedData.publicKey === "string" && typeof parsedData.privateKey === "string") {
+ this.vapidKeys = {
+ publicKey: parsedData.publicKey,
+ privateKey: parsedData.privateKey,
+ };
+ }
+ }
+
+ if (!this.vapidKeys) {
+ this.vapidKeys = WebPushAPI.generateVAPIDKeys();
+
+ fs.writeFileSync(vapidPath, JSON.stringify(this.vapidKeys, null, "\t"));
+
+ log.info("New VAPID key pair has been generated for use with push subscription.");
+ }
+
+ WebPushAPI.setVapidDetails(
+ "https://github.com/thelounge/lounge",
+ this.vapidKeys.publicKey,
+ this.vapidKeys.privateKey
+ );
+ }
+
+ push(client, payload, onlyToOffline) {
+ _.forOwn(client.config.sessions, (session, token) => {
+ if (session.pushSubscription) {
+ if (onlyToOffline && _.find(client.attachedClients, {token: token}) !== undefined) {
+ return;
+ }
+
+ this.pushSingle(client, session.pushSubscription, payload);
+ }
+ });
+ }
+
+ pushSingle(client, subscription, payload) {
+ WebPushAPI
+ .sendNotification(subscription, JSON.stringify(payload))
+ .catch((error) => {
+ if (error.statusCode >= 400 && error.statusCode < 500) {
+ log.warn(`WebPush subscription for ${client.name} returned an error (${error.statusCode}), removing subscription`);
+
+ _.forOwn(client.config.sessions, (session, token) => {
+ if (session.pushSubscription && session.pushSubscription.endpoint === subscription.endpoint) {
+ client.unregisterPushSubscription(token);
+ }
+ });
+
+ return;
+ }
+
+ log.error(`WebPush Error (${error})`);
+ });
+ }
+}
+
+module.exports = WebPush;
diff --git a/src/server.js b/src/server.js
index 6af0fe47..205801cc 100644
--- a/src/server.js
+++ b/src/server.js
@@ -5,16 +5,18 @@ var pkg = require("../package.json");
var Client = require("./client");
var ClientManager = require("./clientManager");
var express = require("express");
+var expressHandlebars = require("express-handlebars");
var fs = require("fs");
+var path = require("path");
var io = require("socket.io");
var dns = require("dns");
var Helper = require("./helper");
var ldap = require("ldapjs");
var colors = require("colors/safe");
+const net = require("net");
const Identification = require("./identification");
var manager = null;
-var authFunction = localAuth;
module.exports = function() {
log.info(`The Lounge ${colors.green(Helper.getVersion())} \
@@ -29,7 +31,19 @@ module.exports = function() {
var app = express()
.use(allRequests)
.use(index)
- .use(express.static("client"));
+ .use(express.static("client"))
+ .use("/storage/", express.static(Helper.getStoragePath(), {
+ redirect: false,
+ maxAge: 86400 * 1000,
+ }))
+ .engine("html", expressHandlebars({
+ extname: ".html",
+ helpers: {
+ tojson: (c) => JSON.stringify(c)
+ }
+ }))
+ .set("view engine", "html")
+ .set("views", path.join(__dirname, "..", "client"));
var config = Helper.config;
var server = null;
@@ -42,20 +56,30 @@ module.exports = function() {
server = require("http");
server = server.createServer(app);
} else {
- server = require("spdy");
const keyPath = Helper.expandHome(config.https.key);
const certPath = Helper.expandHome(config.https.certificate);
- if (!config.https.key.length || !fs.existsSync(keyPath)) {
+ const caPath = Helper.expandHome(config.https.ca);
+
+ if (!keyPath.length || !fs.existsSync(keyPath)) {
log.error("Path to SSL key is invalid. Stopping server...");
process.exit();
}
- if (!config.https.certificate.length || !fs.existsSync(certPath)) {
+
+ if (!certPath.length || !fs.existsSync(certPath)) {
log.error("Path to SSL certificate is invalid. Stopping server...");
process.exit();
}
+
+ if (caPath.length && !fs.existsSync(caPath)) {
+ log.error("Path to SSL ca bundle is invalid. Stopping server...");
+ process.exit();
+ }
+
+ server = require("spdy");
server = server.createServer({
key: fs.readFileSync(keyPath),
- cert: fs.readFileSync(certPath)
+ cert: fs.readFileSync(certPath),
+ ca: caPath ? fs.readFileSync(caPath) : undefined
}, app);
}
@@ -65,41 +89,44 @@ module.exports = function() {
}, () => {
const protocol = config.https.enable ? "https" : "http";
var address = server.address();
- log.info(`Available on ${colors.green(protocol + "://" + address.address + ":" + address.port + "/")} \
-in ${config.public ? "public" : "private"} mode`);
- });
- if (!config.public && (config.ldap || {}).enable) {
- authFunction = ldapAuth;
- }
+ log.info(
+ "Available at " +
+ colors.green(`${protocol}://${address.address}:${address.port}/`) +
+ ` in ${colors.bold(config.public ? "public" : "private")} mode`
+ );
- var sockets = io(server, {
- serveClient: false,
- transports: config.transports
- });
+ const sockets = io(server, {
+ serveClient: false,
+ transports: config.transports
+ });
- sockets.on("connect", function(socket) {
- if (config.public) {
- auth.call(socket);
- } else {
- init(socket);
- }
- });
+ sockets.on("connect", (socket) => {
+ if (config.public) {
+ performAuthentication.call(socket, {});
+ } else {
+ socket.emit("auth", {success: true});
+ socket.on("auth", performAuthentication);
+ }
+ });
- manager = new ClientManager();
+ manager = new ClientManager();
- new Identification((identHandler) => {
- manager.init(identHandler, sockets);
+ new Identification((identHandler) => {
+ manager.init(identHandler, sockets);
+ });
});
};
-function getClientIp(req) {
- var ip;
+function getClientIp(request) {
+ let ip = request.connection.remoteAddress;
- if (!Helper.config.reverseProxy) {
- ip = req.connection.remoteAddress;
- } else {
- ip = req.headers["x-forwarded-for"] || req.connection.remoteAddress;
+ if (Helper.config.reverseProxy) {
+ const forwarded = (request.headers["x-forwarded-for"] || "").split(/\s*,\s*/).filter(Boolean);
+
+ if (forwarded.length && net.isIP(forwarded[0])) {
+ ip = forwarded[0];
+ }
}
return ip.replace(/^::ffff:/, "");
@@ -115,171 +142,266 @@ function index(req, res, next) {
return next();
}
- return fs.readFile("client/index.html", "utf-8", function(err, file) {
- if (err) {
- throw err;
- }
-
- var data = _.merge(
- pkg,
- Helper.config
- );
- data.gitCommit = Helper.getGitCommit();
- data.themes = fs.readdirSync("client/themes/").filter(function(themeFile) {
- return themeFile.endsWith(".css");
- }).map(function(css) {
- return css.slice(0, -4);
- });
- var template = _.template(file);
- res.setHeader("Content-Security-Policy", "default-src *; connect-src 'self' ws: wss:; style-src * 'unsafe-inline'; script-src 'self'; child-src 'self'; object-src 'none'; form-action 'none'; referrer no-referrer;");
- res.setHeader("Content-Type", "text/html");
- res.writeHead(200);
- res.end(template(data));
+ var data = _.merge(
+ pkg,
+ Helper.config
+ );
+ data.gitCommit = Helper.getGitCommit();
+ data.themes = fs.readdirSync("client/themes/").filter(function(themeFile) {
+ return themeFile.endsWith(".css");
+ }).map(function(css) {
+ const filename = css.slice(0, -4);
+ return {
+ name: filename.charAt(0).toUpperCase() + filename.slice(1),
+ filename: filename
+ };
});
+
+ const policies = [
+ "default-src *",
+ "connect-src 'self' ws: wss:",
+ "style-src * 'unsafe-inline'",
+ "script-src 'self'",
+ "child-src 'self'",
+ "object-src 'none'",
+ "form-action 'none'",
+ ];
+
+ // If prefetch is enabled, but storage is not, we have to allow mixed content
+ if (Helper.config.prefetchStorage || !Helper.config.prefetch) {
+ policies.push("img-src 'self'");
+ policies.unshift("block-all-mixed-content");
+ }
+
+ res.setHeader("Content-Security-Policy", policies.join("; "));
+ res.setHeader("Referrer-Policy", "no-referrer");
+ res.render("index", data);
}
-function init(socket, client) {
- if (!client) {
- socket.emit("auth", {success: true});
- socket.on("auth", auth);
- } else {
- socket.emit("authorized");
+function initializeClient(socket, client, generateToken, token) {
+ socket.emit("authorized");
- client.ip = getClientIp(socket.request);
+ socket.on("disconnect", function() {
+ client.clientDetach(socket.id);
+ });
+ client.clientAttach(socket.id, token);
- socket.on("disconnect", function() {
- client.clientDetach(socket.id);
- });
- client.clientAttach(socket.id);
-
- socket.on(
- "input",
- function(data) {
- client.input(data);
- }
- );
- socket.on(
- "more",
- function(data) {
- client.more(data);
- }
- );
- socket.on(
- "conn",
- function(data) {
- // prevent people from overriding webirc settings
- data.ip = null;
- data.hostname = null;
- client.connect(data);
- }
- );
- if (!Helper.config.public && !Helper.config.ldap.enable) {
- socket.on(
- "change-password",
- function(data) {
- var old = data.old_password;
- var p1 = data.new_password;
- var p2 = data.verify_password;
- if (typeof p1 === "undefined" || p1 === "") {
- socket.emit("change-password", {
- error: "Please enter a new password"
- });
- return;
- }
- if (p1 !== p2) {
- socket.emit("change-password", {
- error: "Both new password fields must match"
- });
- return;
- }
- if (!Helper.password.compare(old || "", client.config.password)) {
- socket.emit("change-password", {
- error: "The current password field does not match your account password"
- });
- return;
- }
-
- var hash = Helper.password.hash(p1);
-
- client.setPassword(hash, function(success) {
- var obj = {};
-
- if (success) {
- obj.success = "Successfully updated your password, all your other sessions were logged out";
- obj.token = client.config.token;
- } else {
- obj.error = "Failed to update your password";
- }
-
- socket.emit("change-password", obj);
- });
- }
- );
+ socket.on(
+ "input",
+ function(data) {
+ client.input(data);
}
+ );
+
+ socket.on(
+ "more",
+ function(data) {
+ client.more(data);
+ }
+ );
+
+ socket.on(
+ "conn",
+ function(data) {
+ // prevent people from overriding webirc settings
+ data.ip = null;
+ data.hostname = null;
+
+ client.connect(data);
+ }
+ );
+
+ if (!Helper.config.public && !Helper.config.ldap.enable) {
socket.on(
- "open",
+ "change-password",
function(data) {
- client.open(socket.id, data);
+ var old = data.old_password;
+ var p1 = data.new_password;
+ var p2 = data.verify_password;
+ if (typeof p1 === "undefined" || p1 === "") {
+ socket.emit("change-password", {
+ error: "Please enter a new password"
+ });
+ return;
+ }
+ if (p1 !== p2) {
+ socket.emit("change-password", {
+ error: "Both new password fields must match"
+ });
+ return;
+ }
+
+ Helper.password
+ .compare(old || "", client.config.password)
+ .then((matching) => {
+ if (!matching) {
+ socket.emit("change-password", {
+ error: "The current password field does not match your account password"
+ });
+ return;
+ }
+ const hash = Helper.password.hash(p1);
+
+ client.setPassword(hash, (success) => {
+ const obj = {};
+
+ if (success) {
+ obj.success = "Successfully updated your password";
+ } else {
+ obj.error = "Failed to update your password";
+ }
+
+ socket.emit("change-password", obj);
+ });
+ }).catch((error) => {
+ log.error(`Error while checking users password. Error: ${error}`);
+ });
}
);
- socket.on(
- "sort",
- function(data) {
- client.sort(data);
+ }
+
+ socket.on(
+ "open",
+ function(data) {
+ client.open(socket.id, data);
+ }
+ );
+
+ socket.on(
+ "sort",
+ function(data) {
+ client.sort(data);
+ }
+ );
+
+ socket.on(
+ "names",
+ function(data) {
+ client.names(data);
+ }
+ );
+
+ socket.on("msg:preview:toggle", function(data) {
+ const networkAndChan = client.find(data.target);
+ if (!networkAndChan) {
+ return;
+ }
+
+ const message = networkAndChan.chan.findMessage(data.msgId);
+
+ if (!message) {
+ return;
+ }
+
+ const preview = message.findPreview(data.link);
+
+ if (preview) {
+ preview.shown = data.shown;
+ }
+ });
+
+ socket.on("push:register", (subscription) => {
+ if (!client.isRegistered() || !client.config.sessions[token]) {
+ return;
+ }
+
+ const registration = client.registerPushSubscription(client.config.sessions[token], subscription);
+
+ if (registration) {
+ client.manager.webPush.pushSingle(client, registration, {
+ type: "notification",
+ timestamp: Date.now(),
+ title: "The Lounge",
+ body: "🚀 Push notifications have been enabled"
+ });
+ }
+ });
+
+ socket.on("push:unregister", () => {
+ if (!client.isRegistered()) {
+ return;
+ }
+
+ client.unregisterPushSubscription(token);
+ });
+
+ socket.on("sign-out", () => {
+ delete client.config.sessions[token];
+
+ client.manager.updateUser(client.name, {
+ sessions: client.config.sessions
+ }, (err) => {
+ if (err) {
+ log.error("Failed to update sessions for", client.name, err);
}
- );
- socket.on(
- "names",
- function(data) {
- client.names(data);
- }
- );
- socket.join(client.id);
+ });
+
+ socket.emit("sign-out");
+ });
+
+ socket.join(client.id);
+
+ const sendInitEvent = (tokenToSend) => {
socket.emit("init", {
+ applicationServerKey: manager.webPush.vapidKeys.publicKey,
+ pushSubscription: client.config.sessions[token],
active: client.lastActiveChannel,
networks: client.networks,
- token: client.config.token || null
+ token: tokenToSend
});
+ };
+
+ if (generateToken) {
+ client.generateToken((newToken) => {
+ token = newToken;
+
+ client.updateSession(token, getClientIp(socket.request), socket.request);
+
+ client.manager.updateUser(client.name, {
+ sessions: client.config.sessions
+ }, (err) => {
+ if (err) {
+ log.error("Failed to update sessions for", client.name, err);
+ }
+ });
+
+ sendInitEvent(token);
+ });
+ } else {
+ sendInitEvent(null);
}
}
-function reverseDnsLookup(socket, client) {
- client.ip = getClientIp(socket.request);
-
- dns.reverse(client.ip, function(err, host) {
- if (!err && host.length) {
- client.hostname = host[0];
- } else {
- client.hostname = client.ip;
- }
-
- init(socket, client);
- });
-}
-
function localAuth(client, user, password, callback) {
+ // If no user is found, or if the client has not provided a password,
+ // fail the authentication straight away
if (!client || !password) {
return callback(false);
}
+ // If this user has no password set, fail the authentication
if (!client.config.password) {
log.error(`User ${colors.bold(user)} with no local password set tried to sign in. (Probably a LDAP user)`);
return callback(false);
}
- var result = Helper.password.compare(password, client.config.password);
+ Helper.password
+ .compare(password, client.config.password)
+ .then((matching) => {
+ if (matching && Helper.password.requiresUpdate(client.config.password)) {
+ const hash = Helper.password.hash(password);
- if (result && Helper.password.requiresUpdate(client.config.password)) {
- var hash = Helper.password.hash(password);
-
- client.setPassword(hash, function(success) {
- if (success) {
- log.info(`User ${colors.bold(client.name)} logged in and their hashed password has been updated to match new security requirements`);
+ client.setPassword(hash, (success) => {
+ if (success) {
+ log.info(`User ${colors.bold(client.name)} logged in and their hashed password has been updated to match new security requirements`);
+ }
+ });
}
- });
- }
- return callback(result);
+ callback(matching);
+ }).catch((error) => {
+ log.error(`Error while checking users password. Error: ${error}`);
+ });
}
function ldapAuth(client, user, password, callback) {
@@ -353,51 +475,82 @@ function ldapAuth(client, user, password, callback) {
});
}
-function auth(data) {
- var socket = this;
- var client;
+function performAuthentication(data) {
+ const socket = this;
+ let client;
+
+ const finalInit = () => initializeClient(socket, client, !!data.remember, data.token || null);
+
+ const initClient = () => {
+ client.ip = getClientIp(socket.request);
+
+ // If webirc is enabled perform reverse dns lookup
+ if (Helper.config.webirc === null) {
+ return finalInit();
+ }
+
+ reverseDnsLookup(client.ip, (hostname) => {
+ client.hostname = hostname;
+
+ finalInit();
+ });
+ };
+
if (Helper.config.public) {
client = new Client(manager);
manager.clients.push(client);
+
socket.on("disconnect", function() {
manager.clients = _.without(manager.clients, client);
client.quit();
});
- if (Helper.config.webirc) {
- reverseDnsLookup(socket, client);
- } else {
- init(socket, client);
+
+ initClient();
+
+ return;
+ }
+
+ const authCallback = (success) => {
+ // Authorization failed
+ if (!success) {
+ socket.emit("auth", {success: false});
+ return;
}
+
+ // If authorization succeeded but there is no loaded user,
+ // load it and find the user again (this happens with LDAP)
+ if (!client) {
+ manager.loadUser(data.user);
+ client = manager.findClient(data.user);
+ }
+
+ initClient();
+ };
+
+ client = manager.findClient(data.user);
+
+ // We have found an existing user and client has provided a token
+ if (client && data.token && typeof client.config.sessions[data.token] !== "undefined") {
+ client.updateSession(data.token, getClientIp(socket.request), socket.request);
+
+ authCallback(true);
+ return;
+ }
+
+ // Perform password checking
+ if (!Helper.config.public && Helper.config.ldap.enable) {
+ ldapAuth(client, data.user, data.password, authCallback);
} else {
- client = manager.findClient(data.user, data.token);
- var signedIn = data.token && client && data.token === client.config.token;
- var token;
-
- if (client && (data.remember || data.token)) {
- token = client.config.token;
- }
-
- var authCallback = function(success) {
- if (success) {
- if (!client) {
- // LDAP just created a user
- manager.loadUser(data.user);
- client = manager.findClient(data.user);
- }
- if (Helper.config.webirc !== null && !client.config.ip) {
- reverseDnsLookup(socket, client);
- } else {
- init(socket, client, token);
- }
- } else {
- socket.emit("auth", {success: success});
- }
- };
-
- if (signedIn) {
- authCallback(true);
- } else {
- authFunction(client, data.user, data.password, authCallback);
- }
+ localAuth(client, data.user, data.password, authCallback);
}
}
+
+function reverseDnsLookup(ip, callback) {
+ dns.reverse(ip, (err, hostnames) => {
+ if (!err && hostnames.length) {
+ return callback(hostnames[0]);
+ }
+
+ callback(ip);
+ });
+}
diff --git a/src/userLog.js b/src/userLog.js
index 4b3020f8..3d65bb9f 100644
--- a/src/userLog.js
+++ b/src/userLog.js
@@ -11,7 +11,7 @@ module.exports.write = function(user, network, chan, msg) {
try {
fsextra.ensureDirSync(path);
} catch (e) {
- log.error("Unabled to create logs directory", e);
+ log.error("Unable to create logs directory", e);
return;
}
diff --git a/test/client/js/libs/handlebars/friendlydateTest.js b/test/client/js/libs/handlebars/friendlydateTest.js
new file mode 100644
index 00000000..d9091e11
--- /dev/null
+++ b/test/client/js/libs/handlebars/friendlydateTest.js
@@ -0,0 +1,24 @@
+"use strict";
+
+const expect = require("chai").expect;
+const moment = require("moment");
+const friendlydate = require("../../../../../client/js/libs/handlebars/friendlydate");
+
+describe("friendlydate Handlebars helper", () => {
+ it("should render 'Today' as a human-friendly date", () => {
+ const time = new Date().getTime();
+ expect(friendlydate(time)).to.equal("Today");
+ });
+
+ it("should render 'Yesterday' as a human-friendly date", () => {
+ const time = new Date().getTime() - 24 * 3600 * 1000;
+ expect(friendlydate(time)).to.equal("Yesterday");
+ });
+
+ it("should not render any friendly dates prior to the day before", () => {
+ [2, 7, 30, 365, 1000].forEach((day) => {
+ const time = new Date().getTime() - 24 * 3600 * 1000 * day;
+ expect(friendlydate(time)).to.equal(moment(time).format("D MMMM YYYY"));
+ });
+ });
+});
diff --git a/test/client/js/libs/handlebars/ircmessageparser/anyIntersection.js b/test/client/js/libs/handlebars/ircmessageparser/anyIntersection.js
new file mode 100644
index 00000000..b80a44ed
--- /dev/null
+++ b/test/client/js/libs/handlebars/ircmessageparser/anyIntersection.js
@@ -0,0 +1,30 @@
+"use strict";
+
+const expect = require("chai").expect;
+const anyIntersection = require("../../../../../../client/js/libs/handlebars/ircmessageparser/anyIntersection");
+
+describe("anyIntersection", () => {
+ it("should not intersect on edges", () => {
+ const a = {start: 1, end: 2};
+ const b = {start: 2, end: 3};
+
+ expect(anyIntersection(a, b)).to.equal(false);
+ expect(anyIntersection(b, a)).to.equal(false);
+ });
+
+ it("should intersect on overlapping", () => {
+ const a = {start: 0, end: 3};
+ const b = {start: 1, end: 2};
+
+ expect(anyIntersection(a, b)).to.equal(true);
+ expect(anyIntersection(b, a)).to.equal(true);
+ });
+
+ it("should not intersect", () => {
+ const a = {start: 0, end: 1};
+ const b = {start: 2, end: 3};
+
+ expect(anyIntersection(a, b)).to.equal(false);
+ expect(anyIntersection(b, a)).to.equal(false);
+ });
+});
diff --git a/test/client/js/libs/handlebars/ircmessageparser/fill.js b/test/client/js/libs/handlebars/ircmessageparser/fill.js
new file mode 100644
index 00000000..8723ad52
--- /dev/null
+++ b/test/client/js/libs/handlebars/ircmessageparser/fill.js
@@ -0,0 +1,50 @@
+"use strict";
+
+const expect = require("chai").expect;
+const fill = require("../../../../../../client/js/libs/handlebars/ircmessageparser/fill");
+
+describe("fill", () => {
+ const text = "01234567890123456789";
+
+ it("should return an entry for the unmatched end of string", () => {
+ const existingEntries = [
+ {start: 0, end: 10},
+ {start: 5, end: 15},
+ ];
+
+ const expected = [
+ {start: 15, end: 20},
+ ];
+
+ const actual = fill(existingEntries, text);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should return an entry per unmatched areas of the text", () => {
+ const existingEntries = [
+ {start: 0, end: 5},
+ {start: 10, end: 15},
+ ];
+
+ const expected = [
+ {start: 5, end: 10},
+ {start: 15, end: 20},
+ ];
+
+ const actual = fill(existingEntries, text);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should not return anything when entries match all text", () => {
+ const existingEntries = [
+ {start: 0, end: 10},
+ {start: 10, end: 20},
+ ];
+
+ const actual = fill(existingEntries, text);
+
+ expect(actual).to.be.empty;
+ });
+});
diff --git a/test/client/js/libs/handlebars/ircmessageparser/findChannels.js b/test/client/js/libs/handlebars/ircmessageparser/findChannels.js
new file mode 100644
index 00000000..87663251
--- /dev/null
+++ b/test/client/js/libs/handlebars/ircmessageparser/findChannels.js
@@ -0,0 +1,123 @@
+"use strict";
+
+const expect = require("chai").expect;
+const findChannels = require("../../../../../../client/js/libs/handlebars/ircmessageparser/findChannels");
+
+describe("findChannels", () => {
+ it("should find single letter channel", () => {
+ const input = "#a";
+ const expected = [{
+ channel: "#a",
+ start: 0,
+ end: 2
+ }];
+
+ const actual = findChannels(input, ["#"], ["@", "+"]);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should find utf8 channels", () => {
+ const input = "#äöü";
+ const expected = [{
+ channel: "#äöü",
+ start: 0,
+ end: 4
+ }];
+
+ const actual = findChannels(input, ["#"], ["@", "+"]);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should find inline channel", () => {
+ const input = "inline #channel text";
+ const expected = [{
+ channel: "#channel",
+ start: 7,
+ end: 15
+ }];
+
+ const actual = findChannels(input, ["#"], ["@", "+"]);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should stop at \\0x07", () => {
+ const input = "#chan\x07nel";
+ const expected = [{
+ channel: "#chan",
+ start: 0,
+ end: 5
+ }];
+
+ const actual = findChannels(input, ["#"], ["@", "+"]);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should allow classics pranks", () => {
+ const input = "#1,000";
+ const expected = [{
+ channel: "#1,000",
+ start: 0,
+ end: 6
+ }];
+
+ const actual = findChannels(input, ["#"], ["@", "+"]);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should work with whois responses", () => {
+ const input = "@#a";
+ const expected = [{
+ channel: "#a",
+ start: 1,
+ end: 3
+ }];
+
+ const actual = findChannels(input, ["#"], ["@", "+"]);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should work with IRCv3.1 multi-prefix", () => {
+ const input = "!@%+#a";
+ const expected = [{
+ channel: "#a",
+ start: 4,
+ end: 6
+ }];
+
+ const actual = findChannels(input, ["#"], ["!", "@", "%", "+"]);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should work with custom channelPrefixes", () => {
+ const input = "@a";
+ const expected = [{
+ channel: "@a",
+ start: 0,
+ end: 2
+ }];
+
+ const actual = findChannels(input, ["@"], ["#", "+"]);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should handle multiple channelPrefix correctly", () => {
+ const input = "##test";
+ const expected = [{
+ channel: "##test",
+ start: 0,
+ end: 6
+ }];
+
+ const actual = findChannels(input, ["#"], ["@", "+"]);
+
+ expect(actual).to.deep.equal(expected);
+ });
+});
diff --git a/test/client/js/libs/handlebars/ircmessageparser/findEmoji.js b/test/client/js/libs/handlebars/ircmessageparser/findEmoji.js
new file mode 100644
index 00000000..1360fa6d
--- /dev/null
+++ b/test/client/js/libs/handlebars/ircmessageparser/findEmoji.js
@@ -0,0 +1,58 @@
+"use strict";
+
+const expect = require("chai").expect;
+const findEmoji = require("../../../../../../client/js/libs/handlebars/ircmessageparser/findEmoji");
+
+describe("findEmoji", () => {
+ it("should find default emoji presentation character", () => {
+ const input = "test \u{231A} test";
+ const expected = [{
+ start: 5,
+ end: 6,
+ emoji: "\u{231A}",
+ }];
+
+ const actual = findEmoji(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should find default text presentation character rendered as emoji", () => {
+ const input = "test \u{2194}\u{FE0F} test";
+ const expected = [{
+ start: 5,
+ end: 7,
+ emoji: "\u{2194}\u{FE0F}",
+ }];
+
+ const actual = findEmoji(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should find emoji modifier base", () => {
+ const input = "test\u{1F469}test";
+ const expected = [{
+ start: 4,
+ end: 6,
+ emoji: "\u{1F469}",
+ }];
+
+ const actual = findEmoji(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should find emoji modifier base followed by a modifier", () => {
+ const input = "test\u{1F469}\u{1F3FF}test";
+ const expected = [{
+ start: 4,
+ end: 8,
+ emoji: "\u{1F469}\u{1F3FF}",
+ }];
+
+ const actual = findEmoji(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+});
diff --git a/test/client/js/libs/handlebars/ircmessageparser/findLinks.js b/test/client/js/libs/handlebars/ircmessageparser/findLinks.js
new file mode 100644
index 00000000..f3f228f2
--- /dev/null
+++ b/test/client/js/libs/handlebars/ircmessageparser/findLinks.js
@@ -0,0 +1,106 @@
+"use strict";
+
+const expect = require("chai").expect;
+const findLinks = require("../../../../../../client/js/libs/handlebars/ircmessageparser/findLinks");
+
+describe("findLinks", () => {
+ it("should find url", () => {
+ const input = "irc://freenode.net/thelounge";
+ const expected = [{
+ start: 0,
+ end: 28,
+ link: "irc://freenode.net/thelounge",
+ }];
+
+ const actual = findLinks(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should find urls with www", () => {
+ const input = "www.nooooooooooooooo.com";
+ const expected = [{
+ start: 0,
+ end: 24,
+ link: "http://www.nooooooooooooooo.com"
+ }];
+
+ const actual = findLinks(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should find urls in strings", () => {
+ const input = "look at https://thelounge.github.io/ for more information";
+ const expected = [{
+ link: "https://thelounge.github.io/",
+ start: 8,
+ end: 36
+ }];
+
+ const actual = findLinks(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should find urls in strings starting with www", () => {
+ const input = "use www.duckduckgo.com for privacy reasons";
+ const expected = [{
+ link: "http://www.duckduckgo.com",
+ start: 4,
+ end: 22
+ }];
+
+ const actual = findLinks(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should find urls with odd surroundings", () => {
+ const input = "";
+ const expected = [{
+ link: "https://theos.kyriasis.com/~kyrias/stats/archlinux.html",
+ start: 1,
+ end: 56
+ }];
+
+ const actual = findLinks(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should find urls with starting with www. and odd surroundings", () => {
+ const input = ".:www.github.com:.";
+ const expected = [{
+ link: "http://www.github.com",
+ start: 2,
+ end: 16
+ }];
+
+ const actual = findLinks(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should not find urls", () => {
+ const input = "text www. text";
+ const expected = [];
+
+ const actual = findLinks(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should handle multiple www. correctly", () => {
+ const input = "www.www.test.com";
+ const expected = [{
+ link: "http://www.www.test.com",
+ start: 0,
+ end: 16
+ }];
+
+ const actual = findLinks(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+});
diff --git a/test/client/js/libs/handlebars/ircmessageparser/merge.js b/test/client/js/libs/handlebars/ircmessageparser/merge.js
new file mode 100644
index 00000000..d55ac1a2
--- /dev/null
+++ b/test/client/js/libs/handlebars/ircmessageparser/merge.js
@@ -0,0 +1,63 @@
+"use strict";
+
+const expect = require("chai").expect;
+const merge = require("../../../../../../client/js/libs/handlebars/ircmessageparser/merge");
+
+describe("merge", () => {
+ it("should split style information", () => {
+ const textParts = [{
+ start: 0,
+ end: 10,
+ flag1: true
+ }, {
+ start: 10,
+ end: 20,
+ flag2: true
+ }];
+ const styleFragments = [{
+ start: 0,
+ end: 5,
+ text: "01234"
+ }, {
+ start: 5,
+ end: 15,
+ text: "5678901234"
+ }, {
+ start: 15,
+ end: 20,
+ text: "56789"
+ }];
+
+ const expected = [{
+ start: 0,
+ end: 10,
+ flag1: true,
+ fragments: [{
+ start: 0,
+ end: 5,
+ text: "01234"
+ }, {
+ start: 5,
+ end: 10,
+ text: "56789"
+ }]
+ }, {
+ start: 10,
+ end: 20,
+ flag2: true,
+ fragments: [{
+ start: 10,
+ end: 15,
+ text: "01234"
+ }, {
+ start: 15,
+ end: 20,
+ text: "56789"
+ }]
+ }];
+
+ const actual = merge(textParts, styleFragments);
+
+ expect(actual).to.deep.equal(expected);
+ });
+});
diff --git a/test/client/js/libs/handlebars/ircmessageparser/parseStyle.js b/test/client/js/libs/handlebars/ircmessageparser/parseStyle.js
new file mode 100644
index 00000000..1e44fdc8
--- /dev/null
+++ b/test/client/js/libs/handlebars/ircmessageparser/parseStyle.js
@@ -0,0 +1,393 @@
+"use strict";
+
+const expect = require("chai").expect;
+const parseStyle = require("../../../../../../client/js/libs/handlebars/ircmessageparser/parseStyle");
+
+describe("parseStyle", () => {
+ it("should skip control codes", () => {
+ const input = "text\x01with\x04control\x05codes";
+ const expected = [{
+ bold: false,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "textwithcontrolcodes",
+
+ start: 0,
+ end: 20
+ }];
+
+ const actual = parseStyle(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should parse bold", () => {
+ const input = "\x02bold";
+ const expected = [{
+ bold: true,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "bold",
+
+ start: 0,
+ end: 4
+ }];
+
+ const actual = parseStyle(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should parse textColor", () => {
+ const input = "\x038yellowText";
+ const expected = [{
+ bold: false,
+ textColor: 8,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "yellowText",
+
+ start: 0,
+ end: 10
+ }];
+
+ const actual = parseStyle(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should parse textColor and background", () => {
+ const input = "\x034,8yellowBG redText";
+ const expected = [{
+ textColor: 4,
+ bgColor: 8,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ bold: false,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "yellowBG redText",
+
+ start: 0,
+ end: 16
+ }];
+
+ const actual = parseStyle(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should parse italic", () => {
+ const input = "\x1ditalic";
+ const expected = [{
+ bold: false,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: true,
+ underline: false,
+ text: "italic",
+
+ start: 0,
+ end: 6
+ }];
+
+ const actual = parseStyle(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should parse hex colors", () => {
+ const input = "test \x04FFFFFFnice \x02\x04RES006 \x0303,04\x04ff00FFcolored\x04eeeaFF,001122 background\x04\x03\x02?";
+ const expected = [{
+ bold: false,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "test ",
+
+ start: 0,
+ end: 5
+ }, {
+ bold: false,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: "FFFFFF",
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "nice ",
+
+ start: 5,
+ end: 10
+ }, {
+ bold: true,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "RES006 ",
+
+ start: 10,
+ end: 17
+ }, {
+ bold: true,
+ textColor: 3,
+ bgColor: 4,
+ hexColor: "FF00FF",
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "colored",
+
+ start: 17,
+ end: 24
+ }, {
+ bold: true,
+ textColor: 3,
+ bgColor: 4,
+ hexColor: "EEEAFF",
+ hexBgColor: "001122",
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: " background",
+
+ start: 24,
+ end: 35
+ }, {
+ bold: false,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "?",
+
+ start: 35,
+ end: 36
+ }];
+
+ const actual = parseStyle(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should carry state correctly forward", () => {
+ const input = "\x02bold\x038yellow\x02nonBold\x03default";
+ const expected = [{
+ bold: true,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "bold",
+
+ start: 0,
+ end: 4
+ }, {
+ bold: true,
+ textColor: 8,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "yellow",
+
+ start: 4,
+ end: 10
+ }, {
+ bold: false,
+ textColor: 8,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "nonBold",
+
+ start: 10,
+ end: 17
+ }, {
+ bold: false,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "default",
+
+ start: 17,
+ end: 24
+ }];
+
+ const actual = parseStyle(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should toggle bold correctly", () => {
+ const input = "\x02bold\x02 \x02bold\x02";
+ const expected = [{
+ bold: true,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "bold",
+
+ start: 0,
+ end: 4
+ }, {
+ bold: false,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: " ",
+
+ start: 4,
+ end: 5
+ }, {
+ bold: true,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "bold",
+
+ start: 5,
+ end: 9
+ }];
+
+ const actual = parseStyle(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should reset all styles", () => {
+ const input = "\x02\x034\x16\x1d\x1ffull\x0fnone";
+ const expected = [{
+ bold: true,
+ textColor: 4,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: true,
+ italic: true,
+ underline: true,
+ text: "full",
+
+ start: 0,
+ end: 4
+ }, {
+ bold: false,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "none",
+
+ start: 4,
+ end: 8
+ }];
+
+ const actual = parseStyle(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should not emit empty fragments", () => {
+ const input = "\x031\x031,2\x031\x031,2\x031\x031,2\x03a";
+ const expected = [{
+ bold: false,
+ textColor: undefined,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: "a",
+
+ start: 0,
+ end: 1
+ }];
+
+ const actual = parseStyle(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should optimize fragments", () => {
+ const rawString = "oh hi test text";
+ const colorCode = "\x0312";
+ const input = colorCode + rawString.split("").join(colorCode);
+ const expected = [{
+ bold: false,
+ textColor: 12,
+ bgColor: undefined,
+ hexColor: undefined,
+ hexBgColor: undefined,
+ reverse: false,
+ italic: false,
+ underline: false,
+ text: rawString,
+
+ start: 0,
+ end: rawString.length
+ }];
+
+ const actual = parseStyle(input);
+
+ expect(actual).to.deep.equal(expected);
+ });
+});
diff --git a/test/client/js/libs/handlebars/localetimeTest.js b/test/client/js/libs/handlebars/localetimeTest.js
index 75debd8e..f5de1d51 100644
--- a/test/client/js/libs/handlebars/localetimeTest.js
+++ b/test/client/js/libs/handlebars/localetimeTest.js
@@ -4,10 +4,9 @@ const expect = require("chai").expect;
const localetime = require("../../../../../client/js/libs/handlebars/localetime");
describe("localetime Handlebars helper", () => {
-
it("should render a human-readable date", () => {
// 12PM in UTC time
- const date = new Date("2014-05-22T12:00:00");
+ const date = new Date("2014-05-22T12:00:00Z");
// Offset between UTC and local timezone
const offset = date.getTimezoneOffset() * 60 * 1000;
@@ -15,7 +14,6 @@ describe("localetime Handlebars helper", () => {
// Pretend local timezone is UTC by moving the clock of that offset
const time = date.getTime() + offset;
- expect(localetime(time)).to.equal("5/22/2014, 12:00:00 PM");
+ expect(localetime(time)).to.equal("22 May 2014, 12:00:00");
});
-
});
diff --git a/test/client/js/libs/handlebars/parse.js b/test/client/js/libs/handlebars/parse.js
new file mode 100644
index 00000000..700d5fee
--- /dev/null
+++ b/test/client/js/libs/handlebars/parse.js
@@ -0,0 +1,336 @@
+"use strict";
+
+const expect = require("chai").expect;
+const parse = require("../../../../../client/js/libs/handlebars/parse");
+
+describe("parse Handlebars helper", () => {
+ it("should not introduce xss", () => {
+ const testCases = [{
+ input: "#&">bug "
+ }];
+
+ const actual = testCases.map((testCase) => parse(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should skip control codes", () => {
+ const testCases = [{
+ input: "text\x01with\x04control\x05codes",
+ expected: "textwithcontrolcodes"
+ }];
+
+ const actual = testCases.map((testCase) => parse(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should find urls", () => {
+ const testCases = [{
+ input: "irc://freenode.net/thelounge",
+ expected:
+ "" +
+ "irc://freenode.net/thelounge" +
+ " "
+ }, {
+ input: "www.nooooooooooooooo.com",
+ expected:
+ "" +
+ "www.nooooooooooooooo.com" +
+ " "
+ }, {
+ input: "look at https://thelounge.github.io/ for more information",
+ expected:
+ "look at " +
+ "" +
+ "https://thelounge.github.io/" +
+ " " +
+ " for more information"
+ }, {
+ input: "use www.duckduckgo.com for privacy reasons",
+ expected:
+ "use " +
+ "" +
+ "www.duckduckgo.com" +
+ " " +
+ " for privacy reasons"
+ }, {
+ input: "svn+ssh://example.org",
+ expected:
+ "" +
+ "svn+ssh://example.org" +
+ " "
+ }];
+
+ const actual = testCases.map((testCase) => parse(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("url with a dot parsed correctly", () => {
+ const input =
+ "bonuspunkt: your URL parser misparses this URL: https://msdn.microsoft.com/en-us/library/windows/desktop/ms644989(v=vs.85).aspx";
+ const correctResult =
+ "bonuspunkt: your URL parser misparses this URL: " +
+ "" +
+ "https://msdn.microsoft.com/en-us/library/windows/desktop/ms644989(v=vs.85).aspx" +
+ " ";
+
+ const actual = parse(input);
+
+ expect(actual).to.deep.equal(correctResult);
+ });
+
+ it("should balance brackets", () => {
+ const testCases = [{
+ input: "",
+ expected:
+ "<" +
+ "" +
+ "https://theos.kyriasis.com/~kyrias/stats/archlinux.html" +
+ " " +
+ ">"
+ }, {
+ input: "abc (www.example.com)",
+ expected:
+ "abc (" +
+ "" +
+ "www.example.com" +
+ " " +
+ ")"
+ }, {
+ input: "http://example.com/Test_(Page)",
+ expected:
+ "" +
+ "http://example.com/Test_(Page)" +
+ " "
+ }, {
+ input: "www.example.com/Test_(Page)",
+ expected:
+ "" +
+ "www.example.com/Test_(Page)" +
+ " "
+ }];
+
+ const actual = testCases.map((testCase) => parse(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should not find urls", () => {
+ const testCases = [{
+ input: "text www. text",
+ expected: "text www. text"
+ }, {
+ input: "http://.",
+ expected: "http://."
+ }];
+
+ const actual = testCases.map((testCase) => parse(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should find channels", () => {
+ const testCases = [{
+ input: "#a",
+ expected:
+ "" +
+ "#a" +
+ " "
+ }, {
+ input: "#test",
+ expected:
+ "" +
+ "#test" +
+ " "
+ }, {
+ input: "#äöü",
+ expected:
+ "" +
+ "#äöü" +
+ " "
+ }, {
+ input: "inline #channel text",
+ expected:
+ "inline " +
+ "" +
+ "#channel" +
+ " " +
+ " text"
+ }, {
+ input: "#1,000",
+ expected:
+ "" +
+ "#1,000" +
+ " "
+ }, {
+ input: "@#a",
+ expected:
+ "@" +
+ "" +
+ "#a" +
+ " "
+ }];
+
+ const actual = testCases.map((testCase) => parse(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should not find channels", () => {
+ const testCases = [{
+ input: "hi#test",
+ expected: "hi#test"
+ }, {
+ input: "#",
+ expected: "#"
+ }];
+
+ const actual = testCases.map((testCase) => parse(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should style like mirc", () => {
+ const testCases = [{
+ input: "\x02bold",
+ expected: "bold "
+ }, {
+ input: "\x038yellowText",
+ expected: "yellowText "
+ }, {
+ input: "\x030,0white,white",
+ expected: "white,white "
+ }, {
+ input: "\x034,8yellowBGredText",
+ expected: "yellowBGredText "
+ }, {
+ input: "\x1ditalic",
+ expected: "italic "
+ }, {
+ input: "\x1funderline",
+ expected: "underline "
+ }, {
+ input: "\x02bold\x038yellow\x02nonBold\x03default",
+ expected:
+ "bold " +
+ "yellow " +
+ "nonBold " +
+ "default"
+ }, {
+ input: "\x02bold\x02 \x02bold\x02",
+ expected:
+ "bold " +
+ " " +
+ "bold "
+ }];
+
+ const actual = testCases.map((testCase) => parse(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should go bonkers like mirc", () => {
+ const testCases = [{
+ input: "\x02irc\x0f://\x1dfreenode.net\x0f/\x034,8thelounge",
+ expected:
+ "" +
+ "irc " +
+ "://" +
+ "freenode.net " +
+ "/" +
+ "thelounge " +
+ " "
+ }, {
+ input: "\x02#\x038,9thelounge",
+ expected:
+ "" +
+ "# " +
+ "thelounge " +
+ " "
+ }];
+
+ const actual = testCases.map((testCase) => parse(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should optimize generated html", () => {
+ const testCases = [{
+ input: "test \x0312#\x0312\x0312\"te\x0312st\x0312\x0312\x0312\x0312\x0312\x0312\x0312\x0312\x0312\x0312\x0312a",
+ expected:
+ "test " +
+ "" +
+ "#"testa " +
+ " "
+ }];
+
+ const actual = testCases.map((testCase) => parse(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should trim common protocols", () => {
+ const testCases = [{
+ input: "like..http://example.com",
+ expected:
+ "like.." +
+ "" +
+ "http://example.com" +
+ " "
+ }, {
+ input: "like..HTTP://example.com",
+ expected:
+ "like.." +
+ "" +
+ "HTTP://example.com" +
+ " "
+ }];
+
+ const actual = testCases.map((testCase) => parse(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should not find channel in fragment", () => {
+ const testCases = [{
+ input: "http://example.com/#hash",
+ expected:
+ "" +
+ "" +
+ "http://example.com/#hash" +
+ " "
+ }];
+
+ const actual = testCases.map((testCase) => parse(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+
+ it("should not overlap parts", () => {
+ const input = "Url: http://example.com/path Channel: ##channel";
+ const actual = parse(input);
+
+ expect(actual).to.equal(
+ "Url: http://example.com/path " +
+ "Channel: ##channel "
+ );
+ });
+});
diff --git a/test/fixtures/.gitignore b/test/fixtures/.gitignore
new file mode 100644
index 00000000..f58e9cac
--- /dev/null
+++ b/test/fixtures/.gitignore
@@ -0,0 +1,3 @@
+# files that may be generated by tests
+.lounge/storage/
+.lounge/vapid.json
diff --git a/test/fixtures/.lounge/config.js b/test/fixtures/.lounge/config.js
index c04fbb18..cbc7b926 100644
--- a/test/fixtures/.lounge/config.js
+++ b/test/fixtures/.lounge/config.js
@@ -2,6 +2,7 @@
var config = require("../../../defaults/config.js");
+config.public = true;
config.prefetch = true;
config.host = config.bind = "127.0.0.1";
config.port = 61337;
diff --git a/test/models/chan.js b/test/models/chan.js
index 1a051182..fa0482ae 100644
--- a/test/models/chan.js
+++ b/test/models/chan.js
@@ -3,9 +3,30 @@
var expect = require("chai").expect;
var Chan = require("../../src/models/chan");
+var Msg = require("../../src/models/msg");
var User = require("../../src/models/user");
describe("Chan", function() {
+ describe("#findMessage(id)", function() {
+ const chan = new Chan({
+ messages: [
+ new Msg(),
+ new Msg({
+ text: "Message to be found"
+ }),
+ new Msg()
+ ]
+ });
+
+ it("should find a message in the list of messages", function() {
+ expect(chan.findMessage(1).text).to.equal("Message to be found");
+ });
+
+ it("should not find a message that does not exist", function() {
+ expect(chan.findMessage(42)).to.be.undefined;
+ });
+ });
+
describe("#sortUsers(irc)", function() {
var network = {
network: {
@@ -23,7 +44,7 @@ describe("Chan", function() {
var prefixLookup = {};
- network.network.options.PREFIX.forEach(mode => {
+ network.network.options.PREFIX.forEach((mode) => {
prefixLookup[mode.mode] = mode.symbol;
});
@@ -32,9 +53,7 @@ describe("Chan", function() {
};
var getUserNames = function(chan) {
- return chan.users.map(function(u) {
- return u.name;
- });
+ return chan.users.map((u) => u.nick);
};
it("should sort a simple user list", function() {
diff --git a/test/models/msg.js b/test/models/msg.js
new file mode 100644
index 00000000..5a9a8ad8
--- /dev/null
+++ b/test/models/msg.js
@@ -0,0 +1,37 @@
+"use strict";
+
+const expect = require("chai").expect;
+
+const Msg = require("../../src/models/msg");
+
+describe("Msg", function() {
+ describe("#findPreview(link)", function() {
+ const msg = new Msg({
+ previews: [{
+ body: "",
+ head: "Example Domain",
+ link: "https://example.org/",
+ thumb: "",
+ type: "link",
+ shown: true,
+ }, {
+ body: "",
+ head: "The Lounge",
+ link: "https://thelounge.github.io/",
+ thumb: "",
+ type: "link",
+ shown: true,
+ }]
+ });
+
+ it("should find a preview given an existing link", function() {
+ expect(msg.findPreview("https://thelounge.github.io/").head)
+ .to.equal("The Lounge");
+ });
+
+ it("should not find a preview that does not exist", function() {
+ expect(msg.findPreview("https://github.com/thelounge/lounge"))
+ .to.be.undefined;
+ });
+ });
+});
diff --git a/test/models/network.js b/test/models/network.js
index fe56157d..1727580c 100644
--- a/test/models/network.js
+++ b/test/models/network.js
@@ -8,13 +8,15 @@ var Network = require("../../src/models/network");
describe("Network", function() {
describe("#export()", function() {
-
it("should produce an valid object", function() {
var network = new Network({
+ awayMessage: "I am away",
name: "networkName",
channels: [
- new Chan({name: "#thelounge"}),
- new Chan({name: "&foobar"}),
+ new Chan({name: "#thelounge", key: ""}),
+ new Chan({name: "&foobar", key: ""}),
+ new Chan({name: "#secret", key: "foo"}),
+ new Chan({name: "&secure", key: "bar"}),
new Chan({name: "Channel List", type: Chan.Type.SPECIAL}),
new Chan({name: "PrivateChat", type: Chan.Type.QUERY}),
]
@@ -22,6 +24,7 @@ describe("Network", function() {
network.setNick("chillin`");
expect(network.export()).to.deep.equal({
+ awayMessage: "I am away",
name: "networkName",
host: "",
port: 6667,
@@ -34,8 +37,10 @@ describe("Network", function() {
ip: null,
hostname: null,
channels: [
- {name: "#thelounge"},
- {name: "&foobar"},
+ {name: "#thelounge", key: ""},
+ {name: "&foobar", key: ""},
+ {name: "#secret", key: "foo"},
+ {name: "&secure", key: "bar"},
]
});
});
diff --git a/test/plugins/link.js b/test/plugins/link.js
index 4eab22f1..dfd73b0f 100644
--- a/test/plugins/link.js
+++ b/test/plugins/link.js
@@ -1,13 +1,17 @@
"use strict";
-var assert = require("assert");
-
-var util = require("../util");
-var link = require("../../src/plugins/irc-events/link.js");
+const path = require("path");
+const expect = require("chai").expect;
+const util = require("../util");
+const Helper = require("../../src/helper");
+const link = require("../../src/plugins/irc-events/link.js");
describe("Link plugin", function() {
before(function(done) {
this.app = util.createWebserver();
+ this.app.get("/real-test-image.png", function(req, res) {
+ res.sendFile(path.resolve(__dirname, "../../client/img/apple-touch-icon-120x120.png"));
+ });
this.connection = this.app.listen(9002, done);
});
@@ -18,22 +22,246 @@ describe("Link plugin", function() {
beforeEach(function() {
this.irc = util.createClient();
this.network = util.createNetwork();
+
+ Helper.config.prefetchStorage = false;
});
it("should be able to fetch basic information about URLs", function(done) {
- let message = this.irc.createMessage({
- text: "http://localhost:9002/basic"
+ const url = "http://localhost:9002/basic";
+ const message = this.irc.createMessage({
+ text: url
});
link(this.irc, this.network.channels[0], message);
+ expect(message.previews).to.deep.equal([{
+ body: "",
+ head: "",
+ link: url,
+ thumb: "",
+ type: "loading",
+ shown: true,
+ }]);
+
this.app.get("/basic", function(req, res) {
- res.send("test ");
+ res.send("test title test Google test relative image 404 image first title ");
+ });
+
+ this.app.get("/two", function(req, res) {
+ res.send("second title ");
+ });
+
+ const previews = [];
+
+ this.irc.on("msg:preview", function(data) {
+ if (data.preview.link === "http://localhost:9002/one") {
+ expect(data.preview.head).to.equal("first title");
+ previews[0] = data.preview;
+ } else if (data.preview.link === "http://localhost:9002/two") {
+ expect(data.preview.head).to.equal("second title");
+ previews[1] = data.preview;
+ }
+
+ if (previews[0] && previews[1]) {
+ expect(message.previews).to.eql(previews);
+ done();
+ }
+ });
+ });
});
diff --git a/test/plugins/storage.js b/test/plugins/storage.js
new file mode 100644
index 00000000..e372fe01
--- /dev/null
+++ b/test/plugins/storage.js
@@ -0,0 +1,68 @@
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+const crypto = require("crypto");
+const expect = require("chai").expect;
+const util = require("../util");
+const Helper = require("../../src/helper");
+const link = require("../../src/plugins/irc-events/link.js");
+
+describe("Image storage", function() {
+ const testImagePath = path.resolve(__dirname, "../../client/img/apple-touch-icon-120x120.png");
+ const correctImageHash = crypto.createHash("sha256").update(fs.readFileSync(testImagePath)).digest("hex");
+ const correctImageURL = `storage/${correctImageHash.substring(0, 2)}/${correctImageHash.substring(2, 4)}/${correctImageHash.substring(4)}.png`;
+
+ before(function(done) {
+ this.app = util.createWebserver();
+ this.app.get("/real-test-image.png", function(req, res) {
+ res.sendFile(testImagePath);
+ });
+ this.connection = this.app.listen(9003, done);
+ });
+
+ after(function(done) {
+ this.connection.close(done);
+ });
+
+ beforeEach(function() {
+ this.irc = util.createClient();
+ this.network = util.createNetwork();
+
+ Helper.config.prefetchStorage = true;
+ });
+
+ it("should store the thumbnail", function(done) {
+ const message = this.irc.createMessage({
+ text: "http://localhost:9003/thumb"
+ });
+
+ link(this.irc, this.network.channels[0], message);
+
+ this.app.get("/thumb", function(req, res) {
+ res.send("Google The Lounge ");
@@ -22,7 +22,7 @@ describe("Server", () => {
});
});
- it("should serve static content correctly", done => {
+ it("should serve static content correctly", (done) => {
request(webURL + "manifest.json", (error, response, body) => {
expect(error).to.be.null;
@@ -58,11 +58,11 @@ describe("Server", () => {
client.close();
});
- it("should emit authorized message", done => {
+ it("should emit authorized message", (done) => {
client.on("authorized", done);
});
- it("should create network", done => {
+ it("should create network", (done) => {
client.on("init", () => {
client.emit("conn", {
username: "test-user",
@@ -75,7 +75,7 @@ describe("Server", () => {
});
});
- client.on("network", data => {
+ client.on("network", (data) => {
expect(data.networks).to.be.an("array");
expect(data.networks).to.have.lengthOf(1);
expect(data.networks[0].realname).to.equal("The Lounge Test");
@@ -86,8 +86,8 @@ describe("Server", () => {
});
});
- it("should emit init message", done => {
- client.on("init", data => {
+ it("should emit init message", (done) => {
+ client.on("init", (data) => {
expect(data.active).to.equal(-1);
expect(data.networks).to.be.an("array");
expect(data.networks).to.be.empty;
diff --git a/test/tests/cleanircmessages.js b/test/tests/cleanircmessages.js
new file mode 100644
index 00000000..6a3877c6
--- /dev/null
+++ b/test/tests/cleanircmessages.js
@@ -0,0 +1,48 @@
+"use strict";
+
+const expect = require("chai").expect;
+const Helper = require("../../src/helper");
+
+describe("Clean IRC messages", function() {
+ it("should remove all formatting", function() {
+ const testCases = [{
+ input: "\x0303",
+ expected: ""
+ }, {
+ input: "\x02bold",
+ expected: "bold"
+ }, {
+ input: "\x038yellowText",
+ expected: "yellowText"
+ }, {
+ input: "\x030,0white,white",
+ expected: "white,white"
+ }, {
+ input: "\x034,8yellowBGredText",
+ expected: "yellowBGredText"
+ }, {
+ input: "\x1ditalic",
+ expected: "italic"
+ }, {
+ input: "\x1funderline",
+ expected: "underline"
+ }, {
+ input: "\x02bold\x038yellow\x02nonBold\x03default",
+ expected: "boldyellownonBolddefault"
+ }, {
+ input: "\x02bold\x02 \x02bold\x02",
+ expected: "bold bold"
+ }, {
+ input: "\x02irc\x0f://\x1dfreenode.net\x0f/\x034,8thelounge",
+ expected: "irc://freenode.net/thelounge"
+ }, {
+ input: "\x02#\x038,9thelounge",
+ expected: "#thelounge"
+ }];
+
+ const actual = testCases.map((testCase) => Helper.cleanIrcMessage(testCase.input));
+ const expected = testCases.map((testCase) => testCase.expected);
+
+ expect(actual).to.deep.equal(expected);
+ });
+});
diff --git a/test/tests/passwords.js b/test/tests/passwords.js
index d074477d..a5c1fa96 100644
--- a/test/tests/passwords.js
+++ b/test/tests/passwords.js
@@ -8,16 +8,29 @@ describe("Client passwords", function() {
it("hashed password should match", function() {
// Generated with third party tool to test implementation
- let comparedPassword = Helper.password.compare(inputPassword, "$2a$11$zrPPcfZ091WNfs6QrRHtQeUitlgrJcecfZhxOFiQs0FWw7TN3Q1oS");
+ const comparedPassword = Helper.password.compare(inputPassword, "$2a$11$zrPPcfZ091WNfs6QrRHtQeUitlgrJcecfZhxOFiQs0FWw7TN3Q1oS");
- expect(comparedPassword).to.be.true;
+ return comparedPassword.then((result) => {
+ expect(result).to.be.true;
+ });
+ });
+
+ it("wrong hashed password should not match", function() {
+ // Compare against a fake hash
+ const comparedPassword = Helper.password.compare(inputPassword, "$2a$11$zrPPcfZ091WRONGPASSWORDitlgrJcecfZhxOFiQs0FWw7TN3Q1oS");
+
+ return comparedPassword.then((result) => {
+ expect(result).to.be.false;
+ });
});
it("freshly hashed password should match", function() {
- let hashedPassword = Helper.password.hash(inputPassword);
- let comparedPassword = Helper.password.compare(inputPassword, hashedPassword);
+ const hashedPassword = Helper.password.hash(inputPassword);
+ const comparedPassword = Helper.password.compare(inputPassword, hashedPassword);
- expect(comparedPassword).to.be.true;
+ return comparedPassword.then((result) => {
+ expect(result).to.be.true;
+ });
});
it("shout passwords should be marked as old", function() {
diff --git a/test/util.js b/test/util.js
index 88e3b409..bee4c3af 100644
--- a/test/util.js
+++ b/test/util.js
@@ -20,7 +20,8 @@ MockClient.prototype.createMessage = function(opts) {
var message = _.extend({
text: "dummy message",
nick: "test-user",
- target: "#test-channel"
+ target: "#test-channel",
+ previews: [],
}, opts);
return message;
diff --git a/webpack.config.js b/webpack.config.js
index 09c36561..e1888588 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -7,17 +7,9 @@ const path = require("path");
// Common configuration
// ********************
-let config = {
+const config = {
entry: {
"js/bundle.js": path.resolve(__dirname, "client/js/lounge.js"),
- "js/bundle.vendor.js": [
- "handlebars/runtime",
- "jquery",
- "jquery-ui/ui/widgets/sortable",
- "mousetrap",
- "socket.io-client",
- "urijs",
- ],
},
devtool: "source-map",
output: {
@@ -36,7 +28,11 @@ let config = {
loader: "babel-loader",
options: {
presets: [
- "es2015"
+ ["env", {
+ targets: {
+ browsers: "last 2 versions"
+ }
+ }]
]
}
}
@@ -60,8 +56,17 @@ let config = {
},
]
},
+ externals: {
+ json3: "JSON", // socket.io uses json3.js, but we do not target any browsers that need it
+ },
plugins: [
- new webpack.optimize.CommonsChunkPlugin("js/bundle.vendor.js")
+ // socket.io uses debug, we don't need it
+ new webpack.NormalModuleReplacementPlugin(/debug/, path.resolve(__dirname, "scripts/noop.js")),
+ // automatically split all vendor dependencies into a separate bundle
+ new webpack.optimize.CommonsChunkPlugin({
+ name: "js/bundle.vendor.js",
+ minChunks: (module) => module.context && module.context.indexOf("node_modules") !== -1
+ })
]
};
@@ -71,6 +76,7 @@ let config = {
if (process.env.NODE_ENV === "production") {
config.plugins.push(new webpack.optimize.UglifyJsPlugin({
+ sourceMap: true,
comments: false
}));
} else {
+
+### Added
+
+- Add `title` attributes to previews ([#1291](https://github.com/thelounge/lounge/pull/1291) by [@astorije](https://github.com/astorije))
+- Allow opting out of autocomplete ([#1294](https://github.com/thelounge/lounge/pull/1294) by [@awalgarg](https://github.com/awalgarg))
+- Add collapse/expand commands to toggle all previews ([#1309](https://github.com/thelounge/lounge/pull/1309) by [@astorije](https://github.com/astorije))
+- An image viewer popup for thumbnails and image previews, with buttons to previous/next images ([#1325](https://github.com/thelounge/lounge/pull/1325), [#1365](https://github.com/thelounge/lounge/pull/1365), [#1368](https://github.com/thelounge/lounge/pull/1368), [#1367](https://github.com/thelounge/lounge/pull/1367) by [@astorije](https://github.com/astorije), [#1370](https://github.com/thelounge/lounge/pull/1370) by [@xPaw](https://github.com/xPaw))
+- Store preview images on disk for privacy, security and caching ([#1307](https://github.com/thelounge/lounge/pull/1307) by [@xPaw](https://github.com/xPaw))
+- Emoji fuzzy-matching ([#1334](https://github.com/thelounge/lounge/pull/1334) by [@MaxLeiter](https://github.com/MaxLeiter))
+
+### Changed
+
+- Check status code in link prefetcher ([#1260](https://github.com/thelounge/lounge/pull/1260) by [@xPaw](https://github.com/xPaw))
+- Check `og:description` before `description` tag in previews ([#1255](https://github.com/thelounge/lounge/pull/1255) by [@xPaw](https://github.com/xPaw))
+- Check `og:title` before `title` tag in previews ([#1256](https://github.com/thelounge/lounge/pull/1256) by [@xPaw](https://github.com/xPaw))
+- Do not display preview if there is nothing to preview ([#1273](https://github.com/thelounge/lounge/pull/1273) by [@xPaw](https://github.com/xPaw))
+- Increase max downloaded bytes for link preview ([#1274](https://github.com/thelounge/lounge/pull/1274) by [@xPaw](https://github.com/xPaw))
+- Refactor link previews ([#1276](https://github.com/thelounge/lounge/pull/1276) by [@xPaw](https://github.com/xPaw), [#1378](https://github.com/thelounge/lounge/pull/1378) by [@astorije](https://github.com/astorije))
+- Support multiple previews per message ([#1303](https://github.com/thelounge/lounge/pull/1303), [#1324](https://github.com/thelounge/lounge/pull/1324), [#1335](https://github.com/thelounge/lounge/pull/1335), [#1348](https://github.com/thelounge/lounge/pull/1348), [#1347](https://github.com/thelounge/lounge/pull/1347), [#1353](https://github.com/thelounge/lounge/pull/1353) by [@astorije](https://github.com/astorije))
+- Add `mask-icon` for pinned safari tab ([#1329](https://github.com/thelounge/lounge/pull/1329) by [@MaxLeiter](https://github.com/MaxLeiter))
+- Lazily load user list in channels on init, keep autocompletion sort on server ([#1194](https://github.com/thelounge/lounge/pull/1194) by [@xPaw](https://github.com/xPaw))
+- Keep track of preview visibility on the server so it persists at page reload ([#1366](https://github.com/thelounge/lounge/pull/1366) by [@astorije](https://github.com/astorije))
+- Bump express and socket.io to their latest patch versions ([#1312](https://github.com/thelounge/lounge/pull/1312) by [@astorije](https://github.com/astorije))
+- Update production dependencies to their latest versions, by [Greenkeeper](https://greenkeeper.io/) 🚀:
+ - `commander` ([#1257](https://github.com/thelounge/lounge/pull/1257), [#1292](https://github.com/thelounge/lounge/pull/1292))
+ - `jquery-textcomplete` ([#1279](https://github.com/thelounge/lounge/pull/1279), [#1321](https://github.com/thelounge/lounge/pull/1321))
+ - `fs-extra` ([#1332](https://github.com/thelounge/lounge/pull/1332))
+ - `semver` ([#1369](https://github.com/thelounge/lounge/pull/1369))
+
+### Removed
+
+- Remove hostname prettifier ([#1306](https://github.com/thelounge/lounge/pull/1306) by [@xPaw](https://github.com/xPaw))
+- Remove `X-UA-Compatible` ([#1328](https://github.com/thelounge/lounge/pull/1328) by [@xPaw](https://github.com/xPaw))
+
+### Fixed
+
+- Make sure thumbnail is a valid image in previews ([#1254](https://github.com/thelounge/lounge/pull/1254) by [@xPaw](https://github.com/xPaw))
+- Parse `X-Forwarded-For` header correctly ([#1202](https://github.com/thelounge/lounge/pull/1202) by [@xPaw](https://github.com/xPaw))
+- Do not truncate link previews if viewport can fit more text ([#1293](https://github.com/thelounge/lounge/pull/1293) by [@xPaw](https://github.com/xPaw))
+- Fix too big line height previews text on Crypto ([#1296](https://github.com/thelounge/lounge/pull/1296) by [@astorije](https://github.com/astorije))
+- Fix background color contrast on Zenburn previews ([#1297](https://github.com/thelounge/lounge/pull/1297) by [@astorije](https://github.com/astorije))
+- Fix jumps when toggling link preview ([#1298](https://github.com/thelounge/lounge/pull/1298) by [@xPaw](https://github.com/xPaw))
+- Fix losing network settings ([#1305](https://github.com/thelounge/lounge/pull/1305) by [@xPaw](https://github.com/xPaw))
+- Fix missing transitions ([#1314](https://github.com/thelounge/lounge/pull/1314), [#1336](https://github.com/thelounge/lounge/pull/1336), [#1374](https://github.com/thelounge/lounge/pull/1374) by [@astorije](https://github.com/astorije), [#1117](https://github.com/thelounge/lounge/pull/1117) by [@bews](https://github.com/bews))
+- Fix incorrect mode on kick target ([#1352](https://github.com/thelounge/lounge/pull/1352) by [@xPaw](https://github.com/xPaw))
+- Correctly show whitespace and newlines in messages ([#1242](https://github.com/thelounge/lounge/pull/1242) by [@starquake](https://github.com/starquake), [#1359](https://github.com/thelounge/lounge/pull/1359) by [@xPaw](https://github.com/xPaw))
+- Hide overflow on entire message row ([#1361](https://github.com/thelounge/lounge/pull/1361) by [@starquake](https://github.com/starquake))
+- Fix link previews not truncating correctly ([#1363](https://github.com/thelounge/lounge/pull/1363) by [@xPaw](https://github.com/xPaw))
+
+### Documentation
+
+In the main repository:
+
+- Remove mention in CHANGELOG that The Lounge uses Semantic Versioning ([#1269](https://github.com/thelounge/lounge/pull/1269) by [@astorije](https://github.com/astorije))
+- Remove `devDependencies` badge on README ([#1267](https://github.com/thelounge/lounge/pull/1267) by [@astorije](https://github.com/astorije))
+- Reword link preview settings to better match reality ([#1310](https://github.com/thelounge/lounge/pull/1310) by [@astorije](https://github.com/astorije))
+- Update screenshot in README ([#1326](https://github.com/thelounge/lounge/pull/1326) by [@MaxLeiter](https://github.com/MaxLeiter))
+- Update README badge to new demo URL ([#1345](https://github.com/thelounge/lounge/pull/1345) by [@MaxLeiter](https://github.com/MaxLeiter))
+- Update README for when to run `npm run build` ([#1319](https://github.com/thelounge/lounge/pull/1319) by [@MaxLeiter](https://github.com/MaxLeiter))
+
+On the website:
+
+- Update demo URL to new demo ([#70](https://github.com/thelounge/thelounge.github.io/pull/70) by [@MaxLeiter](https://github.com/MaxLeiter))
+
+### Internals
+
+- Move nickname rendering to a single template ([#1252](https://github.com/thelounge/lounge/pull/1252) by [@xPaw](https://github.com/xPaw))
+- Ignore all dotfiles in `.npmignore` ([#1287](https://github.com/thelounge/lounge/pull/1287) by [@xPaw](https://github.com/xPaw))
+- Add `.npmrc` file with `save-exact` set to `true` so packages are saved already pinned ([#1284](https://github.com/thelounge/lounge/pull/1284) by [@MaxLeiter](https://github.com/MaxLeiter))
+- Do not hardcode vendor bundles in webpack configuration ([#1280](https://github.com/thelounge/lounge/pull/1280) by [@xPaw](https://github.com/xPaw))
+- Prepare for `SOURCE` CTCP command, when `irc-framework` supports it ([#1284](https://github.com/thelounge/lounge/pull/1284) by [@MaxLeiter](https://github.com/MaxLeiter))
+- Change "Show older messages" to use `id` rather than count ([#1354](https://github.com/thelounge/lounge/pull/1354) by [@YaManicKill](https://github.com/YaManicKill))
+- Update development dependencies to their latest versions, by [Greenkeeper](https://greenkeeper.io/) 🚀:
+ - `eslint` ([#1264](https://github.com/thelounge/lounge/pull/1264), [#1272](https://github.com/thelounge/lounge/pull/1272), [#1315](https://github.com/thelounge/lounge/pull/1315), [#1362](https://github.com/thelounge/lounge/pull/1362))
+ - `nyc` ([#1277](https://github.com/thelounge/lounge/pull/1277))
+ - `stylelint` ([#1278](https://github.com/thelounge/lounge/pull/1278), [#1320](https://github.com/thelounge/lounge/pull/1320), [#1340](https://github.com/thelounge/lounge/pull/1340))
+ - `babel-loader` ([#1282](https://github.com/thelounge/lounge/pull/1282))
+ - `babel-preset-env` ([#1295](https://github.com/thelounge/lounge/pull/1295))
+ - `webpack` ([#1308](https://github.com/thelounge/lounge/pull/1308), [#1322](https://github.com/thelounge/lounge/pull/1322), [#1338](https://github.com/thelounge/lounge/pull/1338), [#1371](https://github.com/thelounge/lounge/pull/1371), [#1376](https://github.com/thelounge/lounge/pull/1376))
+ - `chai` ([#1323](https://github.com/thelounge/lounge/pull/1323))
+
+## v2.4.0-rc.2 - 2017-07-27 [Pre-release]
+
+[See the full changelog](https://github.com/thelounge/lounge/compare/v2.4.0-rc.1...v2.4.0-rc.2)
+
+This is a release candidate for v2.4.0 to ensure maximum stability for public release.
+Please refer to the commit list given above for a complete list of changes, or wait for the stable release to get a thoroughly prepared change log entry.
+
+As with all pre-releases, this version requires explicit use of the `next` tag to be installed:
+
+```sh
+npm install -g thelounge@next
+```
+
+## v2.4.0-rc.1 - 2017-07-27 [Pre-release]
+
+[See the full changelog](https://github.com/thelounge/lounge/compare/v2.3.2...v2.4.0-rc.1)
+
+This is a release candidate for v2.4.0 to ensure maximum stability for public release.
+Please refer to the commit list given above for a complete list of changes, or wait for the stable release to get a thoroughly prepared change log entry.
+
+As with all pre-releases, this version requires explicit use of the `next` tag to be installed:
+
+```sh
+npm install -g thelounge@next
+```
+
+## v2.3.2 - 2017-06-25
+
+For more details, [see the full changelog](https://github.com/thelounge/lounge/compare/v2.3.1...v2.3.2) and [milestone](https://github.com/thelounge/lounge/milestone/24?closed=1).
+
+This patch releases brings a lot of fixes and small improvements here and there, as well as the ability to display seconds in timestamps, a long-awaited feature!
+
+### Added
+
+- Add a client option to display seconds in timestamps ([#1141](https://github.com/thelounge/lounge/pull/1141) by [@bews](https://github.com/bews))
+- Add "Reload page" button when the client fails to load ([#1150](https://github.com/thelounge/lounge/pull/1150) by [@bews](https://github.com/bews))
+
+### Changed
+
+- Treat `click` as a read activity ([#1214](https://github.com/thelounge/lounge/pull/1214) by [@xPaw](https://github.com/xPaw))
+- Fade out for long nicks ([#1158](https://github.com/thelounge/lounge/pull/1158) by [@bews](https://github.com/bews), [#1253](https://github.com/thelounge/lounge/pull/1253) by [@xPaw](https://github.com/xPaw))
+- Include trickery to reduce paints and improve performance ([#1120](https://github.com/thelounge/lounge/pull/1120) by [@xPaw](https://github.com/xPaw), [#1083](https://github.com/thelounge/lounge/pull/1083) by [@bews](https://github.com/bews))
+- Make everything un-selectable by default ([#1233](https://github.com/thelounge/lounge/pull/1233) by [@xPaw](https://github.com/xPaw))
+- Handle images with unknown size in prefetch ([#1246](https://github.com/thelounge/lounge/pull/1246) by [@bews](https://github.com/bews))
+- Update production dependencies to their latest versions, by [Greenkeeper](https://greenkeeper.io/) 🚀:
+ - `spdy` ([#1184](https://github.com/thelounge/lounge/pull/1184))
+
+### Fixed
+
+- Stop showing the unread messages marker when `joins`/`parts`/`quits`/etc. are hidden ([#1016](https://github.com/thelounge/lounge/pull/1016) by [@swordbeta](https://github.com/swordbeta))
+- Correctly finish scroll animation when using page keys ([#1244](https://github.com/thelounge/lounge/pull/1244) by [@xPaw](https://github.com/xPaw))
+- Hide link time element on small devices ([#1261](https://github.com/thelounge/lounge/pull/1261) by [@xPaw](https://github.com/xPaw))
+- Fix MOTD underline in Safari ([#1217](https://github.com/thelounge/lounge/pull/1217) by [@MaxLeiter](https://github.com/MaxLeiter))
+
+### Documentation
+
+In the main repository:
+
+- Clarify kilobyte ambiguity ([#1248](https://github.com/thelounge/lounge/pull/1248) by [@xPaw](https://github.com/xPaw))
+- Fix stray end tag ([#1251](https://github.com/thelounge/lounge/pull/1251) by [@xPaw](https://github.com/xPaw))
+
+### Internals
+
+- Update to ESLint 4 and enforce extra rules ([#1231](https://github.com/thelounge/lounge/pull/1231) by [@xPaw](https://github.com/xPaw))
+- Improve the PR tester script a bit ([#1240](https://github.com/thelounge/lounge/pull/1240) by [@astorije](https://github.com/astorije))
+- Add modules for socket events ([#1175](https://github.com/thelounge/lounge/pull/1175) by [@YaManicKill](https://github.com/YaManicKill))
+- Ignore `package-lock.json` ([#1247](https://github.com/thelounge/lounge/pull/1247) by [@xPaw](https://github.com/xPaw))
+- Use `stylelint-config-standard` ([#1249](https://github.com/thelounge/lounge/pull/1249) by [@xPaw](https://github.com/xPaw))
+- Update development dependencies to their latest versions, by [Greenkeeper](https://greenkeeper.io/) 🚀:
+ - `babel-core` ([#1212](https://github.com/thelounge/lounge/pull/1212))
+ - `babel-loader` ([#1245](https://github.com/thelounge/lounge/pull/1245))
+ - `nyc` ([#1198](https://github.com/thelounge/lounge/pull/1198))
+ - `stylelint` ([#1215](https://github.com/thelounge/lounge/pull/1215), [#1230](https://github.com/thelounge/lounge/pull/1230))
+ - `chai` ([#1206](https://github.com/thelounge/lounge/pull/1206))
+ - `webpack` ([#1238](https://github.com/thelounge/lounge/pull/1238))
+
+## v2.3.1 - 2017-06-09
+
+For more details, [see the full changelog](https://github.com/thelounge/lounge/compare/v2.3.0...v2.3.1) and [milestone](https://github.com/thelounge/lounge/milestone/23?closed=1).
+
+This release mostly fixes a few bugs, as listed below.
+
+### Changed
+
+- Keep original `