Merge branch 'develop' into alpha

Author: jarrodek

.travis.yml

@@ -35,6 +35,5 @@ env:
   - secure: rBRZZG8d933qFaCaakId+GMrZFHVPHr1hJtpy/2UN8wvqvnbo9ChHGer79cfhohc23Ligx+OhdSLSVl+bC4uesVX1kUssiFUFFDcYciEsJHplO1CtvPkApsEUJL3cndrvYrA52HPOmhtpuh74Npxdn8LrPyiNnLCTdNSt86dp/w8ve2N2ZI3CSEO9nG9L+rMqEkGC5fLQxXNsD4bJoDomg9tntXQYO2anyLnHa767SkbsbfHmrrF5BRPcX8i6/ZPtqG1hOnD72rHJwN0mpLJVsL7htbs9iyMkMciQn5j+BTfV00o51Id3rR0AxrAJUPfb+62i3s7vwJh9cyOTSJ7tBQSxe5EGa0gUlikHJ3elhDFylZXQM/Tmch5yJ0btNWQTsJI7ZwWe+RImDmPtWcNijxU144VdLq8nPz7rBuV4ouIgnnLA1QUT9IjS9vR09xa0DBH2Amjoea2bj7wHj86gfb/ECMkTfRysLrs+DVysC0pqAOONuvz6mBF7OLvK7uN08w6LG3VwwHJ28K52cudiHNv1NXv9hwWxPzizg3VG6WhTlA8y/wSoNDf3Q0UROfPouwx+AM+ojpM5gYVApAwHZvAjsn/Nu+lMQVT3xfnnr+SehTJprK+9Yv1HAFMJNFKbN71w7pdUx05B/YWxMxElg6Pp8s6mlntrsFbCNJ6lCo=
   - secure: os+mH9yyl753fv3ro3mat5wzmw6BpHIOva4JFF3BtCUqZ6wIZgUyS9TwglEwpVuS1DGzzEBqwMF83azvJ63cdlLrSAkfVPtqfWxnhHQeCEN9vy1n0PBFaYOkteeng1ltHdiwSq9wNNNeiYT3cHPWhUwZM/kGelGm/AAGlQn6ZQXJp3c0g9xjnynaMpVpvRXOiBwKW4iWvIhSPDNLVJRzyGB2laZAwQFkiyA6+d3yrsMz4iJmqpicedBg1JrSe7ssIOjZ11Ypa8D875BN6hQQFCEuFr/vtEhrnettvEkmVBD83eVA9hTj5CyqlYf3nwY10kQ5VoiFuDIv67AFI+7Ty7+OSKU9TjItdXfyoGjLF+9k1NEFCDR+MvGUWLx9VV2QEw8WJ8N3ngmchk0vCqgQ/bSB1K9qCTlDiQfvGtjmnMWdG2LxewIRQlQWueYhMOvDvDEECmAYlvn32TY/w9ay3wp/uxZkJZuIDv+plE6GK+QMr3EuR/0p6RpQnpNljDbXOYHxBQ9kwbsanUoecgXjPypZkulpAPSwICMQ7SO07rJEdGZqaGquraeiERT91t+7j/2+c3I3h5YTj2IYj4EdD+0a9Dt8cO3skfw3Y4r/ThYKtK/TLpShtCQWGPGpOpGgjhTRIDb8wr612Fsc45pD+VgrtH1ZA4pr7NyApXpvJQE=
 before_install:
-- openssl aes-256-cbc -K $encrypted_cb8606543db7_key -iv $encrypted_cb8606543db7_iv
-  -in certs.tar.enc -out certs.tar -d
+- openssl aes-256-cbc -K $encrypted_cb8606543db7_key -iv $encrypted_cb8606543db7_iv -in certs.tar.enc -out certs.tar -d
 - tar xvf certs.tar

README.md

@@ -12,7 +12,7 @@ Find an installer for your platform under "Assets" section.
 
 ![Assets section for a release](.gitbook/assets/image%20%2843%29.png)
 
-For example, for Windows you would download `arc-setup.exe`. For MacOS download `arc-13.0.7.dmg`.
+For example, for Windows you would download [`arc-setup.exe`](https://github.com/advanced-rest-client/arc-electron/releases/latest/download/arc-setup.exe). For MacOS download `arc-13.0.7.dmg`.
 
 {% hint style="info" %}
 Version number may be different to the one in the screen shoot. For normal use, please, download latest stable version.

app.js

@@ -98,6 +98,7 @@ class ArcInit {
     ipc.on('popup-app-menu-opened', this._popupMenuOpened.bind(this));
     ipc.on('popup-app-menu-closed', this._popupMenuClosed.bind(this));
     ipc.on('system-theme-changed', this._systemThemeChangeHandler.bind(this));
+    document.body.addEventListener('settings-changed', this._settingsHandler.bind(this));
   }
   /**
    * Requests initial state information from the main process for current
@@ -125,29 +126,34 @@ class ArcInit {
     }
     this.initConfig = initConfig;
     window.ArcConfig.initConfig = initConfig;
-    await this.initApp();
-    await this.upgradeApp();
+
+    let cnf;
+    try {
+      cnf = await this.prefProxy.load();
+      await this._createApp(cnf);
+    } catch (e) {
+      this.reportFatalError(e);
+      throw e;
+    }
+    if (typeof cnf.ignoreSessionCookies === 'boolean') {
+      this.cookieBridge.ignoreSessionCookies = cnf.ignoreSessionCookies;
+    }
+    await this.initApp(cnf);
+    await this.upgradeApp(cnf);
     await this.processInitialPath();
     await this.removeLoader();
     console.log('Application window is now ready.');
   }
   /**
    * Initialized the application when window is ready.
    *
+   * @param {Object} cnf Current qapplication configuration
    * @return {Promise}
    */
-  async initApp() {
+  async initApp(cnf) {
     // console.info('Initializing renderer window...');
     this.workspaceManager = new WorkspaceManager(this.initConfig.workspaceFile);
     this.workspaceManager.observe();
-    let cnf;
-    try {
-      cnf = await this.prefProxy.load();
-      await this._createApp(cnf);
-    } catch (e) {
-      this.reportFatalError(e);
-      throw e;
-    }
     if (this.initConfig.darkMode) {
       cnf.theme = '@advanced-rest-client/arc-electron-dark-theme';
     }
@@ -431,8 +437,7 @@ class ArcInit {
     }, 150);
   }
 
-  async upgradeApp() {
-    const cnf = await this.prefProxy.load();
+  async upgradeApp(cnf) {
     const inst = new UpgradeHelper(cnf.upgrades);
     const upgrades = inst.getUpgrades();
     if (!upgrades || upgrades.length === 0) {
@@ -530,6 +535,21 @@ class ArcInit {
       console.error(e);
     }
   }
+
+  /**
+   * A handler for settings change event.
+   * Performs actions that are important when a confic object has changed.
+   *
+   * @param {CustomEvent} e An event dispatched by preferences proxy.
+   */
+  _settingsHandler(e) {
+    const { name, value } = e.detail;
+    switch (name) {
+      case 'ignoreSessionCookies':
+        this.cookieBridge.ignoreSessionCookies = value;
+        break;
+    }
+  }
 }
 
 const initScript = new ArcInit();

certs.tar.enc

@@ -1,7 +1,10 @@
 import express from 'express';
 import session from 'express-session';
+import fs from 'fs';
+import path from 'path';
+import http from 'http';
+import https from 'https';
 import apiRouter from './routes.js';
-
 /* eslint-disable no-console */
 
 const app = express();
@@ -21,17 +24,25 @@ const sessionConfig = {
 app.use(session(sessionConfig));
 app.use('/v1', apiRouter);
 
-const portStr = process.argv.slice(2).find((arg) => arg.indexOf('--PORT') === 0);
-let port;
-if (!isNaN(portStr)) {
-  port = Number(portStr);
-} else {
-  port = 8080;
-}
+const findOpt = (name) => process.argv.slice(2).find((arg) => arg.indexOf(`--${name}`) === 0);
+const findPortValue = (name, defaultValue) => {
+  const str = findOpt(name);
+  if (isNaN(str)) {
+    return defaultValue;
+  }
+  return Number(str);
+};
+
+const port = findPortValue('PORT', 3080);
+const portSsl = findPortValue('SSLPORT', 3443);
+
 
 // Basic 404 handler
 app.use((req, res) => {
-  res.status(404).send('Not Found');
+  res.status(404).send({
+    error: true,
+    message: `Route ${req.url} not found`
+  });
 });
 
 // Basic error handler
@@ -43,7 +54,17 @@ app.use((err, req, res) => {
   });
 });
 
-const server = app.listen(port, () => {
-  const port = server.address().port;
-  console.info(`App listening on port ${port}`);
+const options = {
+  key: fs.readFileSync(path.join(__dirname, 'cc', 'server_key.pem')),
+  cert: fs.readFileSync(path.join(__dirname, 'cc', 'server_cert.pem')),
+  requestCert: true,
+  rejectUnauthorized: false,
+  ca: [fs.readFileSync(path.join(__dirname, 'cc', 'server_cert.pem'))],
+};
+
+http.createServer(app).listen(port, () => {
+  console.info(`HTTP listening on port ${port}`);
+});
+https.createServer(options, app).listen(portSsl, () => {
+  console.info(`HTTPS listening on port ${portSsl}`);
 });

dev-api/api-es.js

@@ -4,7 +4,7 @@ import { BaseApi } from './base-api.js';
 const router = express.Router();
 export default router;
 
-class AuthBaiscRoute extends BaseApi {
+class AuthBasicRoute extends BaseApi {
   sendUnauthorized(res) {
     res.status(401);
     res.set('WWW-Authenticate', 'Basic realm="This resource is protected"');
@@ -35,7 +35,7 @@ class AuthBaiscRoute extends BaseApi {
   }
 }
 
-const api = new AuthBaiscRoute();
+const api = new AuthBasicRoute();
 api.setCors(router);
 api.wrapApi(router, [
   ['/:username/:password', 'requireAuthorized'],

dev-api/auth-basic.route.js

@@ -0,0 +1,55 @@
+import express from 'express';
+import { BaseApi } from './base-api.js';
+
+const router = express.Router();
+export default router;
+
+class AuthCcRoute extends BaseApi {
+  sendUnauthorized(res) {
+    res.status(401);
+    res.set('WWW-Authenticate', 'Basic realm="This resource is protected"');
+    res.send('Auth required');
+  }
+
+  requireAuthorized(req, res) {
+    if (typeof req.socket.getPeerCertificate !== 'function') {
+      this.sendError(res, 'SSL connection is required.');
+      return;
+    }
+    const cert = req.socket.getPeerCertificate();
+    let status;
+    let message;
+    if (req.client.authorized) {
+      status = 200;
+      message = {
+        authenticated: true,
+        name: cert.subject.CN,
+        issuer: cert.issuer.CN,
+      };
+    } else if (cert.subject) {
+      status = 403;
+      message = {
+        authenticated: false,
+        name: cert.subject.CN,
+        issuer: cert.issuer.CN,
+      };
+    } else {
+      status = 401;
+      message = {
+        authenticated: false,
+        name: 'Unknown',
+        issuer: 'Unknown',
+      };
+    }
+    res.writeHead(status, {
+      'Content-Type': 'application/json; charset=UTF-8',
+    });
+    res.end(JSON.stringify(message));
+  }
+}
+
+const api = new AuthCcRoute();
+api.setCors(router);
+api.wrapApi(router, [
+  ['/', 'requireAuthorized'],
+]);

dev-api/auth-cc.route.js

@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEmDCCAoACCQDQPRzVnOSbujANBgkqhkiG9w0BAQUFADAOMQwwCgYDVQQDDANC
+b2IwHhcNMjAwMTMwMjIxNDE4WhcNMzAwMTI3MjIxNDE4WjAOMQwwCgYDVQQDDANC
+b2IwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDhVwZJi8R2LfQhvP7q
+TXNl76Y8aaMagBpgYoVwOhkIcZYlsr5Yq5tkUSOh9VB+TXNwG44mjpv3bUZHGTJ9
+R2aB5rFj/m+bkVWDwnl1eStbXEoKx4va004KWML9vAO76RxlhZu64tWfSgROrB5K
+jCKMuNwUUNPJOOAoQB91i0SE3LunDVKN6U01PPkyIAy4X63ImWDrQzXd8D9NN1Qq
+9ZmM4ovMqTwndZV1YkY3ZiZf4HFmGZzq8LwkpgObYqGLUeFXM0nueNulSs6TzN/o
+bmV7LiZ8sWsRHozzeaVfNIlAg4V1A5RY/K0H+HT2ySqRVUbHpns6aVbmRk+v646y
+95zJKIeeeWB4zjyD6wp2l8bO4GZe4knF9UFlHHrCDHrjIlzvtHpZlHXPOIo/y7zs
+AJLzmwduHFbid2rzQj5ObqSH5QrEvhvx2i2PAgHGhPWVyu+ESNFa5RnXYTkYN0OS
+cBCnr3qaiHHUnZZECwU/m+b7djyqmfFGmHTj/a7M6E500xlhFR9X468FXU/6cIn1
+9kIxkbHf4QsOaviH79Axxw5fQvx8PCx+qMQahhCk+vrDYZzCrCPyJhE2vkKPdEIH
+4YhvGyiwc1cR1XPCjeuQsQMhjRa2kBlz20TEUnhcZPQ2/5TX+rSy0IpeuG2ZknnH
+ruP8viYHWn2dPK2cZVjXITpeQQIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQAytQcL
+BcZvujS18/0s1p6mhlhdpSCqMmeFie8aFTvWsdPiC4RCgtEefGuKqg6VRkSPxTSW
+nkBZ3haSkYBhSUqhGGYUgmftLBb10QUb3FEX4FDZipj8g3qkZ/JBMMDtJaqVpMqN
+mFjkFgVW41nJmeVd1J+XLn+BygfW9cdlBF1E0QlgS1W0apKwzR57jw5rRJnasAdZ
+hWA/4K9sMkGThvakDFOcSMiUGsJyiNy9kXHnreqOSUzGbyYiryKWv8Mc9oGSysyH
+eA37/cVJKrzou2Tpq42AGQZVZFkc+kcYf4WbX5VnyAUUyZzkwZDFvHSOdt7d2quh
+zEnxJjPSms1DxMOVFCeJD2rcFnAtt2iDXjJT47x1zsN6rI2GAgSfS0G1vWIuc/A1
+FgbQQwS+AgD1YJmRIw41gq0rcVMtwZ4xZEGPRrvypuKcudY6aWvEnANHQfPnWfCC
+acPnPZ3mstzIsdCXKboRmppUQCFfVcst/JxPQO0luPRncujds5pEJhQBsw0WXApJ
+ITNg/cK/HSCg2uKGp1Z5OBkyiH8t0QEpLoB11KxSXaCJRbKquDabFTNvkTHZ8/Q6
+5NOhx9ioIPhRtwe5Hppq+BDZQk4dLE5Z++iehCDCzBhc7vUWH+T8LLWa3UrrI/9z
+QAmhJhQOHauxMLW2iW4GdWZ/AvK2ZiZKcAKkKA==
+-----END CERTIFICATE-----

dev-api/cc/bob.p12

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIEUzCCAjsCAQAwDjEMMAoGA1UEAwwDQm9iMIICIjANBgkqhkiG9w0BAQEFAAOC
+Ag8AMIICCgKCAgEA4VcGSYvEdi30Ibz+6k1zZe+mPGmjGoAaYGKFcDoZCHGWJbK+
+WKubZFEjofVQfk1zcBuOJo6b921GRxkyfUdmgeaxY/5vm5FVg8J5dXkrW1xKCseL
+2tNOCljC/bwDu+kcZYWbuuLVn0oETqweSowijLjcFFDTyTjgKEAfdYtEhNy7pw1S
+jelNNTz5MiAMuF+tyJlg60M13fA/TTdUKvWZjOKLzKk8J3WVdWJGN2YmX+BxZhmc
+6vC8JKYDm2Khi1HhVzNJ7njbpUrOk8zf6G5ley4mfLFrER6M83mlXzSJQIOFdQOU
+WPytB/h09skqkVVGx6Z7OmlW5kZPr+uOsvecySiHnnlgeM48g+sKdpfGzuBmXuJJ
+xfVBZRx6wgx64yJc77R6WZR1zziKP8u87ACS85sHbhxW4ndq80I+Tm6kh+UKxL4b
+8dotjwIBxoT1lcrvhEjRWuUZ12E5GDdDknAQp696mohx1J2WRAsFP5vm+3Y8qpnx
+Rph04/2uzOhOdNMZYRUfV+OvBV1P+nCJ9fZCMZGx3+ELDmr4h+/QMccOX0L8fDws
+fqjEGoYQpPr6w2Gcwqwj8iYRNr5Cj3RCB+GIbxsosHNXEdVzwo3rkLEDIY0WtpAZ
+c9tExFJ4XGT0Nv+U1/q0stCKXrhtmZJ5x67j/L4mB1p9nTytnGVY1yE6XkECAwEA
+AaAAMA0GCSqGSIb3DQEBCwUAA4ICAQCQunBCVTlO7OaQmO+Nv8rRuKHDRJwEx7dv
+UC+YKViW85fo3+/vE6OKUEnc2Z2ol3pRSQxTVLlQO/SxLEB/bCa8+ghd11clHH3X
+n3aBD31eTBF9TUBBp6ng72NQDHno5KrQd0aW/rDbejy7RGqK2uKimvf9MhqXCcUk
+WUCTe2LM4tpkn2rxC27WaIVTUNYFrqNxXoII/rcWXxlYDHdUsxYC1iNy/9YNeKut
+mHYH7AzEI7PKEYGdlOhOSCT/HmeJ+4Kdy6ZPbSELdTZAy2QJcwT1VU2bap7WsDPC
+QlJnSkJo6B+lSd4LnwMFKSuTWKKhw27QJlRPDsjqlyHsbigK6SftzdToBjnYMSET
+RRIHyc1Caqo6CQrPRzD6qzFXgTyi/hLiMml2/ArQj7vtkP5Rj4ZUt63bD1lySUiu
+AfySW8amy6UU224Htir4lHX76R/uB2bdh8g1z2lo8dS0Mzn8a64CH/8xKWFnc6ey
+qBOI5sucInOYjUZpIIs4UxrRz9LQhuARMSGO4GOF3WeqsHbxU3qnWDA5Bt6epbnb
+BxGg9GS8XLT+rDFKY1ZZ0l3EzPQKClTc5OGYROvRYbZDpx/kI/66InNn/me+IGnC
+02P+/dxblgnTDj+T0X6scGqvptw6ze2u58t4q/LjN2lCGvNsqWY44dVAAnBC0MRc
+E7GjggNetA==
+-----END CERTIFICATE REQUEST-----