Merge pull request zulip#141 from Lplenka/Certificate_Issue

✨ Added support for self-signed certificate fixes zulip#126
anshumanv · Apr 27, 2017 · 3dade76 · 3dade76
2 parents 616bc0f + 7b3c7ba
commit 3dade76
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/app/main/index.js b/app/main/index.js
@@ -67,7 +67,13 @@ function serverError(targetURL) {
 			}
 		});
 		req.on('error', e => {
-			console.error(e);
+			if (e.toString().indexOf('Error: self signed certificate') >= 0) {
+				const url = targetURL.replace(/^https?:\/\//, '');
+				console.log('Server StatusCode:', 200);
+				console.log('You are connected to:', url);
+			} else {
+				console.error(e);
+			}
 		});
 		req.end();
 	} else if (data.domain) {
@@ -256,9 +262,27 @@ function createMainWindow() {
 // app.commandLine.appendSwitch('ignore-certificate-errors', 'true');
 
 // For self-signed certificate
+ipc.on('certificate-err', (e, domain) => {
+	const detail = `URL: ${domain} \n Error: Self-Signed Certificate`;
+	dialog.showMessageBox(mainWindow, {
+		title: 'Certificate error',
+		message: `Do you trust certificate from ${domain}?`,
+		// eslint-disable-next-line object-shorthand
+		detail: detail,
+		type: 'warning',
+		buttons: ['Yes', 'No'],
+		cancelId: 1
+		// eslint-disable-next-line object-shorthand
+	}, response => {
+		if (response === 0) {
+			// eslint-disable-next-line object-shorthand
+			db.push('/domain', domain);
+			mainWindow.loadURL(domain);
+		}
+	});
+});
 // eslint-disable-next-line max-params
 app.on('certificate-error', (event, webContents, url, error, certificate, callback) => {
-	console.log('warning: ', url, ' certificate-error');
 	event.preventDefault();
 	callback(true);
 });

diff --git a/app/renderer/index.html b/app/renderer/index.html
@@ -20,8 +20,7 @@ <h1>Zulip Login</h1>
                             Zulip Server URL
                         </label>
                         <input type="text" id="url"  autofocus="autofocus" spellcheck="false" placeholder="Server URL">
-                        <button type="submit" id="main" class="btn-primary btn-large" value="Submit"
-                                onclick="addDomain();">Connect</button>
+                        <button type="submit" id="main" class="btn-primary btn-large" value="Submit">Connect</button>
                         <p id="error"></p>
                     </form>
                 </div>

diff --git a/app/renderer/js/domain.js b/app/renderer/js/domain.js
@@ -59,6 +59,9 @@ window.addDomain = function () {
 					$el.main.innerHTML = 'Connect';
 					db.push('/domain', domain);
 					ipcRenderer.send('new-domain', domain);
+				} else if (error.toString().indexOf('Error: self signed certificate') >= 0) {
+					$el.main.innerHTML = 'Connect';
+					ipcRenderer.send('certificate-err', domain);
 				} else {
 					$el.main.innerHTML = 'Connect';
 					displayError('Not a valid Zulip server');

diff --git a/app/renderer/js/pref.js b/app/renderer/js/pref.js
@@ -20,9 +20,7 @@ window.prefDomain = function () {
 	const ipcRenderer = require('electron').ipcRenderer;
 	const JsonDB = require('node-json-db');
 	// eslint-disable-next-line import/no-extraneous-dependencies
-	const {
-		app
-	} = require('electron').remote;
+	const {app} = require('electron').remote;
 
 	const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
 
@@ -57,6 +55,10 @@ window.prefDomain = function () {
 					document.getElementById('urladded').innerHTML = 'Switched to ' + newDomain;
 					db.push('/domain', domain);
 					ipcRenderer.send('new-domain', domain);
+				} else if (error.toString().indexOf('Error: self signed certificate') >= 0) {
+					document.getElementById('main').innerHTML = 'Switch';
+					ipcRenderer.send('certificate-err', domain);
+					document.getElementById('urladded').innerHTML = 'Switched to ' + newDomain;
 				} else {
 					document.getElementById('main').innerHTML = 'Switch';
 					document.getElementById('urladded').innerHTML = 'Not a valid Zulip Server.';