Skip to content

fix(yubikey): fall back to the RP ID origin when the server sends no appid #2444

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

Draft
maksimu wants to merge 1 commit into
base: release
Choose a base branch
from
Draft

fix(yubikey): fall back to the RP ID origin when the server sends no appid #2444

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions keepercommander/yubikey/yubikey.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ def yubikey_authenticate(request): # type: (dict) -> Optional[AuthenticationRes
return

options = request['publicKeyCredentialRequestOptions'].copy()
origin = ''
appid = ''
if 'extensions' in options:
extensions = options['extensions']
origin = extensions.get('appid') or ''
appid = extensions.get('appid') or ''
if 'largeBlob' not in options['extensions']:
options['extensions']['largeBlob'] = {'read': None}

Expand All @@ -156,6 +156,9 @@ def yubikey_authenticate(request): # type: (dict) -> Optional[AuthenticationRes
if isinstance(challenge, str):
options['challenge'] = utils.base64_url_decode(challenge)

# The server omits the appid extension when its host is local; the origin is then the RP ID's.
origin = appid or (f'https://{options["rpId"]}' if options.get('rpId') else '')

client = None # type: Optional[WebAuthnClient]
data_collector = DefaultClientDataCollector(origin, verify=verify_rp_id_none)
if os.name == 'nt':
Expand Down Expand Up @@ -195,7 +198,7 @@ def yubikey_authenticate(request): # type: (dict) -> Optional[AuthenticationRes
'https://docs.keeper.io/enterprise-guide/two-factor-authentication#security-keys-fido-webauthn\n'
'Commander will use the fallback security key authentication method.\n\n'
'To use your Yubikey with Commander, please touch the flashing Security key one more time.\n')
options['rpId'] = origin
options['rpId'] = appid
rq_options = PublicKeyCredentialRequestOptions.from_dict(options)
rs = client.get_assertion(rq_options, event=evt)
return rs.get_response(0)
Expand Down