iamthefij/alfred-yubico-auth
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

A bit better password handling

Browse Source
This commit is contained in:
IamTheFij 2019-04-10 14:48:25 -07:00
parent 62c393ffe3
commit b01ca5eefe
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
alfred_yauth/main.py
View File

@ -3,6 +3,7 @@ import sys
from getpass import getpass from getpass import getpass
from time import time from time import time
from controller import APDUError
from controller import Controller from controller import Controller
from controller import DeviceNotFoundError from controller import DeviceNotFoundError
from workflow import ICON_ACCOUNT from workflow import ICON_ACCOUNT
@ -38,9 +39,18 @@ class YubicoAuth(Workflow3):
def ask_yubikey_password(self): def ask_yubikey_password(self):
"""Prompts the user for their Yubikey password and stores it""" """Prompts the user for their Yubikey password and stores it"""
self.logger.debug('Set password') self.logger.debug('Set password')
password_key = self.get_controller().derive_key(getpass()) password_key = self.get_controller().derive_key(
getpass('Yubikey Password:')
)
self.save_password(YUBIKEY_CREDS_KEYCHAIN, password_key) self.save_password(YUBIKEY_CREDS_KEYCHAIN, password_key)
self.get_controller().refresh_credentials(time(), password_key)
self.add_item(
'Yubikey password set successfully',
'',
icon=ICON_ACCOUNT,
)
def get_yubikey_password(self): def get_yubikey_password(self):
"""Returns stored Yubikey password from keychain""" """Returns stored Yubikey password from keychain"""
return self.get_password(YUBIKEY_CREDS_KEYCHAIN) return self.get_password(YUBIKEY_CREDS_KEYCHAIN)
@ -120,6 +130,12 @@ class YubicoAuth(Workflow3):
'Is your Yubikey plugged in?', 'Is your Yubikey plugged in?',
icon=ICON_ERROR, icon=ICON_ERROR,
) )
except APDUError:
self.add_item(
'Could not communicate with device',
'Is your Yubikey password set correctly?',
icon=ICON_ERROR,
)
self.send_feedback() self.send_feedback()
@ -130,7 +146,6 @@ def no_wf():
print(controller.count_devices()) print(controller.count_devices())
print(controller.refresh()) print(controller.refresh())
# TODO: Accept password in keychain, create special command for adding key
password = getpass('YubiKey password?') password = getpass('YubiKey password?')
password_key = controller.derive_key(password) password_key = controller.derive_key(password)
timestamp = time() timestamp = time()