From e7e7adc141e3c8795196d498bf34bfd46caefdff Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Tue, 29 Sep 2020 15:42:41 +0200 Subject: [PATCH] get api password from docker container --- setup-scripts/bot_utils.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/setup-scripts/bot_utils.py b/setup-scripts/bot_utils.py index 3dfad90d..7ca0e726 100644 --- a/setup-scripts/bot_utils.py +++ b/setup-scripts/bot_utils.py @@ -34,6 +34,14 @@ def get_api_ip(): return ip_regex.findall(output)[0] +# find siad api password by getting it out of the docker container +def get_api_password(): + api_password_regex = re.compile(r"^\w+$") + docker_cmd = "docker exec {} cat /sia-data/apipassword".format(CONTAINER_NAME) + output = subprocess.check_output(docker_cmd, shell=True).decode("utf-8") + return api_password_regex.findall(output)[0] + + def setup(): # Load dotenv file if possible. # TODO: change all scripts to use named flags/params @@ -137,7 +145,7 @@ class siad: # Setup a handler with the API password username = "" password_mgr = urllib.request.HTTPPasswordMgrWithDefaultRealm() - password_mgr.add_password(None, api_endpoint, username, siad.get_password()) + password_mgr.add_password(None, api_endpoint, username, get_api_password()) handler = urllib.request.HTTPBasicAuthHandler(password_mgr) # Setup an opener with the correct user agent @@ -148,16 +156,6 @@ class siad: # Now all calls to urllib.request.urlopen use our opener. urllib.request.install_opener(opener) - @staticmethod - def get_password(): - # Get a port or use default - password = os.getenv("SIA_API_PASSWORD") - if not password: - home = os.getenv("HOME") - password_file = open(home + "/.sia/apipassword") - password = password_file.readlines()[0].strip() - return password - # load_json reads the http response and decodes the JSON value @staticmethod def load_json(resp):