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

Invert the CSP header setting and put it in its own Website Mode settings group. Make the CSP header mandatory for share/receive modes, optional for website mode only.

Browse source
This commit is contained in:
Miguel Jacq 2019-09-22 16:49:31 +10:00
parent 17063e54db
commit d8c0bc4e4f
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
8 changed files with 49 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

59
onionshare_gui/settings_dialog.py
View file

@ -214,28 +214,10 @@ class SettingsDialog(QtWidgets.QDialog):
self.close_after_first_download_checkbox.setText(strings._("gui_settings_close_after_first_download_option"))
individual_downloads_label = QtWidgets.QLabel(strings._("gui_settings_individual_downloads_label"))
# Option to disable Content Security Policy (for website sharing)
self.csp_header_enabled_checkbox = QtWidgets.QCheckBox()
self.csp_header_enabled_checkbox.setCheckState(QtCore.Qt.Checked)
self.csp_header_enabled_checkbox.setText(strings._("gui_settings_csp_header_enabled_option"))
csp_header_label = QtWidgets.QLabel(strings._("gui_settings_whats_this").format("https://github.com/micahflee/onionshare/wiki/Content-Security-Policy"))
csp_header_label.setStyleSheet(self.common.css['settings_whats_this'])
csp_header_label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction)
csp_header_label.setOpenExternalLinks(True)
csp_header_label.setMinimumSize(csp_header_label.sizeHint())
csp_header_layout = QtWidgets.QHBoxLayout()
csp_header_layout.addWidget(self.csp_header_enabled_checkbox)
csp_header_layout.addWidget(csp_header_label)
csp_header_layout.addStretch()
csp_header_layout.setContentsMargins(0,0,0,0)
self.csp_header_widget = QtWidgets.QWidget()
self.csp_header_widget.setLayout(csp_header_layout)
# Sharing options layout
sharing_group_layout = QtWidgets.QVBoxLayout()
sharing_group_layout.addWidget(self.close_after_first_download_checkbox)
sharing_group_layout.addWidget(individual_downloads_label)
sharing_group_layout.addWidget(self.csp_header_widget)
sharing_group = QtWidgets.QGroupBox(strings._("gui_settings_sharing_label"))
sharing_group.setLayout(sharing_group_layout)
@ -256,6 +238,36 @@ class SettingsDialog(QtWidgets.QDialog):
receiving_group = QtWidgets.QGroupBox(strings._("gui_settings_receiving_label"))
receiving_group.setLayout(receiving_group_layout)
# Option to disable Content Security Policy (for website sharing)
self.csp_header_disabled_checkbox = QtWidgets.QCheckBox()
self.csp_header_disabled_checkbox.setCheckState(QtCore.Qt.Unchecked)
self.csp_header_disabled_checkbox.setText(strings._("gui_settings_csp_header_disabled_option"))
csp_header_label = QtWidgets.QLabel(strings._("gui_settings_whats_this").format("https://github.com/micahflee/onionshare/wiki/Content-Security-Policy"))
csp_header_label.setStyleSheet(self.common.css['settings_whats_this'])
csp_header_label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction)
csp_header_label.setOpenExternalLinks(True)
csp_header_label.setMinimumSize(csp_header_label.sizeHint())
csp_header_layout = QtWidgets.QHBoxLayout()
csp_header_layout.addWidget(self.csp_header_disabled_checkbox)
csp_header_layout.addWidget(csp_header_label)
csp_header_layout.addStretch()
csp_header_layout.setContentsMargins(0,0,0,0)
self.csp_header_widget = QtWidgets.QWidget()
self.csp_header_widget.setLayout(csp_header_layout)
# Website settings widget
website_settings_layout = QtWidgets.QVBoxLayout()
website_settings_layout.setContentsMargins(0, 0, 0, 0)
website_settings_layout.addWidget(self.csp_header_widget)
self.website_settings_widget = QtWidgets.QWidget()
self.website_settings_widget.setLayout(website_settings_layout)
# Website mode options layout
website_group_layout = QtWidgets.QVBoxLayout()
website_group_layout.addWidget(self.website_settings_widget)
website_group = QtWidgets.QGroupBox(strings._("gui_settings_website_label"))
website_group.setLayout(website_group_layout)
# Automatic updates options
# Autoupdate
@ -500,6 +512,7 @@ class SettingsDialog(QtWidgets.QDialog):
left_col_layout.addWidget(onion_group)
left_col_layout.addWidget(sharing_group)
left_col_layout.addWidget(receiving_group)
left_col_layout.addWidget(website_group)
left_col_layout.addWidget(autoupdate_group)
left_col_layout.addLayout(language_layout)
left_col_layout.addStretch()
@ -535,11 +548,11 @@ class SettingsDialog(QtWidgets.QDialog):
else:
self.close_after_first_download_checkbox.setCheckState(QtCore.Qt.Unchecked)
csp_header_enabled = self.old_settings.get('csp_header_enabled')
if csp_header_enabled:
self.csp_header_enabled_checkbox.setCheckState(QtCore.Qt.Checked)
csp_header_disabled = self.old_settings.get('csp_header_disabled')
if csp_header_disabled:
self.csp_header_disabled_checkbox.setCheckState(QtCore.Qt.Checked)
else:
self.csp_header_enabled_checkbox.setCheckState(QtCore.Qt.Unchecked)
self.csp_header_disabled_checkbox.setCheckState(QtCore.Qt.Unchecked)
autostart_timer = self.old_settings.get('autostart_timer')
if autostart_timer:
@ -1006,7 +1019,7 @@ class SettingsDialog(QtWidgets.QDialog):
settings.load() # To get the last update timestamp
settings.set('close_after_first_download', self.close_after_first_download_checkbox.isChecked())
settings.set('csp_header_enabled', self.csp_header_enabled_checkbox.isChecked())
settings.set('csp_header_disabled', self.csp_header_disabled_checkbox.isChecked())
settings.set('autostart_timer', self.autostart_timer_checkbox.isChecked())
settings.set('autostop_timer', self.autostop_timer_checkbox.isChecked())