Merge pull request #1974 from Bilb/fix-onion-path-24-subnet

exclude same /24 subnet from onion path building candidates

ts/session/onions/onionPath.ts

@@ -464,7 +464,23 @@ async function buildNewOnionPathsWorker() {
       if (allNodes.length <= SnodePool.minSnodePoolCount) {
         throw new Error('Too few nodes to build an onion path. Even after fetching from seed.');
       }
-      const otherNodes = _.shuffle(_.differenceBy(allNodes, guardNodes, 'pubkey_ed25519'));
+
+      // make sure to not reuse multiple times the same subnet /24
+      const allNodesGroupedBySubnet24 = _.groupBy(allNodes, e => {
+        const lastDot = e.ip.lastIndexOf('.');
+        return e.ip.substr(0, lastDot);
+      });
+      const oneNodeForEachSubnet24 = _.map(allNodesGroupedBySubnet24, group => {
+        return _.sample(group) as Data.Snode;
+      });
+      if (oneNodeForEachSubnet24.length <= SnodePool.minSnodePoolCount) {
+        throw new Error(
+          'Too few nodes "unique by ip" to build an onion path. Even after fetching from seed.'
+        );
+      }
+      const otherNodes = _.shuffle(
+        _.differenceBy(oneNodeForEachSubnet24, guardNodes, 'pubkey_ed25519')
+      );
       const guards = _.shuffle(guardNodes);
 
       // Create path for every guard node:

ts/test/session/unit/onion/OnionErrors_test.ts

@@ -18,6 +18,7 @@ import AbortController from 'abort-controller';
 import * as Data from '../../../../../ts/data/data';
 import { pathFailureCount } from '../../../../session/onions/onionPath';
 import { SeedNodeAPI } from '../../../../session/seed_node_api';
+import { generateFakeSnodeWithEdKey } from '../../../test-utils/utils';
 
 chai.use(chaiAsPromised as any);
 chai.should();
@@ -63,8 +64,6 @@ describe('OnionPathsErrors', () => {
     fakeSwarmForAssociatedWith: Array<string>;
 
   let oldOnionPaths: Array<Array<Data.Snode>>;
-  const fakeIP = '8.8.8.8';
-  let fakePortCurrent = 20000;
 
   beforeEach(async () => {
     guardPubkeys = TestUtils.generateFakePubKeys(3).map(n => n.key);
@@ -72,26 +71,10 @@ describe('OnionPathsErrors', () => {
 
     SNodeAPI.Onions.resetSnodeFailureCount();
 
-    guardNodesArray = guardPubkeys.map(ed25519 => {
-      fakePortCurrent++;
-      return {
-        ip: fakeIP,
-        port: fakePortCurrent,
-        pubkey_ed25519: ed25519,
-        pubkey_x25519: ed25519,
-      };
-    });
+    guardNodesArray = guardPubkeys.map(generateFakeSnodeWithEdKey);
     guardSnode1 = guardNodesArray[0];
 
-    otherNodesArray = otherNodesPubkeys.map(ed25519 => {
-      fakePortCurrent++;
-      return {
-        ip: fakeIP,
-        port: fakePortCurrent,
-        pubkey_ed25519: ed25519,
-        pubkey_x25519: ed25519,
-      };
-    });
+    otherNodesArray = otherNodesPubkeys.map(generateFakeSnodeWithEdKey);
 
     fakeSnodePool = [...guardNodesArray, ...otherNodesArray];
 

ts/test/test-utils/utils/pubkey.ts

@@ -37,7 +37,8 @@ export function generateFakePubKeys(amount: number): Array<PubKey> {
 
 export function generateFakeSnode(): Snode {
   return {
-    ip: '136.243.103.171',
+    // tslint:disable: insecure-random
+    ip: `136.243.${Math.random() * 255}.${Math.random() * 255}`,
     port: 22116,
     pubkey_x25519: generateFakePubKeyStr(),
     pubkey_ed25519: generateFakePubKeyStr(),
@@ -46,7 +47,7 @@ export function generateFakeSnode(): Snode {
 
 export function generateFakeSnodeWithEdKey(ed25519Pubkey: string): Snode {
   return {
-    ip: '136.243.103.171',
+    ip: `136.243.${Math.random() * 255}.${Math.random() * 255}`,
     port: 22116,
     pubkey_x25519: generateFakePubKeyStr(),
     pubkey_ed25519: ed25519Pubkey,