fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-01-06 16:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #172 from phw/browser_integration_localhost_only

Browse Source 
Limit browser integration to localhost by default.

It can be changed in Advanced > Network > Browser Integration options.
Browser Integration options changes are now applied only after user validation.
This commit is contained in:
Laurent Monin
2013-11-25 15:13:21 -08:00
parent 1c2a8a5890 e6272f1da5
commit 25212db0c5
4 changed files with 113 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
picard/browser/browser.py
View File

@@ -29,13 +29,20 @@ class BrowserIntegration(QtNetwork.QTcpServer):
QtNetwork.QTcpServer.__init__(self, parent)
self.newConnection.connect(self._accept_connection)
self.port = 0
self.host_address = None
def start(self):
if self.port:
self.stop()
if config.setting["browser_integration_localhost_only"]:
self.host_address = QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost)
else:
self.host_address = QtNetwork.QHostAddress(QtNetwork.QHostAddress.Any)
for port in range(config.setting["browser_integration_port"], 65535):
if self.listen(QtNetwork.QHostAddress(QtNetwork.QHostAddress.Any), port):
log.debug("Starting the browser integration (port %d)", port)
if self.listen(self.host_address, port):
log.debug("Starting the browser integration (%s:%d)", self.host_address.toString(), port)
self.port = port
self.tagger.listen_port_changed.emit(self.port)
break

7
picard/ui/options/network.py
View File

@@ -39,13 +39,13 @@ class NetworkOptionsPage(OptionsPage):
config.TextOption("setting", "proxy_password", ""),
config.BoolOption("setting", "browser_integration", True),
config.IntOption("setting", "browser_integration_port", 8000),
config.BoolOption("setting", "browser_integration_localhost_only", True)
]
def __init__(self, parent=None):
super(NetworkOptionsPage, self).__init__(parent)
self.ui = Ui_NetworkOptionsPage()
self.ui.setupUi(self)
self.ui.browser_integration.clicked.connect(self.update_browser_integration)
def load(self):
self.ui.web_proxy.setChecked(config.setting["use_proxy"])
@@ -55,6 +55,8 @@ class NetworkOptionsPage(OptionsPage):
self.ui.password.setText(config.setting["proxy_password"])
self.ui.browser_integration.setChecked(config.setting["browser_integration"])
self.ui.browser_integration_port.setValue(config.setting["browser_integration_port"])
self.ui.browser_integration_localhost_only.setChecked(
config.setting["browser_integration_localhost_only"])
QtCore.QObject.connect(self.ui.browser_integration_port,
QtCore.SIGNAL('valueChanged(int)'),
self.change_browser_integration_port)
@@ -68,6 +70,9 @@ class NetworkOptionsPage(OptionsPage):
self.tagger.xmlws.setup_proxy()
config.setting["browser_integration"] = self.ui.browser_integration.isChecked()
config.setting["browser_integration_port"] = self.ui.browser_integration_port.value()
config.setting["browser_integration_localhost_only"] = \
self.ui.browser_integration_localhost_only.isChecked()
self.update_browser_integration()
def update_browser_integration(self):
if self.ui.browser_integration.isChecked():

28
picard/ui/ui_options_network.py
View File

@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'ui/options_network.ui'
#
# Created: Mon Aug 5 22:00:12 2013
# by: PyQt4 UI code generator 4.9.3
# Created: Tue Oct 22 09:34:33 2013
# by: PyQt4 UI code generator 4.10.3
#
# WARNING! All changes made in this file will be lost!
@@ -12,22 +12,31 @@ from PyQt4 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
_fromUtf8 = lambda s: s
def _fromUtf8(s):
return s
try:
_encoding = QtGui.QApplication.UnicodeUTF8
def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig, _encoding)
except AttributeError:
def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig)
class Ui_NetworkOptionsPage(object):
def setupUi(self, NetworkOptionsPage):
NetworkOptionsPage.setObjectName(_fromUtf8("NetworkOptionsPage"))
NetworkOptionsPage.resize(233, 252)
NetworkOptionsPage.resize(316, 337)
self.vboxlayout = QtGui.QVBoxLayout(NetworkOptionsPage)
self.vboxlayout.setMargin(9)
self.vboxlayout.setSpacing(6)
self.vboxlayout.setMargin(9)
self.vboxlayout.setObjectName(_fromUtf8("vboxlayout"))
self.web_proxy = QtGui.QGroupBox(NetworkOptionsPage)
self.web_proxy.setCheckable(True)
self.web_proxy.setObjectName(_fromUtf8("web_proxy"))
self.gridlayout = QtGui.QGridLayout(self.web_proxy)
self.gridlayout.setMargin(9)
self.gridlayout.setSpacing(2)
self.gridlayout.setMargin(9)
self.gridlayout.setObjectName(_fromUtf8("gridlayout"))
self.password = QtGui.QLineEdit(self.web_proxy)
self.password.setEchoMode(QtGui.QLineEdit.Password)
@@ -49,8 +58,8 @@ class Ui_NetworkOptionsPage(object):
self.label_7.setObjectName(_fromUtf8("label_7"))
self.gridlayout.addWidget(self.label_7, 0, 1, 1, 1)
self.server_port = QtGui.QSpinBox(self.web_proxy)
self.server_port.setMaximum(65535)
self.server_port.setMinimum(1)
self.server_port.setMaximum(65535)
self.server_port.setProperty("value", 80)
self.server_port.setObjectName(_fromUtf8("server_port"))
self.gridlayout.addWidget(self.server_port, 1, 1, 1, 1)
@@ -90,6 +99,10 @@ class Ui_NetworkOptionsPage(object):
self.browser_integration_port.setObjectName(_fromUtf8("browser_integration_port"))
self.horizontalLayout.addWidget(self.browser_integration_port)
self.verticalLayout_2.addWidget(self.widget)
self.browser_integration_localhost_only = QtGui.QCheckBox(self.browser_integration)
self.browser_integration_localhost_only.setChecked(False)
self.browser_integration_localhost_only.setObjectName(_fromUtf8("browser_integration_localhost_only"))
self.verticalLayout_2.addWidget(self.browser_integration_localhost_only)
self.vboxlayout.addWidget(self.browser_integration)
spacerItem = QtGui.QSpacerItem(101, 31, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.vboxlayout.addItem(spacerItem)
@@ -111,4 +124,5 @@ class Ui_NetworkOptionsPage(object):
self.label.setText(_("Server address:"))
self.browser_integration.setTitle(_("Browser Integration"))
self.label_2.setText(_("Default listening port:"))
self.browser_integration_localhost_only.setText(_("Listen only on localhost"))

125
ui/options_network.ui
View File

@@ -1,95 +1,114 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>NetworkOptionsPage</class>
<widget class="QWidget" name="NetworkOptionsPage" >
<property name="geometry" >
<widget class="QWidget" name="NetworkOptionsPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>233</width>
<height>252</height>
<width>316</width>
<height>337</height>
</rect>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<layout class="QVBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<item>
<widget class="QGroupBox" name="web_proxy" >
<property name="title" >
<widget class="QGroupBox" name="web_proxy">
<property name="title">
<string>Web Proxy</string>
</property>
<property name="checkable" >
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<layout class="QGridLayout">
<property name="leftMargin">
<number>9</number>
</property>
<property name="spacing" >
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>2</number>
</property>
<item row="5" column="0" colspan="2" >
<widget class="QLineEdit" name="password" >
<property name="echoMode" >
<item row="5" column="0" colspan="2">
<widget class="QLineEdit" name="password">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2" >
<widget class="QLineEdit" name="username" />
<item row="3" column="0" colspan="2">
<widget class="QLineEdit" name="username"/>
</item>
<item row="4" column="0" colspan="2" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<item row="4" column="0" colspan="2">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Password:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>password</cstring>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="QLabel" name="label_6" >
<property name="text" >
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Username:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>username</cstring>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLineEdit" name="server_host" />
<item row="1" column="0">
<widget class="QLineEdit" name="server_host"/>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="label_7" >
<property name="text" >
<item row="0" column="1">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Port:</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QSpinBox" name="server_port" >
<property name="maximum" >
<number>65535</number>
</property>
<property name="minimum" >
<item row="1" column="1">
<widget class="QSpinBox" name="server_port">
<property name="minimum">
<number>1</number>
</property>
<property name="value" >
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>80</number>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Server address:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>server_host</cstring>
</property>
</widget>
@@ -102,7 +121,7 @@
<property name="title">
<string>Browser Integration</string>
</property>
<property name="checkable" >
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
@@ -162,15 +181,25 @@
</layout>
</widget>
</item>
<item>
<widget class="QCheckBox" name="browser_integration_localhost_only">
<property name="text">
<string>Listen only on localhost</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>101</width>
<height>31</height>