Merge pull request thelounge#4093 from thelounge/xpaw/fix-4092

Do not generate and send client certificate unless SASL EXTERNAL is requested
JahangirM · Nov 4, 2020 · 2bbad44 · 2bbad44
2 parents 69986b3 + a76e75f
commit 2bbad44
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/models/network.js b/src/models/network.js
@@ -204,15 +204,15 @@ Network.prototype.setIrcFrameworkOptions = function (client) {
 	this.irc.options.tls = this.tls;
 	this.irc.options.rejectUnauthorized = this.rejectUnauthorized;
 	this.irc.options.webirc = this.createWebIrc(client);
-
-	this.irc.options.client_certificate = this.tls ? ClientCertificate.get(this.uuid) : null;
+	this.irc.options.client_certificate = null;
 
 	if (!this.sasl) {
 		delete this.irc.options.sasl_mechanism;
 		delete this.irc.options.account;
 	} else if (this.sasl === "external") {
 		this.irc.options.sasl_mechanism = "EXTERNAL";
 		this.irc.options.account = {};
+		this.irc.options.client_certificate = ClientCertificate.get(this.uuid);
 	} else if (this.sasl === "plain") {
 		delete this.irc.options.sasl_mechanism;
 		this.irc.options.account = {