From 5a019e1cb15842ee08293529807c3e5abfd675c4 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Sat, 19 Sep 2020 17:48:35 +0100 Subject: [PATCH] ? --- README.md | 2 +- komrade/backend/the_operator.py | 18 ++++++++---------- komrade/cli/cli.py | 2 +- komrade/constants.py | 4 ++-- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 66de1b5..eb42fdc 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ But a digital network can be redesigned. The technology behind these social medi ## Core principles -### Illegible +### Confidential All of your data are strongly encrypted end-to-end: only you and those you write to can decrypt and read it. To anyone without the right decryption 'key', the data is nonsense. diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py index e5f5e08..25be52d 100644 --- a/komrade/backend/the_operator.py +++ b/komrade/backend/the_operator.py @@ -44,18 +44,16 @@ class TheOperator(Operator): raise KomradeException('Operator cannot find its own public key? Shutting down.') # check I match what's on op page - pub_web = komrade_request(PATH_OPERATOR_WEB_KEYS_URL) - if pub_web.status_code!=200: - raise KomradeException("Can't verify Komrade Operator. Shutting down.") - + # pub_web = komrade_request(PATH_OPERATOR_WEB_KEYS_URL) + # if pub_web.status_code!=200: + # raise KomradeException("Can't verify Komrade Operator. Shutting down.") # print('Public key on komrade.app/pub: ',pub_web.text) # print('Public key hardcoded in client: ',keychain.get('pubkey').data_b64_s) - - if pub_web.text == keychain.get('pubkey').data_b64_s: - # print('Pubs match') - pass - else: - raise KomradeException('Public key for Operator on app and one at {PATH_OPERATOR_WEB_KEYS_URL} do not match. Shutting down.') + # if pub_web.text == keychain.get('pubkey').data_b64_s: + # # print('Pubs match') + # pass + # else: + # raise KomradeException('Public key for Operator on app and one at {PATH_OPERATOR_WEB_KEYS_URL} do not match. Shutting down.') if os.path.exists(PATH_SUPER_SECRET_OP_KEY): print('Dare I claim to be the one true Operator?') diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py index e7ef985..1760e12 100644 --- a/komrade/cli/cli.py +++ b/komrade/cli/cli.py @@ -125,7 +125,7 @@ class CLI(Logger): def status_str(self,unr,tot): read=tot-unr - return f'({unr}*/{tot})' if unr else f'({tot})' + return f'({unr}*)' if unr else f'({unr})' # return f'({unr}*)' if unr else f'({unr})' # return f'{unr}* of {tot}' if tot else str(tot) diff --git a/komrade/constants.py b/komrade/constants.py index d7b1b8d..5e10609 100644 --- a/komrade/constants.py +++ b/komrade/constants.py @@ -4,8 +4,8 @@ KOMRADE_ONION = 'u7spnj3dmwumzoa4.onion' KOMRADE_ONION2 = 'rwg4zcnpwshv4laq.onion' #'128.232.229.63' #'komrade.app' -# OPERATOR_API_URL = f'http://{KOMRADE_ONION}/op/' -OPERATOR_API_URL = f'http://{KOMRADE_URL}/op/' +OPERATOR_API_URL = f'http://{KOMRADE_ONION}/op/' +# OPERATOR_API_URL = f'http://{KOMRADE_URL}/op/' # paths