From 93814b4fa85c581ca59bcb824647ba72bf1fa9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 25 Nov 2018 08:29:10 +0100 Subject: [PATCH] hobo-deploy: reuse existing wcs secret (#28304) --- wcs/ctl/check_hobos.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/wcs/ctl/check_hobos.py b/wcs/ctl/check_hobos.py index 880d43f16..8a158d5e7 100644 --- a/wcs/ctl/check_hobos.py +++ b/wcs/ctl/check_hobos.py @@ -385,10 +385,13 @@ class CmdCheckHobos(Command): domain = urlparse.urlparse(service_url).netloc.split(':')[0] if service is current_service: - # custom key calcultation for "self", as the shared_secret code - # would do secret_key ^ secret_key = 0. - api_secrets[domain] = self.shared_secret(current_service.get('secret_key'), - str(random.SystemRandom().random())) + if config.has_option('api-secrets', domain): + api_secrets[domain] = config.get('api-secrets', domain) + else: + # custom key calcultation for "self", as the shared_secret code + # would do secret_key ^ secret_key = 0. + api_secrets[domain] = self.shared_secret(current_service.get('secret_key'), + str(random.SystemRandom().random())) continue api_secrets[domain] = self.shared_secret(current_service.get('secret_key'), service.get('secret_key')) -- 2.19.1