Make a session-wide set of junk vectors to not request repeatedly

checking curve number and key length in encrypted payload.

.buildbot/ubuntu/Dockerfile

@@ -1,21 +1,16 @@
-FROM ubuntu:jammy
+FROM ubuntu:focal
 
 RUN apt-get update
 
 RUN apt-get install -yq software-properties-common
 
-RUN apt-add-repository ppa:purplei2p/i2pd && apt-get update -qq
+RUN apt-add-repository ppa:purplei2p/i2pd
+RUN apt-get update
 
 RUN apt-get install -yq --no-install-suggests --no-install-recommends \
-    python3-dev python3-pip python-is-python3 python3.11-dev python3.11-venv
+    python3-dev python3-pip python3.9 python3.9-dev python3.9-venv sudo i2pd
-
-RUN apt-get install -yq --no-install-suggests --no-install-recommends sudo i2pd
 
 RUN echo 'builder ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
-RUN pip install setuptools wheel
+RUN python3.9 -m pip install setuptools wheel
-RUN pip install --upgrade pip tox virtualenv
+RUN python3.9 -m pip install --upgrade pip tox virtualenv
-
-ADD . .
-
-CMD .buildbot/ubuntu/build.sh && .buildbot/ubuntu/test.sh

.dockerignore

@@ -1,3 +0,0 @@
-.git
-.tox
-dist

.github/workflows/test.yml

@@ -1,20 +1,44 @@
-name: Testing
+name: Blind Test
-on: [push]
+
+on: push
 
 jobs:
   default:
-    runs-on: ubuntu-20.04
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        python-version: [3.8]
+        include:
+          - os: ubuntu-latest
+            python-version: 3.9
+
     steps:
-      - name: Install dependencies
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install python dependencies
       run: |
-          apt-get update
+        python -m pip install --upgrade pip
-          apt-get install -yq --no-install-suggests --no-install-recommends \
+        pip install wheel
-          python3-dev python3-pip python3-venv python-is-python3
+        pip install bandit flake8 pylint
-          pip install setuptools wheel
+        pip install -r requirements.txt
-          pip install --upgrade pip tox virtualenv
+        python setup.py install
-      - name: Check out repository code
+    - name: Lint
-        uses: actions/checkout@v3
+      if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == '3.8' }}
-      - name: Quick lint
+      run: |
-        run: tox -e lint-basic
+        # stop the build if there are Python syntax errors or undefined names
-      - name: Run tests
+        flake8 minode --count --select=E9,F63,F7,F82 --show-source --statistics
-        run: tox
+        flake8 minode --count --statistics
+        pylint minode --exit-zero --rcfile=tox.ini
+        bandit -r --exit-zero -x tests minode
+    - name: Test
+      run: |
+        export PYTHONWARNINGS=all
+        coverage run -a -m tests
+    - name: Summary
+      run: coverage report

LICENSE

@@ -1,7 +1,6 @@
 The MIT License (MIT)
 
 Copyright (c) 2016-2017 Krzysztof Oziomek
-Copyright (c) 2020-2023 The Bitmessage Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 # MiNode
 
-[![Testing](https://git.bitmessage.org/Bitmessage/MiNode/actions/workflows/test.yml/badge.svg)](https://git.bitmessage.org/Bitmessage/MiNode/actions?workflow=test.yml)
+[![Quick Test](https://github.com/g1itch/MiNode/actions/workflows/test.yml/badge.svg)](https://github.com/g1itch/MiNode/actions/workflows/test.yml)
 
 Python 3 implementation of the Bitmessage protocol. Designed only to route
 objects inside the network.
@@ -11,7 +11,7 @@ objects inside the network.
 
 ## Running
 ```
-git clone https://git.bitmessage.org/Bitmessage/MiNode.git
+git clone https://git.bitmessage.org/lee.miller/MiNode.git
 ```
 ```
 cd MiNode
@@ -86,4 +86,4 @@ will allow you to use it anonymously over I2P with MiNode acting as a bridge.
 
 ## Links
 - [Bitmessage project website](https://bitmessage.org)
-- [Protocol specification](https://pybitmessage.rtfd.io/en/v0.6/protocol.html)
+- [Protocol specification](https://bitmessage.org/wiki/Protocol_specification)

docker-test.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-DOCKERFILE=.buildbot/ubuntu/Dockerfile
-
-docker build -t minode/tox -f $DOCKERFILE .
-
-if [ $? -gt 0 ]; then
-    docker build --no-cache -t minode/tox -f $DOCKERFILE .
-fi
-
-docker run --rm -it minode/tox

minode/connection.py

@@ -15,11 +15,8 @@ import time
 from . import message, shared, structure
 
 
-class ConnectionBase(threading.Thread):
+class Connection(threading.Thread):
-    """
+    """The connection object"""
-    Common code for the connection thread
-    with minimum command handlers to reuse
-    """
     def __init__(
         self, host, port, s=None, network='ip', server=False,
         i2p_remote_dest=b''
@@ -113,7 +110,11 @@ class ConnectionBase(threading.Thread):
                         'Disconnecting from %s:%s. Reason: %s',
                         self.host_print, self.port, e)
                     data = None
-
+            except ConnectionResetError:
+                logging.debug(
+                    'Disconnecting from %s:%s. Reason: ConnectionResetError',
+                    self.host_print, self.port)
+                self.status = 'disconnecting'
             self._process_buffer_receive()
             self._process_queue()
             self._send_data()
@@ -138,13 +139,13 @@ class ConnectionBase(threading.Thread):
                 time.time() - self.last_message_sent > 300
                 and self.status == 'fully_established'
             ):
-                self.send_queue.put(message.Message(b'ping', b''))
+                self.send_queue.put(message.Message(b'pong', b''))
             if self.status == 'disconnecting' or shared.shutting_down:
                 data = None
             if not data:
                 self.status = 'disconnected'
                 self.s.close()
-                logging.info(
+                logging.debug(
                     'Disconnected from %s:%s', self.host_print, self.port)
                 break
             time.sleep(0.2)
@@ -210,13 +211,6 @@ class ConnectionBase(threading.Thread):
         context.options = (
             ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3
             | ssl.OP_SINGLE_ECDH_USE | ssl.OP_CIPHER_SERVER_PREFERENCE)
-        # OP_NO_SSL* is deprecated since 3.6
-        try:
-            # TODO: ssl.TLSVersion.TLSv1 is deprecated
-            context.minimum_version = ssl.TLSVersion.TLSv1
-            context.maximum_version = ssl.TLSVersion.TLSv1_2
-        except AttributeError:
-            pass
 
         self.s = context.wrap_socket(
             self.s, server_side=self.server, do_handshake_on_connect=False)
@@ -234,14 +228,11 @@ class ConnectionBase(threading.Thread):
                     'Disconnecting from %s:%s. Reason: %s',
                     self.host_print, self.port, e)
                 self.status = 'disconnecting'
-                if isinstance(e, ssl.SSLError):  # pylint: disable=no-member
+                break
-                    logging.debug('ssl.SSLError reason: %s', e.reason)
-                    shared.node_pool.discard((self.host, self.port))
-                return
         self.tls = True
         logging.debug(
-            'Established TLS connection with %s:%s (%s)',
+            'Established TLS connection with %s:%s',
-            self.host_print, self.port, self.s.version())
+            self.host_print, self.port)
 
     def _send_message(self, m):
         if isinstance(m, message.Message) and m.command == b'object':
@@ -269,11 +260,11 @@ class ConnectionBase(threading.Thread):
         if len(shared.node_pool) > 10:
             addr.update({
                 structure.NetAddr(1, a[0], a[1])
-                for a in random.sample(tuple(shared.node_pool), 10)})
+                for a in random.sample(shared.node_pool, 10)})
         if len(shared.unchecked_node_pool) > 10:
             addr.update({
                 structure.NetAddr(1, a[0], a[1])
-                for a in random.sample(tuple(shared.unchecked_node_pool), 10)})
+                for a in random.sample(shared.unchecked_node_pool, 10)})
         if len(addr) != 0:
             self.send_queue.put(message.Addr(addr))
 
@@ -287,7 +278,7 @@ class ConnectionBase(threading.Thread):
                         # We limit size of inv messaged to 10000 entries
                         # because they might time out
                         # in very slow networks (I2P)
-                        pack = random.sample(tuple(to_send), 10000)
+                        pack = random.sample(to_send, 10000)
                         self.send_queue.put(message.Inv(pack))
                         to_send.difference_update(pack)
                     else:
@@ -347,35 +338,8 @@ class ConnectionBase(threading.Thread):
                     break
 
     def _process_message(self, m):
-        if m.command == b'verack':
+        if m.command == b'version':
-            self.verack_received = True
+            version = message.Version.from_bytes(m.to_bytes())
-            logging.debug(
-                '%s:%s -> %s', self.host_print, self.port, 'verack')
-            if self.server:
-                self.send_queue.put('fully_established')
-
-        elif m.command == b'ping':
-            logging.debug('%s:%s -> ping', self.host_print, self.port)
-            self.send_queue.put(message.Message(b'pong', b''))
-
-        elif m.command == b'error':
-            error = message.Error.from_message(m)
-            logging.warning(
-                '%s:%s -> %s', self.host_print, self.port, error)
-            if error.fatal == 2:
-                # reduce probability to connect soon
-                shared.unchecked_node_pool.discard((self.host, self.port))
-
-        else:
-            try:
-                getattr(self, '_process_msg_{}'.format(m.command.decode()))(m)
-            except (AttributeError, UnicodeDecodeError):
-                logging.debug('%s:%s -> %s', self.host_print, self.port, m)
-
-    def _process_msg_version(self, m):
-        version = message.Version.from_message(m)
-        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)
             if (
                 version.protocol_version != shared.protocol_version
@@ -403,17 +367,72 @@ class ConnectionBase(threading.Thread):
                         shared.services, version.host, shared.listening_port))
                 if self.server:
                     if self.network == 'ip':
-                    self.send_queue.put(message.Version(self.host, self.port))
+                        self.send_queue.put(
+                            message.Version(self.host, self.port))
                     else:
                         self.send_queue.put(message.Version('127.0.0.1', 7656))
 
-    def _process_msg_addr(self, m):
+        elif m.command == b'verack':
+            self.verack_received = True
+            logging.debug(
+                '%s:%s -> %s', self.host_print, self.port, 'verack')
+            if self.server:
+                self.send_queue.put('fully_established')
+
+        elif m.command == b'inv':
+            inv = message.Inv.from_message(m)
+            logging.debug('%s:%s -> %s', self.host_print, self.port, inv)
+            to_get = inv.vectors.copy()
+            to_get.difference_update(shared.objects.keys())
+            to_get.difference_update(shared.junk_vectors)
+            self.vectors_to_get.update(to_get)
+            # Do not send objects they already have.
+            self.vectors_to_send.difference_update(inv.vectors)
+
+        elif m.command == b'object':
+            obj = structure.Object.from_message(m)
+            logging.debug('%s:%s -> %s', self.host_print, self.port, obj)
+            self.vectors_requested.pop(obj.vector, None)
+            self.vectors_to_get.discard(obj.vector)
+            if obj.is_valid() and obj.vector not in shared.objects:
+                with shared.objects_lock:
+                    if obj.is_junk():
+                        return shared.junk_vectors.add(obj.vector)
+                    shared.objects[obj.vector] = obj
+                if (
+                    obj.object_type == shared.i2p_dest_obj_type
+                    and obj.version == shared.i2p_dest_obj_version
+                ):
+                    dest = base64.b64encode(obj.object_payload, altchars=b'-~')
+                    logging.debug(
+                        'Received I2P destination object,'
+                        ' adding to i2p_unchecked_node_pool')
+                    logging.debug(dest)
+                    shared.i2p_unchecked_node_pool.add((dest, 'i2p'))
+                shared.vector_advertise_queue.put(obj.vector)
+
+        elif m.command == b'getdata':
+            getdata = message.GetData.from_message(m)
+            logging.debug('%s:%s -> %s', self.host_print, self.port, getdata)
+            self.vectors_to_send.update(getdata.vectors)
+
+        elif m.command == b'addr':
             addr = message.Addr.from_message(m)
             logging.debug('%s:%s -> %s', self.host_print, self.port, addr)
             for a in addr.addresses:
-            if (a.host, a.port) not in shared.core_nodes:
                 shared.unchecked_node_pool.add((a.host, a.port))
 
+        elif m.command == b'ping':
+            logging.debug('%s:%s -> ping', self.host_print, self.port)
+            self.send_queue.put(message.Message(b'pong', b''))
+
+        elif m.command == b'error':
+            logging.warning(
+                '%s:%s -> error: %s', self.host_print, self.port, m.payload)
+
+        else:
+            logging.debug('%s:%s -> %s', self.host_print, self.port, m)
+
     def _request_objects(self):
         if self.vectors_to_get and len(self.vectors_requested) < 100:
             self.vectors_to_get.difference_update(shared.objects.keys())
@@ -428,7 +447,7 @@ class ConnectionBase(threading.Thread):
                 logging.info(
                     'Queued %s vectors to get', len(self.vectors_to_get))
                 if len(self.vectors_to_get) > 64:
-                    pack = random.sample(tuple(self.vectors_to_get), 64)
+                    pack = random.sample(self.vectors_to_get, 64)
                     self.send_queue.put(message.GetData(pack))
                     self.vectors_requested.update({
                         vector: time.time() for vector in pack
@@ -458,7 +477,7 @@ class ConnectionBase(threading.Thread):
             logging.info(
                 'Preparing to send %s objects', len(self.vectors_to_send))
             if len(self.vectors_to_send) > 16:
-                to_send = random.sample(tuple(self.vectors_to_send), 16)
+                to_send = random.sample(self.vectors_to_send, 16)
                 self.vectors_to_send.difference_update(to_send)
             else:
                 to_send = self.vectors_to_send.copy()
@@ -471,50 +490,4 @@ class ConnectionBase(threading.Thread):
                             message.Message(b'object', obj.to_bytes()))
 
 
-class Connection(ConnectionBase):
-    """The connection with all commands implementation"""
-    def _process_msg_inv(self, m):
-        inv = message.Inv.from_message(m)
-        logging.debug('%s:%s -> %s', self.host_print, self.port, inv)
-        to_get = inv.vectors.copy()
-        to_get.difference_update(shared.objects.keys())
-        self.vectors_to_get.update(to_get)
-        # Do not send objects they already have.
-        self.vectors_to_send.difference_update(inv.vectors)
-
-    def _process_msg_object(self, m):
-        obj = structure.Object.from_message(m)
-        logging.debug('%s:%s -> %s', self.host_print, self.port, obj)
-        self.vectors_requested.pop(obj.vector, None)
-        self.vectors_to_get.discard(obj.vector)
-        if obj.is_valid() and obj.vector not in shared.objects:
-            with shared.objects_lock:
-                shared.objects[obj.vector] = obj
-            if (
-                obj.object_type == shared.i2p_dest_obj_type
-                and obj.version == shared.i2p_dest_obj_version
-            ):
-                dest = base64.b64encode(obj.object_payload, altchars=b'-~')
-                logging.debug(
-                    'Received I2P destination object,'
-                    ' adding to i2p_unchecked_node_pool')
-                logging.debug(dest)
-                shared.i2p_unchecked_node_pool.add((dest, 'i2p'))
-            shared.vector_advertise_queue.put(obj.vector)
-
-    def _process_msg_getdata(self, m):
-        getdata = message.GetData.from_message(m)
-        logging.debug('%s:%s -> %s', self.host_print, self.port, getdata)
-        self.vectors_to_send.update(getdata.vectors)
-
-
-class Bootstrapper(ConnectionBase):
-    """A special type of connection to find IP nodes"""
-    def _process_msg_addr(self, m):
-        super()._process_msg_addr(m)
-        shared.node_pool.discard((self.host, self.port))
-        self.status = 'disconnecting'
-        self.send_queue.put(None)
-
-
 shared.connection = Connection

minode/i2p/dialer.py

@@ -37,7 +37,7 @@ class I2PDialer(I2PThread):
         self._send(b'HELLO VERSION MIN=3.0 MAX=3.3\n')
         self.version_reply = self._receive_line().split()
         if b'RESULT=OK' not in self.version_reply:
-            logging.debug('Error while connecting to %s', self.destination)
+            logging.warning('Error while connecting to %s', self.destination)
             self.success = False
 
         self._send(
@@ -45,5 +45,6 @@ class I2PDialer(I2PThread):
             + self.destination + b'\n')
         reply = self._receive_line().split(b' ')
         if b'RESULT=OK' not in reply:
-            logging.debug('Error while connecting to %s', self.destination)
+            logging.warning(
+                'Error while connecting to %s', self.destination)
             self.success = False

minode/i2p/listener.py

@@ -49,7 +49,6 @@ class I2PListener(I2PThread):
                         destination, 'i2p', self.s, 'i2p', True, destination)
                     c.start()
                     self.state.connections.add(c)
-                    c = None
                 self.new_socket()
             except socket.timeout:
                 pass

minode/listener.py

@@ -28,9 +28,6 @@ class Listener(threading.Thread):
                 break
             try:
                 conn, addr = self.s.accept()
-            except socket.timeout:
-                continue
-
                 logging.info('Incoming connection from: %s:%i', *addr[:2])
                 with shared.connections_lock:
                     if len(shared.connections) > shared.connection_limit:
@@ -39,4 +36,5 @@ class Listener(threading.Thread):
                         c = Connection(*addr[:2], conn, server=True)
                         c.start()
                         shared.connections.add(c)
-                    c = None
+            except socket.timeout:
+                pass

minode/main.py

@@ -2,9 +2,11 @@
 """Functions for starting the program"""
 import argparse
 import base64
+import csv
 import logging
 import multiprocessing
 import os
+import pickle
 import signal
 import socket
 
@@ -20,7 +22,7 @@ def handler(s, f):  # pylint: disable=unused-argument
     shared.shutting_down = True
 
 
-def parse_arguments():  # pylint: disable=too-many-branches,too-many-statements
+def parse_arguments():
     """Parsing arguments"""
     parser = argparse.ArgumentParser()
     parser.add_argument('-p', '--port', help='Port to listen on', type=int)
@@ -100,23 +102,69 @@ def parse_arguments():  # pylint: disable=too-many-branches,too-many-statements
         shared.i2p_transient = True
 
 
+def load_data():
+    """Loads initial nodes and data, stored in files between sessions"""
+    try:
+        with open(
+            os.path.join(shared.data_directory, 'objects.pickle'), 'br'
+        ) as src:
+            shared.objects = pickle.load(src)
+    except FileNotFoundError:
+        pass  # first start
+    except Exception:
+        logging.warning(
+            'Error while loading objects from disk.', exc_info=True)
+
+    try:
+        with open(
+            os.path.join(shared.data_directory, 'nodes.pickle'), 'br'
+        ) as src:
+            shared.node_pool = pickle.load(src)
+    except FileNotFoundError:
+        pass
+    except Exception:
+        logging.warning('Error while loading nodes from disk.', exc_info=True)
+
+    try:
+        with open(
+            os.path.join(shared.data_directory, 'i2p_nodes.pickle'), 'br'
+        ) as src:
+            shared.i2p_node_pool = pickle.load(src)
+    except FileNotFoundError:
+        pass
+    except Exception:
+        logging.warning('Error while loading nodes from disk.', exc_info=True)
+
+    with open(
+        os.path.join(shared.source_directory, 'core_nodes.csv'),
+        'r', newline=''
+    ) as src:
+        reader = csv.reader(src)
+        shared.core_nodes = {tuple(row) for row in reader}
+        shared.node_pool.update(shared.core_nodes)
+
+    with open(
+        os.path.join(shared.source_directory, 'i2p_core_nodes.csv'),
+        'r', newline=''
+    ) as f:
+        reader = csv.reader(f)
+        shared.i2p_core_nodes = {(row[0].encode(), 'i2p') for row in reader}
+        shared.i2p_node_pool.update(shared.i2p_core_nodes)
+
+
 def bootstrap_from_dns():
-    """Addes addresses of bootstrap servers to core nodes"""
+    """Addes addresses of bootstrap servers to known nodes"""
     try:
-        for port in (8080, 8444):
+        for item in socket.getaddrinfo('bootstrap8080.bitmessage.org', 80):
-            for item in socket.getaddrinfo(
+            shared.unchecked_node_pool.add((item[4][0], 8080))
-                'bootstrap{}.bitmessage.org'.format(port), 80,
+            logging.debug(
-                proto=socket.IPPROTO_TCP
+                'Adding %s to unchecked_node_pool'
-            ):
+                ' based on DNS bootstrap method', item[4][0])
-                try:
+        for item in socket.getaddrinfo('bootstrap8444.bitmessage.org', 80):
-                    addr = item[4][0]
+            shared.unchecked_node_pool.add((item[4][0], 8444))
-                    socket.inet_pton(item[0], addr)
+            logging.debug(
-                except (TypeError, socket.error):
+                'Adding %s to unchecked_node_pool'
-                    continue
+                ' based on DNS bootstrap method', item[4][0])
-                else:
-                    shared.core_nodes.add((addr, port))
-    except socket.gaierror:
-        logging.info('Failed to do a DNS query')
     except Exception:
         logging.info('Error during DNS bootstrap', exc_info=True)
 
@@ -242,6 +290,8 @@ def main():
                 'Error while creating data directory in: %s',
                 shared.data_directory, exc_info=True)
 
+    load_data()
+
     if shared.ip_enabled and not shared.trusted_peer:
         bootstrap_from_dns()
 
@@ -250,6 +300,18 @@ def main():
         # so we can collect I2P destination objects
         start_i2p_listener()
 
+    for vector in set(shared.objects):
+        if not shared.objects[vector].is_valid():
+            if shared.objects[vector].is_expired():
+                logging.debug(
+                    'Deleted expired object: %s',
+                    base64.b16encode(vector).decode())
+            else:
+                logging.warning(
+                    'Deleted invalid object: %s',
+                    base64.b16encode(vector).decode())
+            del shared.objects[vector]
+
     manager = Manager()
     manager.start()
 

minode/manager.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 """The main thread, managing connections, nodes and objects"""
 import base64
-import csv
 import logging
 import os
 import pickle
@@ -11,7 +10,7 @@ import threading
 import time
 
 from . import proofofwork, shared, structure
-from .connection import Bootstrapper, Connection
+from .connection import Connection
 from .i2p import I2PDialer
 
 
@@ -20,24 +19,15 @@ class Manager(threading.Thread):
     def __init__(self):
         super().__init__(name='Manager')
         self.q = queue.Queue()
-        self.bootstrap_pool = []
         self.last_cleaned_objects = time.time()
         self.last_cleaned_connections = time.time()
         self.last_pickled_objects = time.time()
         self.last_pickled_nodes = time.time()
         # Publish destination 5-15 minutes after start
         self.last_published_i2p_destination = \
-            time.time() - 50 * 60 + random.uniform(-1, 1) * 300  # nosec B311
+            time.time() - 50 * 60 + random.uniform(-1, 1) * 300  # nosec
-
-    def fill_bootstrap_pool(self):
-        """Populate the bootstrap pool by core nodes and checked ones"""
-        self.bootstrap_pool = list(shared.core_nodes.union(shared.node_pool))
-        random.shuffle(self.bootstrap_pool)
 
     def run(self):
-        self.load_data()
-        self.clean_objects()
-        self.fill_bootstrap_pool()
         while True:
             time.sleep(0.8)
             now = time.time()
@@ -63,47 +53,23 @@ class Manager(threading.Thread):
     @staticmethod
     def clean_objects():
         for vector in set(shared.objects):
-            # FIXME: no need to check is_valid() here
             if shared.objects[vector].is_expired():
+                with shared.objects_lock:
+                    del shared.objects[vector]
                 logging.debug(
                     'Deleted expired object: %s',
                     base64.b16encode(vector).decode())
-                with shared.objects_lock:
-                    del shared.objects[vector]
 
-    def manage_connections(self):
+    @staticmethod
-        """Open new connections if needed, remove closed ones"""
+    def manage_connections():
         hosts = set()
-
-        def connect(target, connection_class=Connection):
-            """
-            Open a connection of *connection_class*
-            to the *target* (host, port)
-            """
-            c = connection_class(*target)
-            c.start()
-            with shared.connections_lock:
-                shared.connections.add(c)
-
-        def bootstrap():
-            """Bootstrap from DNS seed-nodes and known nodes"""
-            try:
-                target = self.bootstrap_pool.pop()
-            except IndexError:
-                logging.warning(
-                    'Ran out of bootstrap nodes, refilling')
-                self.fill_bootstrap_pool()
-                return
-            logging.info('Starting a bootstrapper for %s:%s', *target)
-            connect(target, Bootstrapper)
-
         outgoing_connections = 0
         for c in shared.connections.copy():
             if not c.is_alive() or c.status == 'disconnected':
                 with shared.connections_lock:
                     shared.connections.remove(c)
             else:
-                hosts.add(structure.NetAddrNoPrefix.network_group(c.host))
+                hosts.add(c.host)
                 if not c.server:
                     outgoing_connections += 1
 
@@ -124,41 +90,36 @@ class Manager(threading.Thread):
             if shared.ip_enabled:
                 if len(shared.unchecked_node_pool) > 16:
                     to_connect.update(random.sample(
-                        tuple(shared.unchecked_node_pool), 16))
+                        shared.unchecked_node_pool, 16))
                 else:
                     to_connect.update(shared.unchecked_node_pool)
-                    if outgoing_connections < shared.outgoing_connections / 2:
-                        bootstrap()
                 shared.unchecked_node_pool.difference_update(to_connect)
                 if len(shared.node_pool) > 8:
-                    to_connect.update(random.sample(
+                    to_connect.update(random.sample(shared.node_pool, 8))
-                        tuple(shared.node_pool), 8))
                 else:
                     to_connect.update(shared.node_pool)
 
             if shared.i2p_enabled:
                 if len(shared.i2p_unchecked_node_pool) > 16:
-                    to_connect.update(random.sample(
+                    to_connect.update(
-                        tuple(shared.i2p_unchecked_node_pool), 16))
+                        random.sample(shared.i2p_unchecked_node_pool, 16))
                 else:
                     to_connect.update(shared.i2p_unchecked_node_pool)
                 shared.i2p_unchecked_node_pool.difference_update(to_connect)
                 if len(shared.i2p_node_pool) > 8:
-                    to_connect.update(random.sample(
+                    to_connect.update(random.sample(shared.i2p_node_pool, 8))
-                        tuple(shared.i2p_node_pool), 8))
                 else:
                     to_connect.update(shared.i2p_node_pool)
 
-        for host, port in to_connect:
+        for addr in to_connect:
-            group = structure.NetAddrNoPrefix.network_group(host)
+            if addr[0] in hosts:
-            if group in hosts:
                 continue
-            if port == 'i2p' and shared.i2p_enabled:
+            if addr[1] == 'i2p' and shared.i2p_enabled:
-                if shared.i2p_session_nick and host != shared.i2p_dest_pub:
+                if shared.i2p_session_nick and addr[0] != shared.i2p_dest_pub:
                     try:
                         d = I2PDialer(
                             shared,
-                            host, shared.i2p_session_nick,
+                            addr[0], shared.i2p_session_nick,
                             shared.i2p_sam_host, shared.i2p_sam_port)
                         d.start()
                         hosts.add(d.destination)
@@ -170,63 +131,13 @@ class Manager(threading.Thread):
                 else:
                     continue
             else:
-                connect((host, port))
+                c = Connection(addr[0], addr[1])
-                hosts.add(group)
+                c.start()
+                hosts.add(c.host)
+                with shared.connections_lock:
+                    shared.connections.add(c)
         shared.hosts = hosts
 
-    @staticmethod
-    def load_data():
-        """Loads initial nodes and data, stored in files between sessions"""
-        try:
-            with open(
-                os.path.join(shared.data_directory, 'objects.pickle'), 'br'
-            ) as src:
-                shared.objects = pickle.load(src)
-        except FileNotFoundError:
-            pass  # first start
-        except Exception:
-            logging.warning(
-                'Error while loading objects from disk.', exc_info=True)
-
-        try:
-            with open(
-                os.path.join(shared.data_directory, 'nodes.pickle'), 'br'
-            ) as src:
-                shared.node_pool = pickle.load(src)
-        except FileNotFoundError:
-            pass
-        except Exception:
-            logging.warning(
-                'Error while loading nodes from disk.', exc_info=True)
-
-        try:
-            with open(
-                os.path.join(shared.data_directory, 'i2p_nodes.pickle'), 'br'
-            ) as src:
-                shared.i2p_node_pool = pickle.load(src)
-        except FileNotFoundError:
-            pass
-        except Exception:
-            logging.warning(
-                'Error while loading nodes from disk.', exc_info=True)
-
-        with open(
-            os.path.join(shared.source_directory, 'core_nodes.csv'),
-            'r', newline='', encoding='ascii'
-        ) as src:
-            reader = csv.reader(src)
-            shared.core_nodes = {(row[0], int(row[1])) for row in reader}
-            shared.node_pool.update(shared.core_nodes)
-
-        with open(
-            os.path.join(shared.source_directory, 'i2p_core_nodes.csv'),
-            'r', newline='', encoding='ascii'
-        ) as f:
-            reader = csv.reader(f)
-            shared.i2p_core_nodes = {
-                (row[0].encode(), 'i2p') for row in reader}
-            shared.i2p_node_pool.update(shared.i2p_core_nodes)
-
     @staticmethod
     def pickle_objects():
         try:
@@ -242,18 +153,17 @@ class Manager(threading.Thread):
     @staticmethod
     def pickle_nodes():
         if len(shared.node_pool) > 10000:
-            shared.node_pool = set(random.sample(
+            shared.node_pool = set(random.sample(shared.node_pool, 10000))
-                tuple(shared.node_pool), 10000))
         if len(shared.unchecked_node_pool) > 1000:
-            shared.unchecked_node_pool = set(random.sample(
+            shared.unchecked_node_pool = set(
-                tuple(shared.unchecked_node_pool), 1000))
+                random.sample(shared.unchecked_node_pool, 1000))
 
         if len(shared.i2p_node_pool) > 1000:
-            shared.i2p_node_pool = set(random.sample(
+            shared.i2p_node_pool = set(
-                tuple(shared.i2p_node_pool), 1000))
+                random.sample(shared.i2p_node_pool, 1000))
         if len(shared.i2p_unchecked_node_pool) > 100:
-            shared.i2p_unchecked_node_pool = set(random.sample(
+            shared.i2p_unchecked_node_pool = set(
-                tuple(shared.i2p_unchecked_node_pool), 100))
+                random.sample(shared.i2p_unchecked_node_pool, 100))
 
         try:
             with open(
@@ -277,5 +187,5 @@ class Manager(threading.Thread):
             obj = structure.Object(
                 b'\x00' * 8, int(time.time() + 2 * 3600),
                 shared.i2p_dest_obj_type, shared.i2p_dest_obj_version,
-                shared.stream, dest_pub_raw)
+                1, dest_pub_raw)
             proofofwork.do_pow_and_publish(obj)

minode/message.py

@@ -91,19 +91,12 @@ class Message():
         return cls(h.command, payload)
 
 
-def _payload_read_int(data):
-    varint_length = structure.VarInt.length(data[0])
-    return (
-        structure.VarInt.from_bytes(data[:varint_length]).n,
-        data[varint_length:])
-
-
 class Version():
     """The version message payload"""
     def __init__(
         self, host, port, protocol_version=shared.protocol_version,
         services=shared.services, nonce=shared.nonce,
-        user_agent=shared.user_agent, streams=None
+        user_agent=shared.user_agent
     ):
         self.host = host
         self.port = port
@@ -112,9 +105,6 @@ class Version():
         self.services = services
         self.nonce = nonce
         self.user_agent = user_agent
-        self.streams = streams or [shared.stream]
-        if len(self.streams) > 160000:
-            self.streams = self.streams[:160000]
 
     def __repr__(self):
         return (
@@ -129,29 +119,26 @@ class Version():
         payload += struct.pack('>Q', self.services)
         payload += struct.pack('>Q', int(time.time()))
         payload += structure.NetAddrNoPrefix(
-            1, self.host, self.port).to_bytes()
+            shared.services, self.host, self.port).to_bytes()
         payload += structure.NetAddrNoPrefix(
-            self.services, '127.0.0.1', 8444).to_bytes()
+            shared.services, '127.0.0.1', 8444).to_bytes()
         payload += self.nonce
-        payload += structure.VarInt(len(self.user_agent)).to_bytes()
+        payload += structure.VarInt(len(shared.user_agent)).to_bytes()
-        payload += self.user_agent
+        payload += shared.user_agent
-        payload += structure.VarInt(len(self.streams)).to_bytes()
+        payload += 2 * structure.VarInt(1).to_bytes()
-        for stream in self.streams:
-            payload += structure.VarInt(stream).to_bytes()
 
         return Message(b'version', payload).to_bytes()
 
     @classmethod
-    def from_message(cls, m):
+    def from_bytes(cls, b):
+        m = Message.from_bytes(b)
+
         payload = m.payload
 
-        (  # unused: net_addr_local
+        (  # unused: timestamp, net_addr_local
-            protocol_version, services, timestamp, net_addr_remote, _, nonce
+            protocol_version, services, _, net_addr_remote, _, nonce
         ) = struct.unpack('>IQQ26s26s8s', payload[:80])
 
-        if abs(time.time() - timestamp) > 3600:
-            raise ValueError('remote time offset is too large')
-
         net_addr_remote = structure.NetAddrNoPrefix.from_bytes(net_addr_remote)
 
         host = net_addr_remote.host
@@ -159,24 +146,20 @@ class Version():
 
         payload = payload[80:]
 
-        user_agent_length, payload = _payload_read_int(payload)
+        user_agent_varint_length = structure.VarInt.length(payload[0])
+        user_agent_length = structure.VarInt.from_bytes(
+            payload[:user_agent_varint_length]).n
+
+        payload = payload[user_agent_varint_length:]
+
         user_agent = payload[:user_agent_length]
+
         payload = payload[user_agent_length:]
 
-        streams_count, payload = _payload_read_int(payload)
+        if payload != b'\x01\x01':
-        if streams_count > 160000:
+            raise ValueError('message not for stream 1')
-            raise ValueError('malformed Version message, to many streams')
-        streams = []
 
-        while payload:
+        return cls(host, port, protocol_version, services, nonce, user_agent)
-            stream, payload = _payload_read_int(payload)
-            streams.append(stream)
-
-        if streams_count != len(streams):
-            raise ValueError('malformed Version message, wrong streams_count')
-
-        return cls(
-            host, port, protocol_version, services, nonce, user_agent, streams)
 
 
 class Inv():
@@ -197,7 +180,11 @@ class Inv():
     def from_message(cls, m):
         payload = m.payload
 
-        vector_count, payload = _payload_read_int(payload)
+        vector_count_varint_length = structure.VarInt.length(payload[0])
+        vector_count = structure.VarInt.from_bytes(
+            payload[:vector_count_varint_length]).n
+
+        payload = payload[vector_count_varint_length:]
 
         vectors = set()
 
@@ -229,7 +216,11 @@ class GetData():
     def from_message(cls, m):
         payload = m.payload
 
-        vector_count, payload = _payload_read_int(payload)
+        vector_count_varint_length = structure.VarInt.length(payload[0])
+        vector_count = structure.VarInt.from_bytes(
+            payload[:vector_count_varint_length]).n
+
+        payload = payload[vector_count_varint_length:]
 
         vectors = set()
 
@@ -261,8 +252,11 @@ class Addr():
     def from_message(cls, m):
         payload = m.payload
 
-        # not validating addr_count
+        addr_count_varint_length = structure.VarInt.length(payload[0])
-        _, payload = _payload_read_int(payload)
+        # addr_count = structure.VarInt.from_bytes(
+        #     payload[:addr_count_varint_length]).n
+
+        payload = payload[addr_count_varint_length:]
 
         addresses = set()
 
@@ -271,37 +265,3 @@ class Addr():
             payload = payload[38:]
 
         return cls(addresses)
-
-
-class Error():
-    """The error message payload"""
-    def __init__(self, error_text=b'', fatal=0, ban_time=0, vector=b''):
-        self.error_text = error_text
-        self.fatal = fatal
-        self.ban_time = ban_time
-        self.vector = vector
-
-    def __repr__(self):
-        return 'error, text: {}'.format(self.error_text)
-
-    def to_bytes(self):
-        return Message(
-            b'error', structure.VarInt(self.fatal).to_bytes()
-            + structure.VarInt(self.ban_time).to_bytes()
-            + structure.VarInt(len(self.vector)).to_bytes() + self.vector
-            + structure.VarInt(len(self.error_text)).to_bytes()
-            + self.error_text
-        ).to_bytes()
-
-    @classmethod
-    def from_message(cls, m):
-        payload = m.payload
-        fatal, payload = _payload_read_int(payload)
-        ban_time, payload = _payload_read_int(payload)
-        vector_length, payload = _payload_read_int(payload)
-        vector = payload[:vector_length]
-        payload = payload[vector_length:]
-        error_text_length, payload = _payload_read_int(payload)
-        error_text = payload[:error_text_length]
-
-        return cls(error_text, fatal, ban_time, vector)

minode/shared.py

@@ -16,12 +16,14 @@ ip_enabled = True
 
 log_level = logging.INFO
 
+curve = 714  # secp256k1
+key_length = 32
 magic_bytes = b'\xe9\xbe\xb4\xd9'
 protocol_version = 3
 services = 3  # NODE_NETWORK, NODE_SSL
 stream = 1
 nonce = os.urandom(8)
-user_agent = b'/MiNode:0.3.3/'
+user_agent = b'/MiNode:0.3.2/'
 timeout = 600
 header_length = 24
 i2p_dest_obj_type = 0x493250
@@ -63,4 +65,5 @@ outgoing_connections = 8
 connection_limit = 250
 
 objects = {}
+junk_vectors = set()
 objects_lock = threading.Lock()

minode/structure.py

@@ -60,12 +60,6 @@ class Object():
         self.vector = hashlib.sha512(hashlib.sha512(
             self.to_bytes()).digest()).digest()[:32]
 
-        self.tag = (
-            # broadcast from version 5 and pubkey/getpukey from version 4
-            self.object_payload[:32] if object_type == 3 and version == 5
-            or (object_type in (0, 1) and version == 4)
-            else None)
-
     def __repr__(self):
         return 'object, vector: {}'.format(
             base64.b16encode(self.vector).decode())
@@ -118,16 +112,18 @@ class Object():
                 'Invalid object %s, reason: payload is too long',
                 base64.b16encode(self.vector).decode())
             return False
-        if self.stream_number != shared.stream:
+        if self.stream_number != 1:
             logging.warning(
-                'Invalid object %s, reason: not in stream %i',
+                'Invalid object %s, reason: not in stream 1',
-                base64.b16encode(self.vector).decode(), shared.stream)
+                base64.b16encode(self.vector).decode())
             return False
-
+        data = self.to_bytes()[8:]
+        # length = len(data) + 8 + shared.payload_length_extra_bytes
+        # dt = max(self.expires_time - time.time(), 0)
+        h = hashlib.sha512(data).digest()
         pow_value = int.from_bytes(
             hashlib.sha512(hashlib.sha512(
-                self.nonce + self.pow_initial_hash()
+                self.nonce + h).digest()).digest()[:8], 'big')
-            ).digest()).digest()[:8], 'big')
         target = self.pow_target()
         if target < pow_value:
             logging.warning(
@@ -136,6 +132,31 @@ class Object():
             return False
         return True
 
+    def is_junk(self):
+        """
+        Returns True if an object with encrypted payload has
+        curve number or key length different from those defined in shared.
+        """
+        if self.object_type not in (1, 2, 3):
+            return False
+        if self.object_type == 2:
+            sp = 0
+        elif self.object_type == 1 and self.version != 4:
+            return False
+        else:
+            sp = 32
+        sp += 16
+        curve = struct.unpack('!H', self.object_payload[sp:sp + 2])[0]
+        if curve != shared.curve:
+            return True
+        length = struct.unpack('!H', self.object_payload[sp + 2:sp + 4])[0]
+        if length > shared.key_length:
+            return True
+        length = struct.unpack('!H', self.object_payload[sp + 36:sp + 38])[0]
+        if length > shared.key_length:
+            return True
+        return False
+
     def pow_target(self):
         """Compute PoW target"""
         data = self.to_bytes()[8:]
@@ -173,21 +194,6 @@ class NetAddrNoPrefix():
         b += struct.pack('>H', int(self.port))
         return b
 
-    @staticmethod
-    def network_group(host):
-        """A simplified network group identifier from pybitmessage protocol"""
-        try:
-            host = socket.inet_pton(socket.AF_INET, host)
-            return host[:2]
-        except socket.error:
-            try:
-                host = socket.inet_pton(socket.AF_INET6, host)
-                return host[:12]
-            except OSError:
-                return host
-        except TypeError:
-            return host
-
     @classmethod
     def from_bytes(cls, b):
         services, host, port = struct.unpack('>Q16sH', b)

minode/tests/test_memory.py

@@ -1,57 +0,0 @@
-"""Tests for memory usage"""
-
-import gc
-import time
-
-from minode import shared
-
-from .test_network import TestProcessProto, run_listener
-
-
-class TestListener(TestProcessProto):
-    """A separate test case for Listener with a process with --trusted-peer"""
-    _process_cmd = ['minode', '--trusted-peer', '127.0.0.1']
-
-    def setUp(self):
-        shared.shutting_down = False
-
-    @classmethod
-    def tearDownClass(cls):
-        super().tearDownClass()
-        shared.shutting_down = False
-
-    def test_listener(self):
-        """Start Listener and disconnect a client"""
-        with run_listener() as listener:
-            if not listener:
-                self.fail('Failed to start listener')
-
-            shared.connection_limit = 2
-            connected = False
-            started = time.time()
-            while not connected:
-                time.sleep(0.2)
-                if time.time() - started > 90:
-                    self.fail('Failed to establish the connection')
-                for c in shared.connections:
-                    if c.status == 'fully_established':
-                        connected = True
-
-            if not self._stop_process(10):
-                self.fail('Failed to stop the client process')
-
-            for c in shared.connections.copy():
-                if not c.is_alive() or c.status == 'disconnected':
-                    shared.connections.remove(c)
-                    c = None
-                    break
-            else:
-                self.fail('The connection is alive')
-
-            gc.collect()
-            for obj in gc.get_objects():
-                if (
-                    isinstance(obj, shared.connection)
-                    and obj not in shared.connections
-                ):
-                    self.fail('Connection %s remains in memory' % obj)

minode/tests/test_message.py

@@ -1,6 +1,4 @@
 """Tests for messages"""
-import struct
-import time
 import unittest
 from binascii import unhexlify
 
@@ -15,7 +13,7 @@ from minode.shared import magic_bytes
 #     1626611891, 1, 1, net.ipv6(ipaddress.ip_address('127.0.0.1')).packed,
 #     8444
 # ) for _ in range(1000)]
-sample_addr_data = unhexlify(
+sample_data = unhexlify(
     'fd01f4' + (
         '0000000060f420b30000000'
         '1000000000000000100000000000000000000ffff7f00000120fc'
@@ -26,21 +24,6 @@ sample_addr_data = unhexlify(
 sample_ping_msg = unhexlify(
     'e9beb4d970696e67000000000000000000000004ee26b0dd74657374')
 
-# from pybitmessage import pathmagic
-# pathmagic.setup()
-# import protocol
-# msg = protocol.assembleVersionMessage('127.0.0.1', 8444, [1, 2, 3])
-sample_version_msg = unhexlify(
-    'e9beb4d976657273696f6e00000000000000006b1b06b182000000030000000000000003'
-    '0000000064fdd3e1000000000000000100000000000000000000ffff7f00000120fc0000'
-    '00000000000300000000000000000000ffff7f00000120fc00c0b6c3eefb2adf162f5079'
-    '4269746d6573736167653a302e362e332e322f03010203'
-)
-
-#
-sample_error_data = \
-    b'\x02\x00\x006Too many connections from your IP. Closing connection.'
-
 
 class TestMessage(unittest.TestCase):
     """Test assembling and disassembling of network mesages"""
@@ -64,7 +47,7 @@ class TestMessage(unittest.TestCase):
 
     def test_addr(self):
         """Test addr messages"""
-        msg = message.Message(b'addr', sample_addr_data)
+        msg = message.Message(b'addr', sample_data)
         addr_packet = message.Addr.from_message(msg)
         self.assertEqual(len(addr_packet.addresses), 500)
         address = addr_packet.addresses.pop()
@@ -72,39 +55,3 @@ class TestMessage(unittest.TestCase):
         self.assertEqual(address.services, 1)
         self.assertEqual(address.port, 8444)
         self.assertEqual(address.host, '127.0.0.1')
-
-    def test_version(self):
-        """Test version message"""
-        msg = message.Message.from_bytes(sample_version_msg)
-        self.assertEqual(msg.command, b'version')
-        with self.assertRaises(ValueError):
-            # large time offset
-            version_packet = message.Version.from_message(msg)
-        msg.payload = (
-            msg.payload[:12] + struct.pack('>Q', int(time.time()))
-            + msg.payload[20:])
-
-        version_packet = message.Version.from_message(msg)
-        self.assertEqual(version_packet.host, '127.0.0.1')
-        self.assertEqual(version_packet.port, 8444)
-        self.assertEqual(version_packet.protocol_version, 3)
-        self.assertEqual(version_packet.services, 3)
-        self.assertEqual(version_packet.user_agent, b'/PyBitmessage:0.6.3.2/')
-        self.assertEqual(version_packet.streams, [1, 2, 3])
-
-        msg = version_packet.to_bytes()
-        # omit header and timestamp
-        self.assertEqual(msg[24:36], sample_version_msg[24:36])
-        self.assertEqual(msg[44:], sample_version_msg[44:])
-
-    def test_error(self):
-        """Test error message"""
-        msg = message.Error.from_message(
-            message.Message(b'error', sample_error_data))
-        self.assertEqual(msg.fatal, 2)
-        self.assertEqual(msg.ban_time, 0)
-        self.assertEqual(msg.vector, b'')
-
-        msg = message.Error(
-            b'Too many connections from your IP. Closing connection.', 2)
-        self.assertEqual(msg.to_bytes()[24:], sample_error_data)

minode/tests/test_network.py

@@ -1,279 +0,0 @@
-"""Tests for network connections"""
-import ipaddress
-import logging
-import os
-import random
-import unittest
-import tempfile
-import time
-from contextlib import contextmanager
-
-from minode import connection, main, shared
-from minode.listener import Listener
-from minode.manager import Manager
-
-from .test_process import TestProcessProto
-
-
-logging.basicConfig(
-    level=logging.INFO,
-    format='[%(asctime)s] [%(levelname)s] %(message)s')
-
-
-@contextmanager
-def time_offset(offset):
-    """
-    Replace time.time() by a mock returning a constant value
-    with given offset from current time.
-    """
-    started = time.time()
-    time_call = time.time
-    try:
-        time.time = lambda: started + offset
-        yield time_call
-    finally:
-        time.time = time_call
-
-
-@contextmanager
-def run_listener(host='localhost', port=8444):
-    """
-    Run the Listener with zero connection limit and
-    reset variables in shared after its stop.
-    """
-    connection_limit = shared.connection_limit
-    shared.connection_limit = 0
-    try:
-        listener = Listener(host, port)
-        listener.start()
-        yield listener
-    except OSError:
-        yield
-    finally:
-        shared.connection_limit = connection_limit
-        shared.connections.clear()
-        shared.shutting_down = True
-        time.sleep(1)
-
-
-class TestNetwork(unittest.TestCase):
-    """Test case starting connections"""
-
-    @classmethod
-    def setUpClass(cls):
-        shared.data_directory = tempfile.gettempdir()
-
-    def setUp(self):
-        shared.core_nodes.clear()
-        shared.unchecked_node_pool.clear()
-        shared.objects = {}
-        try:
-            os.remove(os.path.join(shared.data_directory, 'objects.pickle'))
-        except FileNotFoundError:
-            pass
-
-    def _make_initial_nodes(self):
-        Manager.load_data()
-        core_nodes_len = len(shared.core_nodes)
-        self.assertGreaterEqual(core_nodes_len, 3)
-
-        main.bootstrap_from_dns()
-        self.assertGreaterEqual(len(shared.core_nodes), core_nodes_len)
-        for host, _ in shared.core_nodes:
-            try:
-                ipaddress.IPv4Address(host)
-            except ipaddress.AddressValueError:
-                try:
-                    ipaddress.IPv6Address(host)
-                except ipaddress.AddressValueError:
-                    self.fail('Found not an IP address in the core nodes')
-                break
-        else:
-            self.fail('No IPv6 address found in the core nodes')
-
-    def test_bootstrap(self):
-        """Start bootstrappers and check node pool"""
-        if shared.core_nodes:
-            shared.core_nodes = set()
-        if shared.unchecked_node_pool:
-            shared.unchecked_node_pool = set()
-
-        self._make_initial_nodes()
-        self.assertEqual(len(shared.unchecked_node_pool), 0)
-
-        for node in shared.core_nodes:
-            c = connection.Bootstrapper(*node)
-            c.start()
-            c.join()
-            if len(shared.unchecked_node_pool) > 2:
-                break
-        else:
-            self.fail(
-                'Failed to find at least 3 nodes'
-                ' after running %s bootstrappers' % len(shared.core_nodes))
-
-    def test_connection(self):
-        """Check a normal connection - should receive objects"""
-        self._make_initial_nodes()
-
-        started = time.time()
-        nodes = list(shared.core_nodes.union(shared.unchecked_node_pool))
-        random.shuffle(nodes)
-
-        for node in nodes:
-            # unknown = node not in shared.node_pool
-            # self.assertTrue(unknown)
-            unknown = True
-            shared.node_pool.discard(node)
-
-            c = connection.Connection(*node)
-            c.start()
-            connection_started = time.time()
-            while c.status not in ('disconnected', 'failed'):
-                # The addr of established connection is added to nodes pool
-                if unknown and c.status == 'fully_established':
-                    unknown = False
-                    self.assertIn(node, shared.node_pool)
-                if shared.objects or time.time() - connection_started > 90:
-                    c.status = 'disconnecting'
-                if time.time() - started > 300:
-                    c.status = 'disconnecting'
-                    self.fail('Failed to receive an object in %s sec' % 300)
-                time.sleep(0.2)
-            if shared.objects:  # got some objects
-                break
-        else:
-            self.fail('Failed to establish a proper connection')
-
-    def test_time_offset(self):
-        """Assert the network bans for large time offset"""
-        def try_connect(nodes, timeout, call):
-            started = call()
-            for node in nodes:
-                c = connection.Connection(*node)
-                c.start()
-                while call() < started + timeout:
-                    if c.status == 'fully_established':
-                        return 'Established a connection'
-                    if c.status in ('disconnected', 'failed'):
-                        break
-                    time.sleep(0.2)
-                else:
-                    return 'Spent too much time trying to connect'
-
-        def time_offset_connections(nodes, offset):
-            """Spoof time.time and open connections with given time offset"""
-            with time_offset(offset) as time_call:
-                result = try_connect(nodes, 200, time_call)
-                if result:
-                    self.fail(result)
-
-        self._make_initial_nodes()
-        nodes = random.sample(
-            tuple(shared.core_nodes.union(shared.unchecked_node_pool)), 5)
-
-        time_offset_connections(nodes, 4000)
-        time_offset_connections(nodes, -4000)
-
-
-class TestListener(TestProcessProto):
-    """A separate test case for Listener with a process with --trusted-peer"""
-    _process_cmd = ['minode', '--trusted-peer', '127.0.0.1']
-
-    def setUp(self):
-        shared.shutting_down = False
-
-    @classmethod
-    def tearDownClass(cls):
-        super().tearDownClass()
-        shared.shutting_down = False
-
-    def test_listener(self):
-        """Start Listener and try to connect"""
-        with run_listener() as listener:
-            if not listener:
-                self.fail('Failed to start listener')
-
-            c = connection.Connection('127.0.0.1', 8444)
-            shared.connections.add(c)
-
-            for _ in range(30):
-                if len(shared.connections) > 1:
-                    self.fail('The listener ignored connection limit')
-                time.sleep(0.5)
-
-            shared.connection_limit = 2
-            c.start()
-            started = time.time()
-            while c.status not in ('disconnected', 'failed'):
-                if c.status == 'fully_established':
-                    self.fail('Connected to itself')
-                if time.time() - started > 90:
-                    c.status = 'disconnecting'
-                time.sleep(0.2)
-
-            server = None
-            started = time.time()
-            while not server:
-                time.sleep(0.2)
-                if time.time() - started > 90:
-                    self.fail('Failed to establish the connection')
-                for c in shared.connections:
-                    if c.status == 'fully_established':
-                        server = c
-            self.assertTrue(server.server)
-
-            while not self.process.connections():
-                time.sleep(0.2)
-                if time.time() - started > 90:
-                    self.fail('Failed to connect to listener')
-
-            client = self.process.connections()[0]
-            self.assertEqual(client.raddr[0], '127.0.0.1')
-            self.assertEqual(client.raddr[1], 8444)
-            self.assertEqual(server.host, client.laddr[0])
-            # self.assertEqual(server.port, client.laddr[1])
-            server.status = 'disconnecting'
-
-        self.assertFalse(listener.is_alive())
-
-    def test_listener_timeoffset(self):
-        """Run listener with a large time offset - shouldn't connect"""
-        with time_offset(4000):
-            with run_listener() as listener:
-                if not listener:
-                    self.fail('Failed to start listener')
-                shared.connection_limit = 2
-                for _ in range(30):
-                    for c in shared.connections:
-                        if c.status == 'fully_established':
-                            self.fail('Established a connection')
-                    time.sleep(0.5)
-
-
-class TestBootstrapProcess(TestProcessProto):
-    """A separate test case for bootstrapping with a minode process"""
-    _listen = True
-    _connection_limit = 24
-
-    def test_bootstrap(self):
-        """Start a bootstrapper for the local process and check node pool"""
-        if shared.unchecked_node_pool:
-            shared.unchecked_node_pool = set()
-
-        started = time.time()
-        while not self.connections():
-            if time.time() - started > 60:
-                self.fail('Failed to establish a connection')
-            time.sleep(1)
-
-        for _ in range(3):
-            c = connection.Bootstrapper('127.0.0.1', 8444)
-            c.start()
-            c.join()
-            if len(shared.unchecked_node_pool) > 2:
-                break
-        else:
-            self.fail(
-                'Failed to find at least 3 nodes'
-                ' after 3 tries to bootstrap with the local process')

minode/tests/test_process.py

@@ -1,18 +1,14 @@
 """Blind tests, starting the minode process"""
-import os
+import unittest
 import signal
 import socket
 import subprocess
 import sys
 import tempfile
 import time
-import unittest
 
 import psutil
 
-from minode.i2p import util
-from minode.structure import NetAddrNoPrefix
-
 try:
     socket.socket().bind(('127.0.0.1', 7656))
     i2p_port_free = True
@@ -23,7 +19,7 @@ except (OSError, socket.error):
 class TestProcessProto(unittest.TestCase):
     """Test process attributes, common flow"""
     _process_cmd = ['minode']
-    _connection_limit = 4 if sys.platform.startswith('win') else 8
+    _connection_limit = 4 if sys.platform.startswith('win') else 10
     _listen = False
     _listening_port = None
 
@@ -73,20 +69,17 @@ class TestProcessProto(unittest.TestCase):
 
 class TestProcessShutdown(TestProcessProto):
     """Separate test case for SIGTERM"""
-    _wait_time = 30
-    # longer wait time because it's not a benchmark
-
     def test_shutdown(self):
         """Send to minode SIGTERM and ensure it stopped"""
+        # longer wait time because it's not a benchmark
         self.assertTrue(
-            self._stop_process(self._wait_time),
+            self._stop_process(20),
-            '%s has not stopped in %i sec' % (
+            '%s has not stopped in 20 sec' % ' '.join(self._process_cmd))
-                ' '.join(self._process_cmd), self._wait_time))
 
 
 class TestProcess(TestProcessProto):
     """The test case for minode process"""
-    _wait_time = 180
+    _wait_time = 120
     _check_limit = False
 
     def test_connections(self):
@@ -106,20 +99,14 @@ class TestProcess(TestProcessProto):
                 time.sleep(1)
 
         for _ in range(self._wait_time * 2):
-            if len(self.connections()) >= self._connection_limit / 2:
+            if len(self.connections()) > self._connection_limit / 2:
                 _time_to_connect = round(time.time() - _started)
                 break
-            if '--i2p' not in self._process_cmd:
-                groups = []
-                for c in self.connections():
-                    group = NetAddrNoPrefix.network_group(c.raddr[0])
-                    self.assertNotIn(group, groups)
-                    groups.append(group)
             time.sleep(0.5)
         else:
             self.fail(
-                'Failed to establish at least %i connections in %s sec'
+                'Failed establish at least %s connections in %s sec'
-                % (int(self._connection_limit / 2), self._wait_time))
+                % (self._connection_limit / 2, self._wait_time))
 
         if self._check_limit:
             continue_check_limit(_time_to_connect)
@@ -140,39 +127,11 @@ class TestProcess(TestProcessProto):
 class TestProcessI2P(TestProcess):
     """Test minode process with --i2p and no IP"""
     _process_cmd = ['minode', '--i2p', '--no-ip']
+    _connection_limit = 4
+    _wait_time = 120
     _listen = True
     _listening_port = 8448
 
-    @classmethod
-    def setUpClass(cls):
-        cls.freezed = False
-        cls.keyfile = os.path.join(cls.home, 'i2p_dest.pub')
-        saved = os.path.isfile(cls.keyfile)
-        super().setUpClass()
-        for _ in range(cls._wait_time):
-            if saved:
-                if cls.process.num_threads() > 3:
-                    break
-            elif os.path.isfile(cls.keyfile):
-                break
-            time.sleep(1)
-        else:
-            cls.freezed = True
-
-    def setUp(self):
-        """Skip any test if I2PController freezed"""
-        if self.freezed:
-            raise unittest.SkipTest(
-                'I2PController has probably failed to start')
-
-    def test_saved_keys(self):
-        """Check saved i2p keys"""
-        with open(self.keyfile, 'br') as src:
-            i2p_dest_pub = src.read()
-        with open(os.path.join(self.home, 'i2p_dest_priv.key'), 'br') as src:
-            i2p_dest_priv = src.read()
-        self.assertEqual(util.pub_from_priv(i2p_dest_priv), i2p_dest_pub)
-
     def test_connections(self):
         """Ensure all connections are I2P"""
         super().test_connections()

minode/tests/test_structure.py

@@ -1,13 +1,9 @@
 """Tests for structures"""
-import base64
-import logging
-import queue
-import struct
-import time
 import unittest
+import struct
 from binascii import unhexlify
 
-from minode import message, proofofwork, shared, structure
+from minode import structure
 
 
 # host pregenerated by pybitmessage.protocol.encodeHost()
@@ -17,24 +13,10 @@ sample_addr_data = unhexlify(
     '0000000060f420b3000000010000000000000001'
     '260753000201300000000000000057ae1f90')
 
-# data for an object with expires_time 1697063939
-# structure.Object(
-#     b'\x00' * 8, expires_time, 42, 1, 2, b'HELLO').to_bytes()
-sample_object_data = unhexlify(
-    '000000000000000000000000652724030000002a010248454c4c4f')
-
-logging.basicConfig(
-    level=shared.log_level,
-    format='[%(asctime)s] [%(levelname)s] %(message)s')
-
 
 class TestStructure(unittest.TestCase):
     """Testing structures serializing and deserializing"""
 
-    @classmethod
-    def setUpClass(cls):
-        shared.objects = {}
-
     def test_varint(self):
         """Test varint serializing and deserializing"""
         s = structure.VarInt(0)
@@ -103,92 +85,3 @@ class TestStructure(unittest.TestCase):
 
         addr = structure.NetAddr(1, '2607:5300:201:3000::57ae', 8080, 1)
         self.assertEqual(addr.to_bytes()[8:], sample_addr_data[8:])
-
-    def test_network_group(self):
-        """Test various types of network groups"""
-        test_ip = '1.2.3.4'
-        self.assertEqual(
-            b'\x01\x02', structure.NetAddrNoPrefix.network_group(test_ip))
-        self.assertEqual(
-            structure.NetAddrNoPrefix.network_group('8.8.8.8'),
-            structure.NetAddrNoPrefix.network_group('8.8.4.4'))
-        self.assertNotEqual(
-            structure.NetAddrNoPrefix.network_group('1.1.1.1'),
-            structure.NetAddrNoPrefix.network_group('8.8.8.8'))
-        test_ip = '0102:0304:0506:0708:090A:0B0C:0D0E:0F10'
-        self.assertEqual(
-            b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C',
-            structure.NetAddrNoPrefix.network_group(test_ip))
-        for test_ip in (
-            'bootstrap8444.bitmessage.org', 'quzwelsuziwqgpt2.onion', None
-        ):
-            self.assertEqual(
-                test_ip, structure.NetAddrNoPrefix.network_group(test_ip))
-
-    def test_object(self):
-        """Create and check objects"""
-        obj = structure.Object.from_message(
-            message.Message(b'object', sample_object_data))
-        self.assertEqual(obj.object_type, 42)
-        self.assertEqual(obj.stream_number, 2)
-        self.assertEqual(obj.expires_time, 1697063939)
-        self.assertEqual(obj.object_payload, b'HELLO')
-
-        obj = structure.Object(
-            b'\x00' * 8, int(time.time() + 3000000), 42, 1, 1, b'HELLO')
-        self.assertFalse(obj.is_valid())
-        obj.expires_time = int(time.time() - 11000)
-        self.assertFalse(obj.is_valid())
-
-        obj = structure.Object(
-            b'\x00' * 8, int(time.time() + 300), 42, 1, 2, b'HELLO')
-        vector = obj.vector
-        proofofwork._worker(obj)  # pylint: disable=protected-access
-        obj = shared.objects.popitem()[1]
-        self.assertNotEqual(obj.vector, vector)
-        self.assertFalse(obj.is_expired())
-        self.assertFalse(obj.is_valid())
-        shared.stream = 2
-        self.assertTrue(obj.is_valid())
-
-        obj.object_payload = \
-            b'TIGER, tiger, burning bright. In the forests of the night'
-        self.assertFalse(obj.is_valid())
-
-    def test_proofofwork(self):
-        """Check the main proofofwork call and worker"""
-        shared.vector_advertise_queue = queue.Queue()
-        obj = structure.Object(
-            b'\x00' * 8, int(time.time() + 300), 42, 1,
-            shared.stream, b'HELLO')
-        start_time = time.time()
-        proofofwork.do_pow_and_publish(obj)
-        try:
-            vector = shared.vector_advertise_queue.get(timeout=300)
-        except queue.Empty:
-            self.fail("Couldn't make work in 300 sec")
-        else:
-            time.sleep(1)
-            try:
-                result = shared.objects[vector]
-            except KeyError:
-                self.fail(
-                    "Couldn't found object with vector %s"
-                    " %s sec after pow start" % (
-                        base64.b16encode(vector), time.time() - start_time))
-            self.assertTrue(result.is_valid())
-            self.assertEqual(result.object_type, 42)
-            self.assertEqual(result.object_payload, b'HELLO')
-
-        q = queue.Queue()
-        # pylint: disable=protected-access
-        proofofwork._pow_worker(obj.pow_target(), obj.pow_initial_hash(), q)
-        try:
-            nonce = q.get(timeout=5)
-        except queue.Empty:
-            self.fail("No nonce found in the queue")
-
-        obj = structure.Object(
-            nonce, obj.expires_time, obj.object_type, obj.version,
-            obj.stream_number, obj.object_payload)
-        self.assertTrue(obj.is_valid())

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = reset,py3{6,7,8,9,10,11},stats
+envlist = reset,py{36,37,38,39,310},stats
 skip_missing_interpreters = true
 
 [testenv]
@@ -41,5 +41,4 @@ ignore_errors = true
 
 [pylint.main]
 disable = invalid-name,consider-using-f-string,fixme
-max-args = 8
+max-args = 7
-max-attributes = 8