Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-07 00:45:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Optionally save the private key of a running share to settings for reuse

Browse source
This commit is contained in:
Miguel Jacq 2017-12-07 12:45:29 +11:00
parent c9190f9d9a
commit 3a056803a9
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
6 changed files with 52 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
onionshare_gui/server_status.py
View file

@ -22,6 +22,7 @@ from .alert import Alert
from PyQt5 import QtCore, QtWidgets, QtGui
from onionshare import strings, common
from onionshare.settings import Settings
class ServerStatus(QtWidgets.QVBoxLayout):
"""
@ -31,12 +32,13 @@ class ServerStatus(QtWidgets.QVBoxLayout):
server_stopped = QtCore.pyqtSignal()
url_copied = QtCore.pyqtSignal()
hidservauth_copied = QtCore.pyqtSignal()
private_key_saved = QtCore.pyqtSignal()
STATUS_STOPPED = 0
STATUS_WORKING = 1
STATUS_STARTED = 2
def __init__(self, qtapp, app, web, file_selection):
def __init__(self, qtapp, app, web, file_selection, settings):
super(ServerStatus, self).__init__()
self.status = self.STATUS_STOPPED
@ -44,6 +46,7 @@ class ServerStatus(QtWidgets.QVBoxLayout):
self.app = app
self.web = web
self.file_selection = file_selection
self.settings = settings
# Helper boolean as this is used in a few places
self.timer_enabled = False
@ -87,10 +90,13 @@ class ServerStatus(QtWidgets.QVBoxLayout):
self.copy_url_button.clicked.connect(self.copy_url)
self.copy_hidservauth_button = QtWidgets.QPushButton(strings._('gui_copy_hidservauth', True))
self.copy_hidservauth_button.clicked.connect(self.copy_hidservauth)
self.save_private_key_button = QtWidgets.QPushButton(strings._('gui_save_private_key', True))
self.save_private_key_button.clicked.connect(self.save_private_key)
url_layout = QtWidgets.QHBoxLayout()
url_layout.addWidget(self.url_label)
url_layout.addWidget(self.copy_url_button)
url_layout.addWidget(self.copy_hidservauth_button)
url_layout.addWidget(self.save_private_key_button)
# add the widgets
self.addLayout(shutdown_timeout_layout_group)
@ -140,6 +146,8 @@ class ServerStatus(QtWidgets.QVBoxLayout):
self.url_label.setText('http://{0:s}/{1:s}'.format(self.app.onion_host, self.web.slug))
self.url_label.show()
self.copy_url_button.show()
if not self.settings.get('private_key'):
self.save_private_key_button.show()
if self.app.stealth:
self.copy_hidservauth_button.show()
@ -153,6 +161,7 @@ class ServerStatus(QtWidgets.QVBoxLayout):
self.url_label.hide()
self.copy_url_button.hide()
self.copy_hidservauth_button.hide()
self.save_private_key_button.hide()
# button
if self.file_selection.get_num_files() == 0:
@ -249,3 +258,13 @@ class ServerStatus(QtWidgets.QVBoxLayout):
clipboard.setText(self.app.auth_string)
self.hidservauth_copied.emit()
def save_private_key(self):
"""
Save the Onion private key to settings, so the Onion URL can be re-used.
"""
self.save_private_key_button.setEnabled(False)
self.settings.set('private_key', self.app.private_key)
self.settings.save()
self.private_key_saved.emit()