From cbe8d3f7997d314474ff9e0cfd888e1a018e7640 Mon Sep 17 00:00:00 2001 From: idk Date: Tue, 14 Mar 2023 22:42:24 +0000 Subject: [PATCH 1/5] add blocklist --- installer/resources/blocklist.txt | 89 +++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/installer/resources/blocklist.txt b/installer/resources/blocklist.txt index 8bbe50962c..216f377c01 100644 --- a/installer/resources/blocklist.txt +++ b/installer/resources/blocklist.txt @@ -122,9 +122,12 @@ Sybil:163.44.149.31 Sybil:178.21.164.0/24 Sybil:185.69.185.0/24 Sybil:185.69.186.0/24 +Tunnels:185.213.155.252 +NetDB:186.166.142.51 Sybil:202.182.126.246 Sybil:213.142.149.0/24 Sybil:213.238.166.0/24 +Tunnels:223.167.199.60 Sybil:2001;df6;b800;1128;a163;44;149;310 Sybil:2001;19f0;4400;4376;5400;ff;fe47;bcbd Sybil:2001;19f0;5801;1d4;5400;ff;fe38;a26e @@ -138,7 +141,93 @@ Sybil:2400;8500;1302;819;a150;95;134;1590 Sybil:2400;8500;1302;824;a150;95;144;951 Sybil:2400;8500;1302;825;150;95;147;89 Sybil:2400;8500;1302;828;a150;95;153;2202 +Tunnels:2a03;1b20;6;f011;0;0;0;a02e Tunnels:JbifzqZZqeTXtxK6KDqNUPWaW-phKqeS~tfJT82SIYI= Tunnels:QPUV1bW6arN2zp3gTBMvOEvgSuKbXUqk2oqHkb~UoSw= Tunnels:CyLg6w8lypk1gnAX-CdG8O4NCR86hq8ifge6QKXAoJg= Tunnels:DtQsGzkbeR3nilr6ZvywR2O7-f0XaaV~YfHXohqwjgI= +Tunnels:lam824jtkYq4qTiZHT~TkdHoVTVRwnLghgFheZbgDhU= +Tunnels:Qqj3p9F0Y~qXAkSz3FYo~e~OfSgaM5qZ2OYUrzOtrgM= +Tunnels:NUo2wncm49XY8f~dzdxII5fnVopL9oT92KC9JC3IOFY= +Tunnels:GEpq15rG0XjIvP7oZCW9cmL8Dhb8eLSweTU3hZuT2fE= +Tunnels:aNBK4IQwYCejjMnD31hapWQvova~u1OINPnHCqceljw= +Tunnels:6lWUeurYBX4w6lsfPdkAxbFKXoGEXKxofXwlWOC3RQA= +Tunnels:xKAdoKJUvrSEGS0gREC4lEUawa4IKsVnQU189X~QQhk= +Tunnels:2EJgHsXnjQo8gHt-jmS-GlhXjqtHnNgWiK~QyQ0Rsh4= +Tunnels:o-atVIIK0N2Eu6r2Nq42cAVqlK6wJGrXqU0Ps3x0HmY= +Tunnels:2C-fFbGjOJks1mDYxlQ~~M3Q-tX9Dx~tyAUHPzfct~E= +NetDB:Qc5rvLavMYNhzQBQfBgFkZbesEvGW~3nz1ZwllR1MoM= +0bLUiXtgYCzAy3533C~wjaUxUkH63JGSRlx2huH-6Bo= +3~ZOYyQFJAJXxuynetnoijOFjliGGmN9kZ5BkiSupy0= +4V3EsOGTWrIXJDNaGpOLZrnSGWgSxwgZ7Tsxb0txFtE= +4yr5497JpDG-K7s1unMbvWBPPfds72Qw27DNH9FpcKQ= +5MAAvwKgnG7hYbi93q0Luro~-AyIjO5xvUbABc2T3IU= +5SI8wX-KUefASp0KbjuQ2KaCyZboFHcsXsgwaONVqzc= +6lKXyJfzTrrt2B7R-p24FSMQQHmyPBb1JSp1N49wdrM= +6yUKWdxJKF0wtxd3Ro0VfkSlLe74gvM2b0IJbzm~mT0= +7NzcMy-ty6WICyPHbYBuGQlbcMs7dV-5lN2HIZ-PvuY= +9ELLjPmb9PBMTOeXqMsRmRfLRlctQMELTZFrkDBOiVA= +AQ2Wq8Guob3CI1jve~W5wErlaaSF-iZz9mhzKsFmWeo= +BhqgIK5aTiL8UosUjmBMsCl5NtNCFCZTu0wUSFt0Mkg= +cC8PmCV4AehT0hKPAfp3yP1DYJKFxmWBk8JWSVZT8Oo= +cfhT8b5PNxSIFhmg-6ZvP78W5eD9jtGBLjM~oIRRqoE= +fGe1bjAyj-V0kRJmbXbCGp9y0ZVkYDZksdvfBwo2nME= +G7d8g3yIjMTG1M6ui1zWf-YYYe0K3Pz8dCg~gRHM-KI= +Giy8ehFNw~RyB5KV5BCMzgMUMxVI2hiWFS3gdWPthCA= +HPDYhgrDNJK0STyIJM-A3Q~aMU9D63P-7Bw-Qs15Bmk= +I5rpywP3dJsP1bfKzp-QUsRCNgT2sO7sTqxuH8~AjmQ= +ioBAP6QWbWpzkUbmpKn2eWe~XlNmFuIsTJxvstMt2hU= +jizbTEmYpthOrW2louGRyR057W9G4vcOKtvk~lPqvYg= +JtgxUY6P7VcgJV3HQUzAaUSVInTR20PT8E34xvwkEck= +kISWAKZmX0n9C~vQ19oTdL9iWdLs1BfDrssNiZunubw= +krZK4oqwsee2Qsevb9b9n5jGuNrVaTJlt-nE8G8ft5w= +lj1A58-iv9W4V9r-jrHZISKncWlSYaQCYvQcBvZppEg= +N9GkaK294wlSRKaUicSimnxDwebUWKggFlrBUpe00KA= +Oy4ZaiVxxel1XAWW1p23JlekMGEFvWbWuizQMRnG~tc= +q1rjeEo0hB61qIcER59aEdQWsX8-gpW-K862deAJkp0= +QYkhWCudqWhty-TvJ-sFd0z5uLYBXHW5t61L-I6ltJU= +RDX~26d6ugO1C-DEhkEzPQaGHurvfgKL0cXZlqr4C6Y= +RjBVJtLfMhLgaSNDpv-D4UqybO5GWSgtcJqAqqd6L~Q= +S7-xKQ1wSqiqmjODZrTWprTD1L0dtiZlwT055DArGFw= +SdXmd046uxhAvscEM7ogR6HtH2eWBiyo4~XOnj3dr7c= +Sm6IkscEdA0vBy9Cx~VQcgB2f5e0fvQ2CEu8fkceL1s= +tFv6N4kwPdOlMXo8VqoOO3UrSsWAg~-5nadozzBm2Tc= +TJwtpwSS7yANCDPDfbGdx3f4lDQNYcfA-0X75jHbbNU= +w~1a6nvIBJfFHGur0mPJmjlwjSBOrWGTC-INPEesPJ0= +wMIJ9Ax~4kW-jkFQLTHfzSSBqaMSy3EKiBH8YUQjAVA= +wPorvAjMYj6FipnUHruA0dF2K-Xm~GngCY3QDIVlZyU= +wWP~J-g-e8Fok7NpTURpJJfeNTGB5S7F15QshyRn9n0= +X52PGfb8TysUDO7pvQIKGeoPcmWx4jwQJjoHLDD7A5Y= +xirj-SFuNcYapYv7vnkfa2peqqCzuWeKeUB937Odl3s= +xXvAxpq~FFyNx9bm6XlPVXNQ7vYfGkjC7nj0xWvNjwE= +YbIKZpPSqdohVjzi8s~N-D0t~bbayKM4hHcBk-fcJvY= +ynL10zIHBslFPSf1cmAONogYvNm1WrZ9bgE0txHzOr4= +YSfLfZVPUvvyQtAltBSJ2RHcU~uTiV0x0H4y~QIPczc= +ZTOVAP9GJYEKu8CjCQBmOigw79oyTVpQQguTDqwv2EU= +-xH2G0zblY4mRQxeb1WtXAJwyy8hlsrqpY3~fgPBnoU= +~CrJVoN00MNvEjZIWudnWFzjqDPDsZxKuFq1Y~Sh8fo= +3.225.127.222 +3.234.89.179 +5.250.198.133 +18.210.78.199 +31.155.206.27 +38.242.206.110 +44.210.192.47 +46.53.244.68 +52.70.234.81 +77.165.6.8 +93.235.73.128 +98.15.244.49 +109.197.204.101 +109.197.205.47 +139.59.133.151 +145.239.83.230 +162.55.230.167 +172.6.174.68 +174.27.149.30 +176.88.62.2 +185.209.196.0/24 +185.65.134.0/24 +186.166.142.51 +193.32.249.139 +2a03;1b20;6;f011;0;0;0;a07e From 8a0a5337778b3767affddfce776a3dced2334631 Mon Sep 17 00:00:00 2001 From: idk Date: Sun, 19 Mar 2023 14:35:23 +0000 Subject: [PATCH 2/5] fix base directory path duplication in Dockerfile --- docker/rootfs/startapp.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/rootfs/startapp.sh b/docker/rootfs/startapp.sh index 8cafdeb26f..810f8a1b4c 100644 --- a/docker/rootfs/startapp.sh +++ b/docker/rootfs/startapp.sh @@ -11,7 +11,7 @@ fi # Explicitly define HOME otherwise it might not have been set export HOME=/i2p -export I2P=${HOME}/i2p +export I2P=${HOME} echo "Starting I2P" @@ -31,6 +31,7 @@ if [ -f /.dockerenv ]; then echo "[startapp] setting reachable IP to container IP $IP_ADDR" find . -name '*.config' -exec sed -i "s/127.0.0.1/$IP_ADDR/g" {} \; find . -name '*.config' -exec sed -i "s/localhost/$IP_ADDR/g" {} \; + fi # Options required for reflective access in dynamic JVM languages like Groovy and Jython From ab676bf63c56b2dddd2ea3c2cc2d1dfea76a0fa3 Mon Sep 17 00:00:00 2001 From: Anastasiya Soyka Date: Sat, 18 Mar 2023 17:32:38 +0000 Subject: [PATCH 3/5] Detect When Running as a Podman Container --- docker/rootfs/startapp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/rootfs/startapp.sh b/docker/rootfs/startapp.sh index 810f8a1b4c..7eaf033050 100644 --- a/docker/rootfs/startapp.sh +++ b/docker/rootfs/startapp.sh @@ -22,7 +22,7 @@ for jar in `ls lib/*.jar`; do CLASSPATH=${CLASSPATH}:${jar} done -if [ -f /.dockerenv ]; then +if [ -f /.dockerenv ] || [ -f /run/.containerenv ]; then echo "[startapp] Running in container" if [ -z "$IP_ADDR" ]; then export IP_ADDR=$(hostname -i) From daff55463ba3896373fa704a12a5504a4a24a368 Mon Sep 17 00:00:00 2001 From: obscuratus i2p Date: Sat, 18 Mar 2023 17:33:32 +0000 Subject: [PATCH 4/5] Router: Update and Clarify the Inline Documentation for VMCommSystem --- .../java/src/net/i2p/router/MultiRouter.java | 14 +++++++++----- .../net/i2p/router/dummy/VMCommSystem.java | 19 ++++++++++++++++--- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/router/java/src/net/i2p/router/MultiRouter.java b/router/java/src/net/i2p/router/MultiRouter.java index 0dc19fa5d8..18a802dc69 100644 --- a/router/java/src/net/i2p/router/MultiRouter.java +++ b/router/java/src/net/i2p/router/MultiRouter.java @@ -30,12 +30,16 @@ *
  • router.configLocation=rN/router.config
    • * * (where "rN" is an instance number, such as r0 or r9). - * Additionally, two other properties might be useful:
      - *
    • i2p.vmCommSystem=true
      • - *
    - * The first line tells the router to use an in-VM comm system for sending - * messages back and forth between routers (see net.i2p.transport.VMCommSystem). + * + * Optionally, i2p.vmCommSystem=true can be enabled. * + * i2p.vmCommSystem=true tells the router to use an in-VM comm system for sending + * messages back and forth between routers (see net.i2p.transport.VMCommSystem). + * + * However, the default comm system implementation is usually preferred since + * enabling the VMCommSystem will bypass UDP and TCP, and therefore will not + * provide a test bed for many important I2P systems. + * * To make the router console work, either run from a directory containing * lib/, webapps/, docs/, etc., or point i2p.dir.base to a directory containing the * above. diff --git a/router/java/src/net/i2p/router/dummy/VMCommSystem.java b/router/java/src/net/i2p/router/dummy/VMCommSystem.java index 1eb5078dd2..0436730971 100644 --- a/router/java/src/net/i2p/router/dummy/VMCommSystem.java +++ b/router/java/src/net/i2p/router/dummy/VMCommSystem.java @@ -20,10 +20,23 @@ import net.i2p.util.Log; /** - * Hacked up in-VM comm system for talking between contexts. It doesn't even - * generate any routerAddresses, but instead tracks the peers through a singleton. + * Hacked up in-VM comm system for talking between contexts within the same Java + * virtual machine. It doesn't generate any routerAddresses, but instead tracks + * the peers through a singleton. It cannot connect to anything outside of its + * own Java VM. It does not implement TCP, UDP, and therefore no NTCP or SSU. * Currently, the comm system doesn't even inject any lag, though it could (later). - * It does honor the standard transport stats though, but not the TCP specific ones. + * It does honor the standard transport stats though, but no TCP or UDP specific + * ones (since UDP and TCP are not implemented). + * + * Typically, VMCommSystem is enabled by developers when it is desirable to + * test the router without enabling a real comm system. For a variety of + * testing purposes, it can be advantageous to start the router in a mode + * where contact with the actual network is disabled. + * + * VMCommSystem can be enabled with the following setting in the + * router.config file: + * + * i2p.vmCommSystem=true * * FOR DEBUGGING AND LOCAL TESTING ONLY. */ From b5461f3b4128167f680a3b288334b5bd0ec32652 Mon Sep 17 00:00:00 2001 From: idk Date: Sun, 19 Mar 2023 15:00:48 +0000 Subject: [PATCH 5/5] ignore override.properties when building docker --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index 5136b3b8a9..657969ee42 100644 --- a/.dockerignore +++ b/.dockerignore @@ -29,3 +29,4 @@ installer/build router/java/build router/build +override.properties \ No newline at end of file