paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-04 05:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added whitelist zulip server

Browse Source
This commit is contained in:
akashnimare
2017-11-23 22:38:28 +05:30
parent 6d10291a87
commit ed590c26e3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/renderer/js/utils/domain-util.js
View File

@@ -115,6 +115,10 @@ class DomainUtil {
'Error: unable to verify the first certificate', 'Error: unable to verify the first certificate',
'Error: unable to get local issuer certificate' 'Error: unable to get local issuer certificate'
]; ];
// If the domain contains following strings we just bypass the server
const whitelistDomains = [
'zulipdev.org'
];
if (!error && response.statusCode !== 404) { if (!error && response.statusCode !== 404) {
// Correct // Correct
this.getServerSettings(domain).then(serverSettings => { this.getServerSettings(domain).then(serverSettings => {
@@ -122,7 +126,7 @@ class DomainUtil {
}, () => { }, () => {
resolve(serverConf); resolve(serverConf);
}); });
} else if (certsError.indexOf(error.toString()) >= 0) { } else if (domain.indexOf(whitelistDomains) >= 0 || certsError.indexOf(error.toString()) >= 0) {
if (silent) { if (silent) {
this.getServerSettings(domain).then(serverSettings => { this.getServerSettings(domain).then(serverSettings => {
resolve(serverSettings); resolve(serverSettings);