From ea4466262d3734834e1162f395b3d70d8c794557 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Thu, 6 May 2021 14:35:11 +1000 Subject: [PATCH] Gracefully avoid sending the client_auth_v3 argument to Stem's create_ephemeral_hidden_service() if the version of Stem we're on does not yet support it --- cli/onionshare_cli/onion.py | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py index e8df3342..0dde7070 100644 --- a/cli/onionshare_cli/onion.py +++ b/cli/onionshare_cli/onion.py @@ -663,14 +663,23 @@ class Onion(object): client_auth_v3_pub_key = None try: - res = self.c.create_ephemeral_hidden_service( - {80: port}, - await_publication=await_publication, - basic_auth=None, - key_type=key_type, - key_content=key_content, - client_auth_v3=client_auth_v3_pub_key, - ) + if not self.supports_stealth: + res = self.c.create_ephemeral_hidden_service( + {80: port}, + await_publication=await_publication, + basic_auth=None, + key_type=key_type, + key_content=key_content, + ) + else: + res = self.c.create_ephemeral_hidden_service( + {80: port}, + await_publication=await_publication, + basic_auth=None, + key_type=key_type, + key_content=key_content, + client_auth_v3=client_auth_v3_pub_key, + ) except ProtocolError as e: print("Tor error: {}".format(e.args[0]))