From 395f0707acb9343897a1bea3d594a72a62cb82bd Mon Sep 17 00:00:00 2001
From: Herbert Poul <herbert@codeux.design>
Date: Wed, 18 Mar 2020 13:45:26 +0100
Subject: [PATCH] fixed exception when trying to read binary keyfile.
 https://github.com/authpass/authpass/issues/59

---
 lib/src/kdbx_format.dart                 |   2 +-
 test/kdbx4_test.dart                     |   9 +++++++++
 test/keyfile/BinaryKeyFilePasswords.kdbx | Bin 0 -> 1557 bytes
 test/keyfile/binarykeyfile.key           |   1 +
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 test/keyfile/BinaryKeyFilePasswords.kdbx
 create mode 100644 test/keyfile/binarykeyfile.key

diff --git a/lib/src/kdbx_format.dart b/lib/src/kdbx_format.dart
index 05887e7..caf37db 100644
--- a/lib/src/kdbx_format.dart
+++ b/lib/src/kdbx_format.dart
@@ -65,8 +65,8 @@ abstract class CredentialsPart {
 
 class KeyFileCredentials implements CredentialsPart {
   factory KeyFileCredentials(Uint8List keyFileContents) {
-    final keyFileAsString = utf8.decode(keyFileContents);
     try {
+      final keyFileAsString = utf8.decode(keyFileContents);
       if (_hexValuePattern.hasMatch(keyFileAsString)) {
         return KeyFileCredentials._(ProtectedValue.fromBinary(
             convert.hex.decode(keyFileAsString) as Uint8List));
diff --git a/test/kdbx4_test.dart b/test/kdbx4_test.dart
index 378192f..c8b15bb 100644
--- a/test/kdbx4_test.dart
+++ b/test/kdbx4_test.dart
@@ -79,6 +79,15 @@ void main() {
       final pwd = firstEntry.getString(KdbxKey('Password')).getText();
       expect(pwd, 'def');
     });
+    test('Binary Keyfile', () async {
+      final data =
+          await File('test/keyfile/BinaryKeyFilePasswords.kdbx').readAsBytes();
+      final keyFile =
+          await File('test/keyfile/binarykeyfile.key').readAsBytes();
+      final file = kdbxFormat.read(data,
+          Credentials.composite(ProtectedValue.fromString('asdf'), keyFile));
+      expect(file.body.rootGroup.entries, hasLength(1));
+    });
   });
   group('Writing', () {
     test('Create and save', () {
diff --git a/test/keyfile/BinaryKeyFilePasswords.kdbx b/test/keyfile/BinaryKeyFilePasswords.kdbx
new file mode 100644
index 0000000000000000000000000000000000000000..8a24dd1992d7eda3acd115411f3f2d7d6e4fbd97
GIT binary patch
literal 1557
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
H00000tjf(9

literal 0
HcmV?d00001

diff --git a/test/keyfile/binarykeyfile.key b/test/keyfile/binarykeyfile.key
new file mode 100644
index 0000000..7f8d5c8
--- /dev/null
+++ b/test/keyfile/binarykeyfile.key
@@ -0,0 +1 @@
+À!š¢OÅ“‡¥¿
Å8!Wȸ9É&Å78!AÿÈõûâw5›EÕ�|ØŒu£®j™”²sïEòën(ŒØðvó$6?rg‘:Wjºø/¥O­6ÏÝ]“m´Œk…hxWk•ænÍ�…"x{¾IÑjêé…vÎõ—ù2
\ No newline at end of file