From 327c58f055e178017334cd7a638099ed025422bb Mon Sep 17 00:00:00 2001 From: Timo Loewe Date: Tue, 1 Jan 2019 13:55:21 +0100 Subject: [PATCH] Only copy first line of multi-line password store entries --- gnome-pass-search-provider.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnome-pass-search-provider.py b/gnome-pass-search-provider.py index 949ad8f..53f56cc 100755 --- a/gnome-pass-search-provider.py +++ b/gnome-pass-search-provider.py @@ -104,14 +104,14 @@ class SearchPassService(dbus.service.Object): limit=5)] def send_password_to_gpaste(self, name): - pass_cmd = subprocess.run( - ['pass', 'show', name], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE - ) - password = re.sub(b'\n$', b'', pass_cmd.stdout) - error = re.sub(b'\n$', b'', pass_cmd.stderr) - if not pass_cmd.returncode: + try: + pass_output = subprocess.check_output( + ['pass', 'show', name], + stderr=subprocess.STDOUT, + text=True + ) + password = pass_output.split('\n', 1)[0] + self.session_bus.get_object( 'org.gnome.GPaste.Daemon', '/org/gnome/GPaste' @@ -121,8 +121,9 @@ class SearchPassService(dbus.service.Object): dbus_interface='org.gnome.GPaste1' ) self.notify('Password {} copied to clipboard.'.format(name)) - else: - self.notify('Failed to copy password', body=error, error=True) + + except subprocess.CalledProcessError as error: + self.notify('Failed to copy password!', body=error.output, error=True) def send_password_to_native_clipboard(self, name): pass_cmd = subprocess.run(['pass', 'show', '-c', name])