rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove passwords from URLs going out via an insecure channel.

Browse Source
This commit is contained in:
Florian Bruhin 2014-06-20 22:57:04 +02:00
parent 03b69c5527
commit 2d2ee71bee
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qutebrowser/browser/commands.py
View File

@ -356,7 +356,8 @@ class CommandDispatcher:
Args: Args:
sel: True to use primary selection, False to use clipboard sel: True to use primary selection, False to use clipboard
""" """
urlstr = self._tabs.currentWidget().url().toString(QUrl.FullyEncoded) urlstr = self._tabs.currentWidget().url().toString(
QUrl.FullyEncoded | QUrl.RemovePassword)
if sel: if sel:
mode = QClipboard.Selection mode = QClipboard.Selection
target = "primary selection" target = "primary selection"
@ -608,7 +609,8 @@ class CommandDispatcher:
Args: Args:
cmd: The command to execute. cmd: The command to execute.
""" """
urlstr = self._tabs.currentWidget().url().toString(QUrl.FullyEncoded) urlstr = self._tabs.currentWidget().url().toString(
QUrl.FullyEncoded | QUrl.RemovePassword)
cmd = cmd.replace('{}', shell_escape(urlstr)) cmd = cmd.replace('{}', shell_escape(urlstr))
log.procs.debug("Executing: {}".format(cmd)) log.procs.debug("Executing: {}".format(cmd))
subprocess.Popen(cmd, shell=True) subprocess.Popen(cmd, shell=True)
@ -621,6 +623,8 @@ class CommandDispatcher:
@cmdutils.register(instance='mainwindow.tabs.cmd') @cmdutils.register(instance='mainwindow.tabs.cmd')
def run_userscript(self, cmd, *args): def run_userscript(self, cmd, *args):
"""Run an userscript given as argument.""" """Run an userscript given as argument."""
# We don't remove the password in the URL here, as it's probably safe
# to pass via env variable.
urlstr = self._tabs.currentWidget().url().toString(QUrl.FullyEncoded) urlstr = self._tabs.currentWidget().url().toString(QUrl.FullyEncoded)
runner = UserscriptRunner(self._tabs) runner = UserscriptRunner(self._tabs)
runner.got_cmd.connect(self._tabs.got_cmd) runner.got_cmd.connect(self._tabs.got_cmd)

2
qutebrowser/browser/hints.py
View File

@ -301,7 +301,7 @@ class HintManager(QObject):
""" """
sel = self._context.target == Target.yank_primary sel = self._context.target == Target.yank_primary
mode = QClipboard.Selection if sel else QClipboard.Clipboard mode = QClipboard.Selection if sel else QClipboard.Clipboard
urlstr = url.toString(QUrl.FullyEncoded) urlstr = url.toString(QUrl.FullyEncoded | QUrl.RemovePassword)
QApplication.clipboard().setText(urlstr, mode) QApplication.clipboard().setText(urlstr, mode)
message.info("URL yanked to {}".format("primary selection" if sel message.info("URL yanked to {}".format("primary selection" if sel
else "clipboard")) else "clipboard"))