Tor

js/app.js

@@ -12,4 +12,6 @@ export default {
     return this.serverConfigs.activeServer ?
       `${this.serverConfigs.activeServer.httpUrl}${urlFrag}` : '';
   },
+
+  serverConfig: {},
 };

js/collections/ServerConfigs.js

@@ -21,6 +21,19 @@ export default class extends Collection {
     this.on('sync', () => this.bindActiveServerChangeHandler());
   }
 
+  /**
+   * The "default" config is the configuration that is associated with the built-in
+   * server in the bundled app.
+   */
+  get defaultConfig() {
+    return this.findWhere({ default: true });
+  }
+
+  /**
+   * The "active" server is the server we are currently connected to or if we're not
+   * connected to any server, it's the last server we were connected to. When the app is
+   * re-started, a connection will automatically be attempted to this server.
+   */
   get activeServer() {
     return this.get(this._activeId);
   }
@@ -60,17 +73,29 @@ export default class extends Collection {
   }
 
   set(models = [], options = {}) {
-    const hasDefaultModel = !!this.findWhere({ default: true });
-
-    // Todo: ensure this works via the myriad ways to set this collection
-
     // Not sure why if I create a model via Collection.Create, a single model
     // is being passed into this method, instead of an array. The documentation
     // does not reflect this.
     const modelsList = models instanceof Model ? [models] : models;
 
-    if (hasDefaultModel &&
-      modelsList.filter(md => md.get('default')).length) {
+    const defaultConfig = this.defaultConfig;
+    let defaultCount = this.defaultConfig ? 1 : 0;
+
+    // ensure we are not trying to set more than one default config
+    if (defaultConfig) {
+      modelsList.forEach(model => {
+        const jsonModel = model instanceof Model ?
+          model.toJSON() : model;
+        const defaultConfigId = this.defaultConfig ? this.defaultConfig.id : '';
+
+        if (jsonModel.default &&
+          (!options.merge || !jsonModel.id || jsonModel.id !== defaultConfigId)) {
+          defaultCount += 1;
+        }
+      });
+    }
+
+    if (defaultCount > 1) {
       throw new Error('The collection already has a default model and you' +
         ' are attempting to add another one. Only one default model is allowed.');
     }

js/languages/en-US.json

@@ -66,7 +66,8 @@
     }
   },
   "pageNav": {
-    "notConnectedMenuItem": "Not Connected"
+    "notConnectedMenuItem": "Not Connected",
+    "torOnTooltip": "Tor active"
   },
   "chat": {
     "fetchingConversations": "Retrieving your chat conversations…",
@@ -503,14 +504,18 @@
     }
   },
   "connectionManagement": {
-    "defaultServerName": "Local Bundled Server",
+    "defaultServerName": "Built-in Server",
     "statusBar": {
       "errorPreface": "Error:",
       "needHelpLink": "Need help?",
-      "viewLocalServerDebugLogLink": "View Server Debug Log",
+      "viewLocalServerDebugLogLink": "Debug Log",
       "errorConnectionLost": "%{errorPreface} The connection to %{serverName} has been lost. %{links}",
       "errorUnableToReachServer": "%{errorPreface} Failed to connect to %{serverName}. The server cannot be reached. %{links}",
       "errorAuthFailed": "%{errorPreface} Failed to connect to %{serverName}. The username and / or password are incorrect. %{links}",
+      "errorAuthFailedBuiltInServer": "%{errorPreface} Failed to connect to %{serverName}. The auth cookie is invalid. %{links}",
+      "editLink": "edit",
+      "errorTorNotConfigured": "Please %{editLink} the %{serverName} configuration to confirm whether you want to use Tor or not. %{links}",
+      "errorTorNotAvailable": "Tor was not detected. Please %{editLink} the %{serverName} configuration to not use Tor or start Tor. %{links}",
       "cancelConnAttempt": "Cancel",
       "connectAttemptMsg": "Attempting to connect to %{serverName}. %{cancelConnAttempt}"
     },
@@ -521,6 +526,7 @@
       "btnCancel": "Cancel",
       "btnRetry": "Retry",
       "btnConnect": "Connect",
+      "btnDisconnect": "Disconnect",
       "statusConnected": "Connected",
       "deleteConfirm": {
         "heading": "Are you sure?",
@@ -544,9 +550,25 @@
       "placeholderServerIp": "The IP to your server (or localhost)",
       "placeholderUsername": "The username to your server",
       "placeholderPassword": "The password to your server",
-      "placeholderPort": "The port to your server"
+      "placeholderPort": "The port to your server",
+      "torLabel": "Tor",
+      "useTor": "Use Tor",
+      "configureTorMessage": "Tor has been detected. If you would like to use Tor, please check the \"Use Tor\" box below and specify your \"Tor SOCKS5 proxy\" setting. Click Save to confirm your decision.",
+      "torNotAvailableMessage": "Tor was not detected. If you would like to proceed without Tor, uncheck \"Use Tor\" below and click Save. Otherwise start up Tor and then retry connecting.",
+      "torProxyLabel": "Tor SOCKS5 proxy",
+      "torProxyPlaceholder": "127.0.0.1:9150",
+      "warning": "Warning:",
+      "torServerWarning": "%{warning} In order to be anonymous, it is critical that you also start the server in Tor mode."
     }
   },
+  "torExternalLinkWarning": {
+    "heading": "Warning",
+    "body": "You're attempting to visit an external link in your default web browser. If your default web browser is not set to Tor, you may be exposing your IP address.",
+    "areYouSureToProceed": "Are you sure you want to proceed?",
+    "doNotShowAgain": "Do not show this warning again",
+    "btnCancel": "Cancel",
+    "btnProceed": "Yes, proceed"
+  },
   "wallet": {
     "title": "Wallet",
     "closeLink": "Close wallet",
@@ -1243,6 +1265,13 @@
       "caseOffIfEmpty": "Please fill out all settings if you turn notifications on."
     }
   },
+  "serverConfigModelErrors": {
+    "provideValue": "Please provide a value.",
+    "invalidIp": "This does not appear to be a valid IP address.",
+    "providePortAsNumber": "Please provide a port as a number.",
+    "provideValidPortRange": "Please provide a number between 0 and 65535.",
+    "invalidTorProxy": "The value does not appear to be in the right format. It should be in the format ip-address:port, e.g. 127.0.0.1:9150. The port must be a number between 0 and 65535."
+  },  
   "errors": {
     "saveError": "There was an error saving your data.",
     "badResult": "The server returned an error."

js/models/LocalSettings.js

@@ -23,6 +23,7 @@ export default class extends Model {
       listingsGridViewType: 'grid',
       bitcoinUnit: 'BTC',
       searchProvider: 'https://search.ob1.io/search/listings',
+      dontShowTorExternalLinkWarning: false,
     };
   }
 
@@ -75,6 +76,11 @@ export default class extends Model {
       addError('searchProvider', app.polyglot.t('localSettingsModelErrors.searchProvider'));
     }
 
+    if (typeof attrs.dontShowTorExternalLinkWarning !== 'boolean') {
+      addError('dontShowTorExternalLinkWarning',
+        'dontShowTorExternalLinkWarning must be provided as a boolean.');
+    }
+
     if (Object.keys(errObj).length && errObj) return errObj;
 
     return undefined;

js/models/ServerConfig.js

@@ -1,3 +1,4 @@
+import app from '../app';
 import BaseModel from './BaseModel';
 import LocalStorageSync from '../utils/backboneLocalStorage';
 import is from 'is_js';
@@ -17,6 +18,10 @@ export default class extends BaseModel {
       port: 4002,
       SSL: false,
       default: false,
+      useTor: false,
+      confirmedTor: false,
+      torProxy: '127.0.0.1:9150',
+      dontShowTorExternalLinkWarning: false,
     };
   }
 
@@ -28,7 +33,7 @@ export default class extends BaseModel {
     };
 
     if (!is.existy(attrs.name) || is.empty(attrs.name)) {
-      addError('name', 'Please provide a value.');
+      addError('name', app.polyglot.t('serverConfigModelErrors.provideValue'));
     } else {
       // Slight hack since backbone doesn't document Model.collection and
       // it will only refer to the first collection that a Model belongs.
@@ -42,35 +47,60 @@ export default class extends BaseModel {
     }
 
     if (!is.existy(attrs.serverIp) || is.empty(attrs.serverIp)) {
-      addError('serverIp', 'Please provide a value.');
+      addError('serverIp', app.polyglot.t('serverConfigModelErrors.provideValue'));
     } else {
       if (!is.ip(attrs.serverIp)) {
-        addError('serverIp', 'This does not appear to be a valid IP address.');
+        addError('serverIp', app.polyglot.t('serverConfigModelErrors.invalidIp'));
       }
     }
 
     if (!this.isLocalServer()) {
       if (!attrs.username) {
-        addError('username', 'Please provide a value.');
+        addError('username', app.polyglot.t('serverConfigModelErrors.provideValue'));
       }
 
       if (!attrs.password) {
-        addError('password', 'Please provide a value.');
+        addError('password', app.polyglot.t('serverConfigModelErrors.provideValue'));
       }
 
       if (!attrs.SSL) {
         addError('SSL', 'SSL must be turned on for remote servers.');
       }
     }
 
-    if (!attrs.default) {
-      if (!is.number(attrs.port)) {
-        addError('port', 'Please provide a number.');
+    if (attrs.useTor) {
+      if (!attrs.torProxy) {
+        addError('torProxy', app.polyglot.t('serverConfigModelErrors.provideValue'));
+      } else if (typeof attrs.torProxy !== 'string') {
+        addError('torProxy', 'Please provide the tor proxy configuration as a string.');
       } else {
-        if (!is.within(attrs.port, -1, 65536)) {
-          addError('port', 'Please provide a number between 0 and 65535.');
+        let valid = true;
+        const split = attrs.torProxy.split(':');
+
+        if (split.length !== 2) {
+          valid = false;
+        } else {
+          if (!is.ip(split[0])) {
+            valid = false;
+          } else if (!is.within(parseInt(split[1], 10), -1, 65536)) {
+            valid = false;
+          }
+        }
+
+        if (!valid) {
+          addError('torProxy', app.polyglot.t('serverConfigModelErrors.invalidTorProxy'));
         }
       }
+    }
+
+    if (!attrs.default) {
+      if (attrs.port === undefined || attrs.port === '') {
+        addError('port', app.polyglot.t('serverConfigModelErrors.provideValue'));
+      } else if (!is.number(attrs.port)) {
+        addError('port', app.polyglot.t('serverConfigModelErrors.providePortAsNumber'));
+      } else if (!is.within(attrs.port, -1, 65536)) {
+        addError('port', app.polyglot.t('serverConfigModelErrors.provideValidPortRange'));
+      }
     } else {
       if (is.existy(attrs.port) && attrs.port !== this.defaults().port) {
         // For now, not allowing the port to be changed on the default server,
@@ -103,7 +133,7 @@ export default class extends BaseModel {
   needsAuthentication() {
     let needsAuth = false;
 
-    if (!this.isLocalServer()) {
+    if (!this.isLocalServer() || this.get('default')) {
       needsAuth = true;
     } else {
       if (this.get('username') || this.get('password')) {

js/router.js

@@ -256,7 +256,8 @@ export default class ObRouter extends Router {
   }
 
   connectedPeers() {
-    const peerFetch = $.get(app.getServerUrl('ob/peers')).done((peersData) => {
+    const peerFetch = $.get(app.getServerUrl('ob/peers')).done((data) => {
+      const peersData = data || [];
       const peers = peersData.map(peer => (peer.slice(peer.lastIndexOf('/') + 1)));
 
       this.loadPage(

js/start.js

@@ -10,6 +10,7 @@ import ServerConfig from './models/ServerConfig';
 import serverConnect, {
   events as serverConnectEvents,
   getSocket,
+  getCurrentConnection,
 } from './utils/serverConnect';
 import LocalSettings from './models/LocalSettings';
 import ObRouter from './router';
@@ -411,8 +412,17 @@ function start() {
     app.profile = new Profile({ peerID: data.peerID });
 
     app.settings = new Settings();
-    // If the server is running testnet, set that here
-    app.testnet = data.testnet; // placeholder for later when we need this data for purchases
+
+    // This is the server config as returned by ob/config. It has nothing to do with
+    // app.serverConfigs which is a collection of server configuration data related
+    // to connecting with a server. The latter is stored in local storage.
+    app.serverConfig = data || {};
+
+    const curConn = getCurrentConnection();
+
+    if (curConn && curConn.status !== 'disconnected') {
+      app.pageNav.torIndicatorOn = app.serverConfig.tor && curConn.server.get('useTor');
+    }
 
     // We'll default our server language to whatever is stored locally.
     app.settings.set('language', app.localSettings.get('language'));

js/startup/index.js

@@ -3,8 +3,10 @@
 
 import { screen, shell } from 'electron';
 import $ from 'jquery';
-import Backbone from 'backbone';
 import { getBody } from '../utils/selectors';
+import app from '../app';
+import Backbone from 'backbone';
+import TorExternalLinkWarning from '../views/modals/TorExternalLinkWarning';
 
 export function fixLinuxZoomIssue() {
   // fix zoom issue on Linux hiDPI
@@ -42,7 +44,24 @@ export function handleLinks() {
         Backbone.history.navigate(href.slice(5), true);
       } else {
         // external link
-        shell.openExternal(link.protocol === 'file:' ? `http://${href}` : href);
+        const activeServer = app.serverConfigs.activeServer;
+        const localSettings = app.localSettings;
+        const warningOptedOut = app.localSettings &&
+          localSettings.get('dontShowTorExternalLinkWarning');
+
+        if (activeServer && activeServer.get('useTor') && !warningOptedOut) {
+          const warningModal = new TorExternalLinkWarning({ url: href })
+            .render()
+            .open();
+
+          warningModal.on('cancelClick', () => warningModal.close());
+          warningModal.on('confirmClick', () => {
+            shell.openExternal(link.protocol === 'file:' ? `http://${href}` : href);
+            warningModal.close();
+          });
+        } else {
+          shell.openExternal(link.protocol === 'file:' ? `http://${href}` : href);
+        }
       }
     } else {
       if (!href.startsWith('#')) {

js/templates/connectedPeersPage.html

@@ -11,9 +11,4 @@ <h1 class="flexExpand"><%= ob.polyT('connectedPeersPage.heading') %></h1>
     <hr class="clrBr">
     <a class="btn clrBr clrP js-morePeersBtn">Load More</a>
   </div>
-</div>
-
-<% if (!ob.peers.length) { %>
-  <p><%= ob.polyT('connectedPeersPage.noResults') %></p>
-<% } %>
-
+</div>

js/templates/modals/connectionManagement/configuration.html

@@ -1,25 +1,28 @@
 <div class="flexVCent clrT">
-  <div class="col4 <% if (ob.status === 'connected') print('txB') %>"><%= ob.name %></div>
+  <div class="col4 flexVCent gutterHTn <% if (ob.status === 'connected') print('txB') %>">
+    <% if (ob.status === 'connected') { %>
+      <span class="ion-ios-checkmark-empty clrTEmph1 tx1"></span>
+    <% }%>
+    <div><%= ob.name %></div>
+  </div>
   <div class="col4 <% if (ob.status === 'connected') print('txB') %>"><%= ob.serverIp %></div>
   <div class="col4">
     <div class="flexHRight">
-      <% if (ob.status === 'connected') { %>
-      <div class="txB flexVCent flexHRight gutterHTn"><span class="ion-ios-checkmark-empty clrTEmph1 tx1"></span><span><%= ob.polyT('connectionManagement.configurations.statusConnected') %></span></div>
-      <% } else { %>
       <div class="gutterHTn">
         <a class="iconBtn clrP clrBr ion-trash-b js-btnDelete <% if (ob.deleteConfirmOn) print('confirmDisabled') %> <% if (ob.default) print('hide') %>"></a>
-        <a class="iconBtn clrP clrBr ion-ios-gear js-btnEdit <% if (ob.default) print('hide') %>"></a>
+        <a class="iconBtn clrP clrBr ion-ios-gear js-btnEdit"></a>
         <% if (ob.status === 'connecting') { %>
           <a class="btn clrP clrBr js-btnCancel btnConnectCancel">
             <%= ob.spinner({ className: 'spinnerSm' }) %>
             <%= ob.polyT('connectionManagement.configurations.btnCancel') %>
           </a>
+        <% } else if (ob.status === 'connected') { %>          
+          <a class="btn clrP clrBr js-btnDisconnect btnDisconnect"><%= ob.polyT('connectionManagement.configurations.btnDisconnect') %></a>
         <% } else { %>
           <% const btnText = ob.status === 'connect-attempt-failed' ? ob.polyT('connectionManagement.configurations.btnRetry') : ob.polyT('connectionManagement.configurations.btnConnect') %>
           <a class="btn clrP clrBr js-btnConnect btnConnectCancel"><%= btnText %></a>
         <% } %>
       </div>
-      <% } %>
     </div>
   </div>
 </div>