From 8d67c93314f2bcf58ce16334c91ac0ab89d33063 Mon Sep 17 00:00:00 2001 From: Chirstophe Mehay Date: Sat, 13 Feb 2021 22:16:08 +0100 Subject: [PATCH] Remove double base64 decode when importing key from environment --- docker-compose.v2.yml | 4 ++-- onions/Service.py | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/docker-compose.v2.yml b/docker-compose.v2.yml index 5610480..9a5b056 100644 --- a/docker-compose.v2.yml +++ b/docker-compose.v2.yml @@ -35,8 +35,8 @@ services: FOO_TOR_SERVICE_VERSION: '3' # tor v3 address private key base 64 encoded FOO_TOR_SERVICE_KEY: | - PT0gZWQyNTUxOXYxLXNlY3JldDogdHlwZTAgPT0AAACArobDQYyZAWXei4QZwr++ - j96H1X/gq14NwLRZ2O5DXuL0EzYKkdhZSILY85q+kfwZH8z4ceqe7u1F+0pQi/sM + PT0gZWQyNTUxOXYxLXNlY3JldDogdHlwZTAgPT0AAABYZRzL3zScTEqA8/5wfvHw + yLIzmih73lhgPGPh7SuOS6GTou4tXgNlTYSNb/Fvk1ajTTUno4tIQn/jMENO/20G # Keep keys in volumes volumes: diff --git a/onions/Service.py b/onions/Service.py index fa4fdf0..b3a2b8b 100644 --- a/onions/Service.py +++ b/onions/Service.py @@ -1,6 +1,4 @@ 'This class define a service link' -import base64 -import binascii import logging import os import pathlib @@ -77,12 +75,6 @@ class ServicesGroup(object): def add_key(self, key): if self.imported_key: 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): key = key.encode('ascii') self._onion.set_private_key(key)