-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
quassel-web: Work around SSL bug on Ubuntu 20.04+
Work around SSL/TLS bug on Ubuntu 20.04+ by disabling the "securecore" setting. As the core connection is via 'localhost', the potential impact is reduced. See magne4000/quassel-webserver#285 Also work around a Quassel Webserver bug where the "securecore" setting does not get applied by default if set to false. This can be dropped once the upstream pull request is merged. See magne4000/quassel-webserver#290
- Loading branch information
1 parent
90223bd
commit c433a54
Showing
3 changed files
with
69 additions
and
0 deletions.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
salt/files/server/chat/quassel/web/quassel-webserver-pull-290-fix-defaults-securecore.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
From bb608b4115c6d1f0741c8863616b36d50cb6e1ec Mon Sep 17 00:00:00 2001 | ||
From: Shane Synan <[email protected]> | ||
Date: Mon, 25 Jan 2021 19:07:13 -0500 | ||
Subject: [PATCH] settings: Fix ignoring 'securecore: false' default | ||
|
||
Don't use || to set default value for "securecore", instead check | ||
the type of the variable. Otherwise, false evaluates to, well, false, | ||
and "securecore" can never be defaulted to false. This fixes ignoring | ||
the custom default setting "securecore: false" in settings-user.json | ||
--- | ||
public/javascripts/angular-init.js | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/public/javascripts/angular-init.js b/public/javascripts/angular-init.js | ||
index 1c8fb2d..ee2df6c 100644 | ||
--- a/public/javascripts/angular-init.js | ||
+++ b/public/javascripts/angular-init.js | ||
@@ -157,7 +157,7 @@ angular.module('quassel', ['ngQuassel', 'ngAria', 'ngSanitize', 'ui.bootstrap', | ||
set('port', data.settings.port); | ||
set('initialBacklogLimit', data.settings.initialBacklogLimit); | ||
set('backlogLimit', data.settings.backlogLimit); | ||
- set('securecore', data.settings.securecore || true); | ||
+ set('securecore', (typeof data.settings.securecore === 'boolean' ? data.settings.securecore : true)); | ||
set('theme', data.settings.theme); | ||
set('perchathistory', data.settings.perchathistory); | ||
set('displayfullhostmask', data.settings.displayfullhostmask); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters