Skip to content

Find password even with no username supplied in OSX backend #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maarten0912 wants to merge 2 commits into
base: main
Choose a base branch
from
+3 −4
Open

Find password even with no username supplied in OSX backend #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fefe888
Find password even with no username supplied in OSX backend
maarten0912 Oct 10, 2023
b8f5848
Merge branch 'main' into os-x-no-username
jaraco Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions keyring/backends/macOS/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ def set_password(self, service, username, password):

@warn_keychain
def get_password(self, service, username):
if username is None:
username = ''

try:
return api.find_generic_password(self.keychain, service, username)
except api.NotFound:
Expand Down
4 changes: 3 additions & 1 deletion keyring/backends/macOS/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,13 @@ class SecAuthFailure(Error):


def find_generic_password(kc_name, service, username, not_found_ok=False):
username_kwarg = {'kSecAttrAccount': username} if username is not None else {}

q = create_query(
kSecClass=k_('kSecClassGenericPassword'),
kSecMatchLimit=k_('kSecMatchLimitOne'),
kSecAttrService=service,
kSecAttrAccount=username,
**username_kwarg,
kSecReturnData=True,
)

Expand Down