From c5c9df774a9685eb659047165750879c124a1dbf Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Fri, 3 Sep 2021 14:24:45 -0700 Subject: Revert "Don't show private key" This reverts commit cf604f78f4f5734c9e53eee760bac3bc43a0512f. --- desktop/src/onionshare/tab/server_status.py | 15 +++++++++++++++ desktop/tests/gui_base_test.py | 12 +++++++++--- desktop/tests/test_gui_chat.py | 1 + desktop/tests/test_gui_receive.py | 1 + desktop/tests/test_gui_share.py | 1 + desktop/tests/test_gui_website.py | 1 + 6 files changed, 28 insertions(+), 3 deletions(-) diff --git a/desktop/src/onionshare/tab/server_status.py b/desktop/src/onionshare/tab/server_status.py index 1ba033e2..2fc816a8 100644 --- a/desktop/src/onionshare/tab/server_status.py +++ b/desktop/src/onionshare/tab/server_status.py @@ -125,6 +125,16 @@ class ServerStatus(QtWidgets.QWidget): strings._("gui_client_auth_instructions") ) + # The private key itself + self.private_key = QtWidgets.QLabel() + self.private_key.setFont(url_font) + self.private_key.setWordWrap(True) + self.private_key.setMinimumSize(self.private_key.sizeHint()) + self.private_key.setStyleSheet(self.common.gui.css["server_status_url"]) + self.private_key.setTextInteractionFlags( + Qt.TextSelectableByMouse | Qt.TextSelectableByKeyboard + ) + # Copy ClientAuth button self.copy_client_auth_button = QtWidgets.QPushButton( strings._("gui_copy_client_auth") @@ -166,6 +176,7 @@ class ServerStatus(QtWidgets.QWidget): client_auth_layout = QtWidgets.QVBoxLayout() client_auth_layout.addWidget(self.client_auth_instructions) + client_auth_layout.addWidget(self.private_key) client_auth_layout.addLayout(client_auth_buttons_layout) # Add the widgets and URL/ClientAuth layouts @@ -287,10 +298,13 @@ class ServerStatus(QtWidgets.QWidget): if self.settings.get("general", "public"): self.client_auth_instructions.hide() + self.private_key.hide() self.copy_client_auth_button.hide() self.show_client_auth_qr_code_button.hide() else: self.client_auth_instructions.show() + self.private_key.setText(self.app.auth_string) + self.private_key.show() self.copy_client_auth_button.show() self.show_client_auth_qr_code_button.show() @@ -320,6 +334,7 @@ class ServerStatus(QtWidgets.QWidget): self.url.hide() self.copy_url_button.hide() self.show_url_qr_code_button.hide() + self.private_key.hide() self.client_auth_instructions.hide() self.copy_client_auth_button.hide() self.show_client_auth_qr_code_button.hide() diff --git a/desktop/tests/gui_base_test.py b/desktop/tests/gui_base_test.py index 6fb4fc32..83ad5fa3 100644 --- a/desktop/tests/gui_base_test.py +++ b/desktop/tests/gui_base_test.py @@ -282,6 +282,13 @@ class GuiBaseTest(unittest.TestCase): """Test that the URL instructions for sharing are showing""" self.assertTrue(tab.get_mode().server_status.url_instructions.isVisible()) + def private_key_shown(self, tab): + """Test that the Private Key is showing when not in public mode""" + if not tab.settings.get("general", "public"): + self.assertTrue(tab.get_mode().server_status.private_key.isVisible()) + else: + self.assertFalse(tab.get_mode().server_status.private_key.isVisible()) + def client_auth_instructions_shown(self, tab): """ Test that the Private Key instructions for sharing @@ -389,15 +396,14 @@ class GuiBaseTest(unittest.TestCase): self.assertFalse(tab.get_mode().server_status.url.isVisible()) self.assertFalse(tab.get_mode().server_status.url_description.isVisible()) self.assertFalse(tab.get_mode().server_status.url_instructions.isVisible()) + self.assertFalse(tab.get_mode().server_status.private_key.isVisible()) self.assertFalse( tab.get_mode().server_status.client_auth_instructions.isVisible() ) self.assertFalse( tab.get_mode().server_status.copy_client_auth_button.isVisible() ) - self.assertFalse( - tab.get_mode().server_status.show_client_auth_qr_code_button.isVisible() - ) + def web_server_is_stopped(self, tab): """Test that the web server also stopped""" diff --git a/desktop/tests/test_gui_chat.py b/desktop/tests/test_gui_chat.py index b3c72200..786782f7 100644 --- a/desktop/tests/test_gui_chat.py +++ b/desktop/tests/test_gui_chat.py @@ -41,6 +41,7 @@ class TestChat(GuiBaseTest): self.url_shown(tab) self.have_copy_url_button(tab) self.have_show_url_qr_code_button(tab) + self.private_key_shown(tab) self.client_auth_instructions_shown(tab) self.have_show_client_auth_qr_code_button(tab) self.server_status_indicator_says_started(tab) diff --git a/desktop/tests/test_gui_receive.py b/desktop/tests/test_gui_receive.py index 8520c790..ca69c957 100644 --- a/desktop/tests/test_gui_receive.py +++ b/desktop/tests/test_gui_receive.py @@ -115,6 +115,7 @@ class TestReceive(GuiBaseTest): self.have_copy_url_button(tab) self.have_show_url_qr_code_button(tab) self.client_auth_instructions_shown(tab) + self.private_key_shown(tab) self.have_show_client_auth_qr_code_button(tab) self.server_status_indicator_says_started(tab) diff --git a/desktop/tests/test_gui_share.py b/desktop/tests/test_gui_share.py index 9cd140ec..d3536569 100644 --- a/desktop/tests/test_gui_share.py +++ b/desktop/tests/test_gui_share.py @@ -186,6 +186,7 @@ class TestShare(GuiBaseTest): self.url_shown(tab) self.have_copy_url_button(tab) self.have_show_url_qr_code_button(tab) + self.private_key_shown(tab) self.client_auth_instructions_shown(tab) self.have_show_client_auth_qr_code_button(tab) self.server_status_indicator_says_started(tab) diff --git a/desktop/tests/test_gui_website.py b/desktop/tests/test_gui_website.py index 52722c2f..e736874a 100644 --- a/desktop/tests/test_gui_website.py +++ b/desktop/tests/test_gui_website.py @@ -51,6 +51,7 @@ class TestWebsite(GuiBaseTest): self.have_copy_url_button(tab) self.have_show_url_qr_code_button(tab) self.client_auth_instructions_shown(tab) + self.private_key_shown(tab) self.have_show_client_auth_qr_code_button(tab) self.server_status_indicator_says_started(tab) -- cgit v1.2.3-54-g00ecf