Compare commits

..

No commits in common. "72fe6f30071f3c131906cc6d4a2d2d54ec524d96" and "ff2d5600eb694be69fcbf2e08cd021bbf3679096" have entirely different histories.

3 changed files with 45 additions and 53 deletions

View File

@ -40,7 +40,7 @@ dnf install gnome-pass-search-provider
## Manual ## Manual
Ensure that python>=3.7 as well as the dbus and gobject Python modules are installed. They should all be packaged under python-name or python3-name depending on your distribution. Ensure that python>=3.7 as well as the dbus, gobject and thefuzz (formerly fuzzywuzzy, might still be packaged under that name in your distribution) Python modules are installed. They should all be packaged under python-name or python3-name depending on your distribution.
Clone this repository and run the installation script as root: Clone this repository and run the installation script as root:
``` ```
@ -76,10 +76,6 @@ pin: 123456
To copy the pin start the search with `:pin` and for the username with `:user`. To copy the pin start the search with `:pin` and for the username with `:user`.
## Disabling notifications
Set the `DISABLE_NOTIFICATIONS` environment variable to `True`.
# Alternative password providers # Alternative password providers
## Gopass and other pass-compatible tools ## Gopass and other pass-compatible tools

View File

@ -32,6 +32,12 @@ from os.path import join as path_join
import dbus.service import dbus.service
from dbus.mainloop.glib import DBusGMainLoop from dbus.mainloop.glib import DBusGMainLoop
try:
from thefuzz import fuzz
from thefuzz import process
except ModuleNotFoundError:
from fuzzywuzzy import fuzz
from fuzzywuzzy import process
from gi.repository import GLib from gi.repository import GLib
# Convenience shorthand for declaring dbus interface methods. # Convenience shorthand for declaring dbus interface methods.
@ -61,9 +67,6 @@ class SearchPassService(dbus.service.Object):
self.password_executable = getenv("PASSWORD_EXECUTABLE") or "pass" self.password_executable = getenv("PASSWORD_EXECUTABLE") or "pass"
self.password_mode = getenv("PASSWORD_MODE") or "pass" self.password_mode = getenv("PASSWORD_MODE") or "pass"
self.clipboard_executable = getenv("CLIPBOARD_EXECUTABLE") or "wl-copy" self.clipboard_executable = getenv("CLIPBOARD_EXECUTABLE") or "wl-copy"
self.disable_notifications = (
getenv("DISABLE_NOTIFICATIONS", "false").lower() == "true"
)
@dbus.service.method(in_signature="sasu", **sbn) @dbus.service.method(in_signature="sasu", **sbn)
def ActivateResult(self, id, terms, timestamp): def ActivateResult(self, id, terms, timestamp):
@ -99,21 +102,18 @@ class SearchPassService(dbus.service.Object):
pass pass
def get_bw_result_set(self, terms): def get_bw_result_set(self, terms):
if terms[0].startswith(":"):
field = terms[0][1:]
terms = terms[1:]
else:
field = None
name = "".join(terms) name = "".join(terms)
password_list = subprocess.check_output( password_list = subprocess.check_output(
[self.password_executable, "list"], universal_newlines=True [self.password_executable, "list"], universal_newlines=True
).split("\n")[:-1] ).split("\n")[:-1]
results = list(filter(lambda x: x.startswith(name), password_list))[:5] results = [
e[0]
if field is not None: for e in process.extract(
results = [f":{field} {r}" for r in results] name, password_list, limit=5, scorer=fuzz.partial_ratio
)
]
return results return results
def get_pass_result_set(self, terms): def get_pass_result_set(self, terms):
@ -139,51 +139,51 @@ class SearchPassService(dbus.service.Object):
path = path_join(dir_path, filename)[:-4] path = path_join(dir_path, filename)[:-4]
password_list.append(path) password_list.append(path)
results = list(filter(lambda x: x.startswith(name), password_list))[:5] results = [
e[0]
for e in process.extract(
name, password_list, limit=5, scorer=fuzz.partial_ratio
)
]
if field == "otp": if field == "otp":
results = [f"otp {r}" for r in results] results = [f"otp {r}" for r in results]
elif field is not None: elif field is not None:
results = [f":{field} {r}" for r in results] results = [f":{field} {r}" for r in results]
return results return results
def get_value_from_output(self, output, field=None):
if field is not None:
match = re.search(
rf"^{field}:\s*(?P<value>.+?)$", output, flags=re.I | re.M
)
if match:
value = match.group("value")
else:
raise RuntimeError(f"The field {field} was not found in the password entry.")
else:
value = output.split("\n", 1)[0]
return value
def send_password_to_gpaste(self, base_args, name, field=None): def send_password_to_gpaste(self, base_args, name, field=None):
gpaste = self.session_bus.get_object( gpaste = self.session_bus.get_object(
"org.gnome.GPaste.Daemon", "/org/gnome/GPaste" "org.gnome.GPaste.Daemon", "/org/gnome/GPaste"
) )
output = subprocess.check_output(base_args + [name], universal_newlines=True) output = subprocess.check_output(base_args + [name], universal_newlines=True)
value = self.get_value_from_output(output, field) if field is not None:
match = re.search(
rf"^{field}:\s*(?P<value>.+?)$", output, flags=re.I | re.M
)
if match:
password = match.group("value")
else:
raise RuntimeError(f"The field {field} was not found in the pass file.")
else:
password = output.split("\n", 1)[0]
try: try:
gpaste.AddPassword(name, value, dbus_interface="org.gnome.GPaste1") gpaste.AddPassword(name, password, dbus_interface="org.gnome.GPaste1")
except dbus.DBusException: except dbus.DBusException:
gpaste.AddPassword(name, value, dbus_interface="org.gnome.GPaste2") gpaste.AddPassword(name, password, dbus_interface="org.gnome.GPaste2")
def send_password_to_native_clipboard(self, base_args, name, field=None): def send_password_to_native_clipboard(self, base_args, name, field=None):
if self.password_mode == "bw":
output = subprocess.check_output(base_args + [name], universal_newlines=True)
value = self.get_value_from_output(output, field)
p1 = subprocess.run(self.clipboard_executable, input=value, text=True)
if p1.returncode:
raise RuntimeError(
f"Error while running copying to clipboard: got return code: {p1.returncode}."
)
else:
if field is not None: if field is not None:
raise RuntimeError("This feature requires GPaste.") raise RuntimeError("This feature requires GPaste.")
if self.password_mode == "bw":
p1 = subprocess.Popen(base_args + [name], stdout=subprocess.PIPE)
p2 = subprocess.run(self.clipboard_executable, stdin=p1.stdout)
if p1.returncode or p2.returncode:
raise RuntimeError(
f"Error while running rbw: got return codes: {p1.returncode} {p2.returncode}."
)
else:
result = subprocess.run(base_args + ["-c", name]) result = subprocess.run(base_args + ["-c", name])
if result.returncode: if result.returncode:
raise RuntimeError( raise RuntimeError(
@ -191,21 +191,17 @@ class SearchPassService(dbus.service.Object):
) )
def send_password_to_clipboard(self, name): def send_password_to_clipboard(self, name):
if name.startswith(":"):
field, name = name.split(" ", 1)
field = field[1:]
else:
field = None field = None
if self.password_mode == "bw": if self.password_mode == "bw":
base_args = [self.password_executable, "get", "--full"] base_args = [self.password_executable, "get"]
elif name.startswith("otp "): elif name.startswith("otp "):
base_args = [self.password_executable, "otp", "code"] base_args = [self.password_executable, "otp", "code"]
name = name[4:] name = name[4:]
field = None
else: else:
base_args = [self.password_executable, "show"] base_args = [self.password_executable, "show"]
if name.startswith(":"):
field, name = name.split(" ", 1)
field = field[1:]
try: try:
try: try:
self.send_password_to_gpaste(base_args, name, field) self.send_password_to_gpaste(base_args, name, field)
@ -224,8 +220,6 @@ class SearchPassService(dbus.service.Object):
self.notify("Failed to copy password or field!", body=str(e), error=True) self.notify("Failed to copy password or field!", body=str(e), error=True)
def notify(self, message, body="", error=False): def notify(self, message, body="", error=False):
if not error and self.disable_notifications:
return
try: try:
self.session_bus.get_object( self.session_bus.get_object(
"org.freedesktop.Notifications", "/org/freedesktop/Notifications" "org.freedesktop.Notifications", "/org/freedesktop/Notifications"

View File

@ -9,6 +9,8 @@ Requires: gnome-shell
Requires: pass Requires: pass
Requires: python3-gobject Requires: python3-gobject
Requires: python3-dbus Requires: python3-dbus
Requires: python3-fuzzywuzzy
Requires: python3-Levenshtein
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global debug_package %{nil} %global debug_package %{nil}