Update tor to 0.4.7.12

.dockerignore

@@ -2,3 +2,5 @@ keys/
 *.egg-info
 .tox/
 __cache__
+__pycache__
+*/__pycache__

Dockerfile

@@ -1,4 +1,4 @@
-FROM    python:3.9-alpine
+FROM    python:3.10-alpine
 
 # if omitted, the versions are determined from the git tags
 ARG     tor_version

Makefile

@@ -53,3 +53,8 @@ run-vanguards: build
 
 run-vanguards-network: build
 	docker-compose -f docker-compose.vanguards-network.yml up --force-recreate
+
+publish: build
+	docker tag goldy/tor-hidden-service:$(CUR_TAG) goldy/tor-hidden-service:latest
+	docker push goldy/tor-hidden-service:$(CUR_TAG)
+	docker push goldy/tor-hidden-service:latest

README.md

@@ -4,6 +4,13 @@
 
 ## Changelog
 
+* 26 jul 2022
+  * Update `onions` tool to v0.7.1:
+    * Fix an issue when restarting a container with control port enabled
+    * Updated to python 3.10
+  * Fix a typo in `docker-compose.vanguards-network.yml`, it works now
+  * Update `tor` to `0.4.7.8`
+
 * 23 dec 2021
   * Update `onions` tool to v0.7.0:
     * Drop support of onion v2 adresses as tor network does not accept them anymore

current_tor_version

@@ -1 +1 @@
-0.4.6.9
+0.4.7.12

docker-compose.vanguards-network.yml

@@ -8,7 +8,7 @@ services:
     environment:
         # Enable control port with ip binding (see networks configuration bellow)
         # Using network interface instead of 0.0.0.0 help to protect control port from hidden services.
-        TOR_CONTROL_PORT: 127.16.111.10
+        TOR_CONTROL_PORT: 172.16.111.10
         # Set controle port password (optionnal)
         TOR_CONTROL_PASSWORD: something_secret
 
@@ -54,7 +54,7 @@ services:
 
     environment:
       # Set tor hostname (or ip:port or unix:/path/to/socket.sock)
-      TOR_CONTROL_PORT: tor
+      TOR_CONTROL_PORT: tor:9051
       # set password if needed
       TOR_CONTROL_PASSWORD: something_secret
 

onions/Onions.py

@@ -57,9 +57,10 @@ class Setup(object):
                 self.setup[host]['ports'][host].append(port)
 
     def _hash_control_port_password(self, password):
-        self.control_hashed_password = subprocess.check_output([
+        self.control_hashed_password = subprocess.check_output(
-            'tor', '--quiet', '--hash-password', password
+            ['/usr/local/bin/tor', '--quiet', '--hash-password', password],
-        ]).decode()
+            env={'HOME': '/tmp'}
+        ).decode()
 
     def _parse_control_port_variable(self, check_ip=True):
         control_port = os.environ['TOR_CONTROL_PORT']

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "docker-tor-hidden-service"
-version = "0.7.0"
+version = "0.7.1"
 description = "Display onion sites hosted"
 authors = ["Christophe Mehay <cmehay@nospam.student.42.fr>"]
 license = "WTFPL"
@@ -23,24 +23,24 @@ packages = [
 onions = "onions:main"
 
 [tool.poetry.dependencies]
-python = ">=3.8,<3.10"
+python = ">=3.10,<3.11"
-pytor = "^0.1.7"
+Jinja2 = ">=2.10"
-Jinja2 = "^2.10"
+importlib_metadata = ">=1.6.0"
-pyentrypoint = "^0.7.4"
-importlib_metadata = "^1.6.0"
 vanguards = "^0.3.1"
-ipy = "^1.00"
+ipy = ">=1.00"
+pytor = '^0.1.9'
+pyentrypoint = "^0.8.0"
 
 [tool.poetry.dev-dependencies]
-autopep8 = "^1.5.2"
+autopep8 = ">=1.5.2"
-tox = "^3.15.0"
+tox = ">=3.15.0"
-cryptography = "^3.2"
+cryptography = ">=3.2"
-pylint = "^2.5.2"
+pylint = ">=2.5.2"
-ptpython = "^3.0.2"
+ptpython = ">=3.0.2"
-black = "^19.10b0"
+black = ">=22.6.0"
-pre-commit = "^2.3.0"
+pre-commit = "^2.20.0"
-pytest = "^5.4.2"
+pytest = ">=5.4.2"
-pyfakefs = "^4.0.2"
+pyfakefs = ">=4.0.2"
 
 [build-system]
 requires = ["poetry>=0.12"]

tests/onions_test.py

@@ -2,6 +2,7 @@ import configparser
 import json
 import os
 import re
+import pytest
 from base64 import b32encode
 from base64 import b64decode
 from hashlib import sha1

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 isolated_build = true
-envlist = py39
+envlist = py310
 
 [testenv]
 whitelist_externals = poetry