qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make nfc implementation compatible to Yubikey NEO 5 (closes https://github.com/PhilippC/keepass2android/issues/564)

Browse Source
This commit is contained in:
Philipp Crocoll
2019-03-11 11:46:02 +01:00
parent 84c9632508
commit 92a0ce98bb
1 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/keepass2android/NfcOtpActivity.cs
View File

@@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using Android.App; using Android.App;
using Android.Content; using Android.Content;
using Android.Content.PM; using Android.Content.PM;
@@ -8,6 +9,7 @@ using Android.Widget;
using Java.Util; using Java.Util;
using Java.Util.Regex; using Java.Util.Regex;
using Keepass2android.Yubiclip.Scancode; using Keepass2android.Yubiclip.Scancode;
using Pattern = Java.Util.Regex.Pattern;
namespace keepass2android namespace keepass2android
{ {
@@ -34,7 +36,41 @@ namespace keepass2android
{ {
private String GetOtpFromIntent(Intent intent) private String GetOtpFromIntent(Intent intent)
{ {
String data = intent.DataString; var patterns = new List<Pattern>{OTP_PATTERN, OTP_PATTERN2};
foreach (var pattern in patterns)
{
Matcher matcher = pattern.Matcher(intent.DataString);
if (matcher.Matches())
{
String otp = matcher.Group(1);
return otp;
}
else
{
IParcelable[] raw = intent.GetParcelableArrayExtra(NfcAdapter.ExtraNdefMessages);
byte[] bytes = ((NdefMessage)raw[0]).ToByteArray();
if (bytes[0] == URL_NDEF_RECORD && Arrays.Equals(URL_PREFIX_BYTES, Arrays.CopyOfRange(bytes, 3, 3 + URL_PREFIX_BYTES.Length)))
{
if (Arrays.Equals(new Java.Lang.String("/neo/").GetBytes(), Arrays.CopyOfRange(bytes, 18, 18 + 5)))
{
bytes[22] = (byte)'#';
}
for (int i = 0; i < bytes.Length; i++)
{
if (bytes[i] == '#')
{
bytes = Arrays.CopyOfRange(bytes, i + 1, bytes.Length);
String layout = "US";
KeyboardLayout kbd = KeyboardLayout.ForName(layout);
String otp = kbd.FromScanCodes(bytes);
return otp;
}
}
}
}
}
/*
Matcher matcher = OtpPattern.Matcher(data); Matcher matcher = OtpPattern.Matcher(data);
if (matcher.Matches()) if (matcher.Matches())
{ {
@@ -51,14 +87,27 @@ namespace keepass2android
KeyboardLayout kbd = KeyboardLayout.ForName(layout); KeyboardLayout kbd = KeyboardLayout.ForName(layout);
String otp = kbd.FromScanCodes(bytes); String otp = kbd.FromScanCodes(bytes);
return otp; return otp;
} }*/
return null; return null;
} }
//private static readonly Java.Util.Regex.Pattern OtpPattern = Java.Util.Regex.Pattern.Compile("^https://my\\.yubico\\.com/neo/(.+)$"); private static String URL_PREFIX = "https://my.yubico.com/";
private static readonly Java.Util.Regex.Pattern OtpPattern = Java.Util.Regex.Pattern.Compile("^https://my\\.yubico\\.com/neo/([a-zA-Z0-9!]+)$"); private static byte URL_NDEF_RECORD = (byte)0xd1;
private const int DATA_OFFSET = 23; private static byte[] URL_PREFIX_BYTES = new byte[URL_PREFIX.Length + 2 - 8];
private static Pattern OTP_PATTERN = Pattern.Compile("^https://my\\.yubico\\.com/[a-z]+/#?([a-zA-Z0-9!]+)$");
private static Pattern OTP_PATTERN2 = Pattern.Compile("^https://keepass2android\\.crocoll\\.net/[a-z]+/#?([a-zA-Z0-9!]+)$");
static NfcOtpActivity()
{
URL_PREFIX_BYTES[0] = 85;
URL_PREFIX_BYTES[1] = 4;
Java.Lang.JavaSystem.Arraycopy(new Java.Lang.String(URL_PREFIX.Substring(8)).GetBytes(), 0, URL_PREFIX_BYTES, 2, URL_PREFIX_BYTES.Length - 2);
}
private ActivityDesign _design; private ActivityDesign _design;