From 5c09c0304b8552a464a92879e5ee20c5947eade6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0ev=C4=8D=C3=ADk?= Date: Fri, 23 Jul 2021 15:46:03 +0200 Subject: [PATCH 1/2] Removed support for v2 hidden services --- docker/my-dojo/bitcoin/restart.sh | 1 - docker/my-dojo/dojo.sh | 85 +++++++------------------------ docker/my-dojo/tor/restart.sh | 18 ------- 3 files changed, 19 insertions(+), 85 deletions(-) diff --git a/docker/my-dojo/bitcoin/restart.sh b/docker/my-dojo/bitcoin/restart.sh index df3e9c1..0084d1b 100644 --- a/docker/my-dojo/bitcoin/restart.sh +++ b/docker/my-dojo/bitcoin/restart.sh @@ -32,7 +32,6 @@ bitcoind_options=( if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then bitcoind_options+=(-listen=1) bitcoind_options+=(-bind="$NET_DOJO_BITCOIND_IPV4") - bitcoind_options+=(-externalip=$(cat /var/lib/tor/hsv2bitcoind/hostname)) bitcoind_options+=(-externalip=$(cat /var/lib/tor/hsv3bitcoind/hostname)) fi diff --git a/docker/my-dojo/dojo.sh b/docker/my-dojo/dojo.sh index 3798f38..37d0611 100755 --- a/docker/my-dojo/dojo.sh +++ b/docker/my-dojo/dojo.sh @@ -85,7 +85,6 @@ stop() { # Renewal of bitcoind onion address if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then if [ "$BITCOIND_EPHEMERAL_HS" = "on" ]; then - $( docker exec -it tor rm -rf /var/lib/tor/hsv2bitcoind ) &> /dev/null $( docker exec -it tor rm -rf /var/lib/tor/hsv3bitcoind ) &> /dev/null fi fi @@ -355,77 +354,35 @@ upgrade() { # Display the onion addresses onion() { - version=3 - - # Extract version arguments - if [ $# -gt 0 ]; then - for option in $@ - do - case "$option" in - v2 ) version=2 ;; - v3 ) version=3 ;; - * ) break ;; - esac - done - fi - echo " " echo "WARNING: Do not share these onion addresses with anyone!" echo " To allow another person to use this Dojo with their Samourai Wallet," echo " you should share the QRCodes provided by the Maintenance Tool." echo " " - if [ $version -eq 3 ]; then - # V3 onion addresses - V3_ADDR=$( docker exec -it tor cat /var/lib/tor/hsv3dojo/hostname ) - echo "Dojo API and Maintenance Tool = $V3_ADDR" - echo " " - - if [ "$EXPLORER_INSTALL" == "on" ]; then - V3_ADDR_EXPLORER=$( docker exec -it tor cat /var/lib/tor/hsv3explorer/hostname ) - echo "Block Explorer = $V3_ADDR_EXPLORER" - echo " " - fi - - if [ "$WHIRLPOOL_INSTALL" == "on" ]; then - V3_ADDR_WHIRLPOOL=$( docker exec -it tor cat /var/lib/tor/hsv3whirlpool/hostname ) - echo "Your private Whirlpool client (do not share) = $V3_ADDR_WHIRLPOOL" - echo " " - fi - - if [ "$BITCOIND_INSTALL" == "on" ]; then - if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then - V3_ADDR_BTCD=$( docker exec -it tor cat /var/lib/tor/hsv3bitcoind/hostname ) - echo "Your local bitcoind (do not share) = $V3_ADDR_BTCD" - echo " " - fi - fi + # V3 onion addresses + V3_ADDR=$( docker exec -it tor cat /var/lib/tor/hsv3dojo/hostname ) + echo "Dojo API and Maintenance Tool = $V3_ADDR" + echo " " - else - # v2 onion addresses - V2_ADDR=$( docker exec -it tor cat /var/lib/tor/hsv2dojo/hostname ) - echo "Dojo API and Maintenance Tool = $V2_ADDR" + if [ "$EXPLORER_INSTALL" == "on" ]; then + V3_ADDR_EXPLORER=$( docker exec -it tor cat /var/lib/tor/hsv3explorer/hostname ) + echo "Block Explorer = $V3_ADDR_EXPLORER" echo " " + fi - if [ "$EXPLORER_INSTALL" == "on" ]; then - V2_ADDR_EXPLORER=$( docker exec -it tor cat /var/lib/tor/hsv2explorer/hostname ) - echo "Block Explorer = $V2_ADDR_EXPLORER" - echo " " - fi + if [ "$WHIRLPOOL_INSTALL" == "on" ]; then + V3_ADDR_WHIRLPOOL=$( docker exec -it tor cat /var/lib/tor/hsv3whirlpool/hostname ) + echo "Your private Whirlpool client (do not share) = $V3_ADDR_WHIRLPOOL" + echo " " + fi - if [ "$WHIRLPOOL_INSTALL" == "on" ]; then - V2_ADDR_WHIRLPOOL=$( docker exec -it tor cat /var/lib/tor/hsv2whirlpool/hostname ) - echo "Your private Whirlpool client (do not share) = $V2_ADDR_WHIRLPOOL" + if [ "$BITCOIND_INSTALL" == "on" ]; then + if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then + V3_ADDR_BTCD=$( docker exec -it tor cat /var/lib/tor/hsv3bitcoind/hostname ) + echo "Your local bitcoind (do not share) = $V3_ADDR_BTCD" echo " " fi - - if [ "$BITCOIND_INSTALL" == "on" ]; then - if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then - V2_ADDR_BTCD=$( docker exec -it tor cat /var/lib/tor/hsv2bitcoind/hostname ) - echo "Your local bitcoind (do not share) = $V2_ADDR_BTCD" - echo " " - fi - fi fi } @@ -561,11 +518,7 @@ help() { echo " Available options:" echo " -n [VALUE] : display the last VALUE lines" echo " " - echo " onion [version] Display the Tor onion addresses allowing your wallet to access your dojo." - echo " " - echo " Available versions:" - echo " v2: display Tor v2 onion addresses" - echo " v3 (default): display Tor v3 onion addresses" + echo " onion Display the Tor onion addresses allowing your wallet to access your dojo." echo " " echo " restart Restart your dojo." echo " " @@ -659,7 +612,7 @@ case "$subcommand" in logs "$module" $numlines ;; onion ) - onion "$@" + onion ;; restart ) restart diff --git a/docker/my-dojo/tor/restart.sh b/docker/my-dojo/tor/restart.sh index a7754b9..ae2b8dc 100644 --- a/docker/my-dojo/tor/restart.sh +++ b/docker/my-dojo/tor/restart.sh @@ -13,9 +13,6 @@ tor_options=( --SocksPolicy "reject *" --DataDirectory /var/lib/tor/.tor --DataDirectoryGroupReadable 1 - --HiddenServiceDir /var/lib/tor/hsv2dojo - --HiddenServiceVersion 2 - --HiddenServicePort "80 $NET_DMZ_NGINX_IPV4:80" --HiddenServiceDir /var/lib/tor/hsv3dojo --HiddenServiceVersion 3 --HiddenServicePort "80 $NET_DMZ_NGINX_IPV4:80" @@ -23,11 +20,6 @@ tor_options=( if [ "$BITCOIND_INSTALL" == "on" ]; then if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then - tor_options+=(--HiddenServiceDir /var/lib/tor/hsv2bitcoind) - tor_options+=(--HiddenServiceVersion 2) - tor_options+=(--HiddenServicePort "8333 $NET_DOJO_BITCOIND_IPV4:8333") - tor_options+=(--HiddenServiceDirGroupReadable 1) - tor_options+=(--HiddenServiceDir /var/lib/tor/hsv3bitcoind) tor_options+=(--HiddenServiceVersion 3) tor_options+=(--HiddenServicePort "8333 $NET_DOJO_BITCOIND_IPV4:8333") @@ -36,11 +28,6 @@ if [ "$BITCOIND_INSTALL" == "on" ]; then fi if [ "$EXPLORER_INSTALL" == "on" ]; then - tor_options+=(--HiddenServiceDir /var/lib/tor/hsv2explorer) - tor_options+=(--HiddenServiceVersion 2) - tor_options+=(--HiddenServicePort "80 $NET_DMZ_NGINX_IPV4:9080") - tor_options+=(--HiddenServiceDirGroupReadable 1) - tor_options+=(--HiddenServiceDir /var/lib/tor/hsv3explorer) tor_options+=(--HiddenServiceVersion 3) tor_options+=(--HiddenServicePort "80 $NET_DMZ_NGINX_IPV4:9080") @@ -48,11 +35,6 @@ if [ "$EXPLORER_INSTALL" == "on" ]; then fi if [ "$WHIRLPOOL_INSTALL" == "on" ]; then - tor_options+=(--HiddenServiceDir /var/lib/tor/hsv2whirlpool) - tor_options+=(--HiddenServiceVersion 2) - tor_options+=(--HiddenServicePort "80 $NET_DMZ_NGINX_IPV4:8898") - tor_options+=(--HiddenServiceDirGroupReadable 1) - tor_options+=(--HiddenServiceDir /var/lib/tor/hsv3whirlpool) tor_options+=(--HiddenServiceVersion 3) tor_options+=(--HiddenServicePort "80 $NET_DMZ_NGINX_IPV4:8898") From 9e4a3f6408b3a7c68bd43e6a394eebe2aece85ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0ev=C4=8D=C3=ADk?= Date: Fri, 23 Jul 2021 15:47:09 +0200 Subject: [PATCH 2/2] Update tor container --- docker/my-dojo/.env | 2 +- docker/my-dojo/tor/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/my-dojo/.env b/docker/my-dojo/.env index e4dabae..a481d42 100644 --- a/docker/my-dojo/.env +++ b/docker/my-dojo/.env @@ -15,7 +15,7 @@ DOJO_DB_VERSION_TAG=1.3.0 DOJO_BITCOIND_VERSION_TAG=1.12.0 DOJO_NODEJS_VERSION_TAG=1.10.0 DOJO_NGINX_VERSION_TAG=1.6.0 -DOJO_TOR_VERSION_TAG=1.9.0 +DOJO_TOR_VERSION_TAG=1.10.0 DOJO_EXPLORER_VERSION_TAG=1.7.0 DOJO_INDEXER_VERSION_TAG=1.3.0 DOJO_WHIRLPOOL_VERSION_TAG=1.4.0 diff --git a/docker/my-dojo/tor/Dockerfile b/docker/my-dojo/tor/Dockerfile index 1b57a53..9774e95 100644 --- a/docker/my-dojo/tor/Dockerfile +++ b/docker/my-dojo/tor/Dockerfile @@ -3,7 +3,7 @@ FROM debian:buster-slim ENV TOR_HOME /var/lib/tor ENV TOR_URL https://dist.torproject.org ENV TOR_MIRROR_URL https://tor.eff.org/dist -ENV TOR_VERSION 0.4.5.8 +ENV TOR_VERSION 0.4.6.6 ENV TOR_GPG_KS_URI hkp://keyserver.ubuntu.com:80 ENV TOR_GPG_KEY1 0xEB5A896A28988BF5 ENV TOR_GPG_KEY2 0xC218525819F78451 @@ -11,8 +11,8 @@ ENV TOR_GPG_KEY3 0x21194EBB165733EA ENV TOR_GPG_KEY4 0x6AFEE6D49E92B601 ENV GOLANG_DL_URL https://dl.google.com/go -ENV GOLANG_ARCHIVE go1.16.4.linux-amd64.tar.gz -ENV GOLANG_SHA256 7154e88f5a8047aad4b80ebace58a059e36e7e2e4eb3b383127a28c711b4ff59 +ENV GOLANG_ARCHIVE go1.16.6.linux-amd64.tar.gz +ENV GOLANG_SHA256 be333ef18b3016e9d7cb7b1ff1fdb0cac800ca0be4cf2290fe613b3d069dfe0d ENV OBFS4_URL https://github.com/Yawning/obfs4.git ENV OBFS4_VERSION 0.0.11