luckyimnotanigger/docker-tor-hidden-service
1
0
Fork 0
mirror of https://github.com/cmehay/docker-tor-hidden-service.git synced 2025-04-21 14:29:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove double base64 decode when importing key from environment

Browse source
This commit is contained in:
Chirstophe Mehay 2021-02-13 22:16:08 +01:00
parent 0501f0b8c9
commit 8d67c93314
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker-compose.v2.yml
View file

@ -35,8 +35,8 @@ services:
FOO_TOR_SERVICE_VERSION: '3' FOO_TOR_SERVICE_VERSION: '3'
# tor v3 address private key base 64 encoded # tor v3 address private key base 64 encoded
FOO_TOR_SERVICE_KEY: | FOO_TOR_SERVICE_KEY: |
PT0gZWQyNTUxOXYxLXNlY3JldDogdHlwZTAgPT0AAACArobDQYyZAWXei4QZwr++ PT0gZWQyNTUxOXYxLXNlY3JldDogdHlwZTAgPT0AAABYZRzL3zScTEqA8/5wfvHw
j96H1X/gq14NwLRZ2O5DXuL0EzYKkdhZSILY85q+kfwZH8z4ceqe7u1F+0pQi/sM yLIzmih73lhgPGPh7SuOS6GTou4tXgNlTYSNb/Fvk1ajTTUno4tIQn/jMENO/20G
# Keep keys in volumes # Keep keys in volumes
volumes: volumes:

8
onions/Service.py
View file

@ -1,6 +1,4 @@
'This class define a service link' 'This class define a service link'
import base64
import binascii
import logging import logging
import os import os
import pathlib import pathlib
@ -77,12 +75,6 @@ class ServicesGroup(object):
def add_key(self, key): def add_key(self, key):
if self.imported_key: if self.imported_key:
logging.warning('Secret key already set, overriding') logging.warning('Secret key already set, overriding')
# Try to decode key from base64 encoding
# import the raw data if the input cannot be decoded as base64
try:
key = base64.b64decode(key)
except binascii.Error:
pass
if isinstance(key, str): if isinstance(key, str):
key = key.encode('ascii') key = key.encode('ascii')
self._onion.set_private_key(key) self._onion.set_private_key(key)