minode/connection.py

@@ -4,6 +4,7 @@ import base64
 import errno
 import logging
 import math
+import os
 import random
 import select
 import socket
@@ -80,7 +81,8 @@ class ConnectionBase(threading.Thread):
             if self.network == 'ip':
                 self.send_queue.put(message.Version(self.host, self.port))
             else:
-                self.send_queue.put(message.Version('127.0.0.1', 7656))
+                self.send_queue.put(message.Version(
+                    '127.0.0.1', 7656, nonce=self._get_nonce()))
         while True:
             if (
                 self.on_connection_fully_established_scheduled
@@ -149,6 +151,14 @@ class ConnectionBase(threading.Thread):
                 break
             time.sleep(0.2)
 
+    def _get_nonce(self):
+        nonce = shared.nonce_pool.get(('127.0.0.1', 8448))
+        if nonce is None:
+            nonce = os.urandom(8)
+            shared.nonce_pool[('127.0.0.1', 8448)] = nonce
+
+        return nonce
+
     def _connect(self):
         peer_str = '{0.host_print}:{0.port}'.format(self)
         logging.debug('Connecting to %s', peer_str)
@@ -377,16 +387,23 @@ class ConnectionBase(threading.Thread):
         if shared.stream not in version.streams:
             raise ValueError('message not for stream %i' % shared.stream)
         logging.debug('%s:%s -> %s', self.host_print, self.port, version)
+        nonce_print = base64.b16encode(version.nonce).decode()
         if (
             version.protocol_version != shared.protocol_version
             or version.nonce == shared.nonce
+            or version.nonce in shared.nonce_pool.values()
         ):
+            logging.warning(
+                'Disconnecting v%s node %s with nonce %s',
+                version.protocol_version, self.host_print, nonce_print)
+            shared.unchecked_node_pool.discard((self.host, self.port))
             self.status = 'disconnecting'
             self.send_queue.put(None)
         else:
+            shared.nonce_pool[(self.host, self.port)] = version.nonce
             logging.info(
-                '%s:%s claims to be %s',
-                self.host_print, self.port, version.user_agent)
+                '%s:%s claims to be %s (%s)',
+                self.host_print, self.port, version.user_agent, nonce_print)
             self.send_queue.put(message.Message(b'verack', b''))
             self.verack_sent = True
             self.remote_version = version
@@ -405,7 +422,8 @@ class ConnectionBase(threading.Thread):
                 if self.network == 'ip':
                     self.send_queue.put(message.Version(self.host, self.port))
                 else:
-                    self.send_queue.put(message.Version('127.0.0.1', 7656))
+                    self.send_queue.put(message.Version(
+                        '127.0.0.1', 7656, nonce=self._get_nonce()))
 
     def _process_msg_addr(self, m):
         addr = message.Addr.from_message(m)

minode/manager.py

@@ -106,6 +106,10 @@ class Manager(threading.Thread):
             if not c.is_alive() or c.status == 'disconnected':
                 with shared.connections_lock:
                     shared.connections.remove(c)
+                try:
+                    del shared.nonce_pool[(c.host, c.port)]
+                except KeyError:
+                    pass
             else:
                 hosts.add(structure.NetAddrNoPrefix.network_group(c.host))
                 if not c.server:

minode/shared.py

@@ -54,6 +54,7 @@ core_nodes = set()
 
 node_pool = set()
 unchecked_node_pool = set()
+nonce_pool = {}
 
 i2p_core_nodes = set()
 i2p_node_pool = set()