From f8b5408e8dd965afd8dcd06b867cda1fc7ec9935 Mon Sep 17 00:00:00 2001
From: luckyrat <luckyrat@musites.com>
Date: Fri, 23 Feb 2024 11:20:09 +0000
Subject: [PATCH] Add extra format upgrade tests

---
 lib/src/kdbx_file.dart                  |   7 +++
 pubspec.yaml                            |   2 +-
 test/kdbx_upgrade_test.dart             |  57 ++++++++++++++++--------
 test/test_files/v4.0.kdbx               | Bin 0 -> 2497 bytes
 test/test_files/v4_1-invalid-dates.kdbx | Bin 0 -> 993 bytes
 5 files changed, 46 insertions(+), 20 deletions(-)
 create mode 100644 test/test_files/v4.0.kdbx
 create mode 100644 test/test_files/v4_1-invalid-dates.kdbx

diff --git a/lib/src/kdbx_file.dart b/lib/src/kdbx_file.dart
index 16b3885..7eae5aa 100644
--- a/lib/src/kdbx_file.dart
+++ b/lib/src/kdbx_file.dart
@@ -151,6 +151,13 @@ class KdbxFile {
         ? header.upgradeMinor(majorVersion, minorVersion)
         : header.upgrade(majorVersion, minorVersion);
 
+    // Do this even we were already in v4.x since some KDBX software (including
+    // earlier versions of Kee Vault) skipped this step when upgrading from <v4.
+    // One probably won't call this upgrade function unless the version is <4.1
+    // so if there are some 4.1 files with this problem, they won't be fixed.
+    // If that happens we could develop a "force upgrade" feature in the
+    // user-facing software (such as Kee Vault) and tell users to activate that
+    // in order to fix export compatibility with strict clients like KeePass.
     upgradeDateTimeFormatV4();
 
     body.meta.settingsChanged.setToNow();
diff --git a/pubspec.yaml b/pubspec.yaml
index 17ceefd..659eab2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: kdbx
 description: KeepassX format implementation in pure dart. (kdbx 3.x and 4.x support).
-version: 0.6.0+3
+version: 0.6.0+4
 homepage: https://github.com/kee-org/kdbx.dart
 publish_to: none
 
diff --git a/test/kdbx_upgrade_test.dart b/test/kdbx_upgrade_test.dart
index e90b790..a6ecc9c 100644
--- a/test/kdbx_upgrade_test.dart
+++ b/test/kdbx_upgrade_test.dart
@@ -1,4 +1,3 @@
-
 import 'package:kdbx/kdbx.dart';
 import 'package:kdbx/src/internal/extension_utils.dart';
 import 'package:kdbx/src/kdbx_xml.dart';
@@ -37,6 +36,7 @@ void main() {
       file.upgrade(KdbxVersion.V4.major, 1);
       final v4 = await TestUtil.saveAndRead(file);
       expect(v4.header.version, KdbxVersion.V4_1);
+      checkDateValues(v4);
       await TestUtil.saveTestOutput('kdbx4upgrade4-41', v4);
     }, tags: 'kdbx4');
 
@@ -53,30 +53,49 @@ void main() {
       file.upgrade(KdbxVersion.V4.major, 1);
       final v4 = await TestUtil.saveAndRead(await TestUtil.saveAndRead(file));
       expect(v4.header.version, KdbxVersion.V4_1);
+      checkDateValues(v4);
+    }, tags: 'kdbx4');
 
-      final metaValues = [
-        v4.body.meta.node.singleElement('DatabaseNameChanged')?.text,
-        v4.body.meta.node.singleElement('DatabaseDescriptionChanged')?.text,
-        v4.body.meta.node.singleElement('DefaultUserNameChanged')?.text,
-        v4.body.meta.node.singleElement('MasterKeyChanged')?.text,
-        v4.body.meta.node.singleElement('RecycleBinChanged')?.text,
-        v4.body.meta.node.singleElement('EntryTemplatesGroupChanged')?.text,
-        v4.body.meta.node.singleElement('SettingsChanged')?.text,
-      ];
-      metaValues.forEach(checkIsBase64Date);
+    test('Forced upgrade from v4.1 with bad dates transforms date format',
+        () async {
+      final file = await TestUtil.readKdbxFile(
+          'test/test_files/v4_1-invalid-dates.kdbx',
+          password: 'asdf');
+      expect(file.header.version, KdbxVersion.V4_1);
+      file.upgrade(KdbxVersion.V4.major, 1);
+      final v4 = await TestUtil.saveAndRead(await TestUtil.saveAndRead(file));
+      expect(v4.header.version, KdbxVersion.V4_1);
+      checkDateValues(v4);
+    }, tags: 'kdbx4');
 
-      v4.body.rootGroup
-          .getAllEntries()
-          .values
-          .forEach(checkObjectHasBase64Dates);
-      v4.body.rootGroup
-          .getAllGroups()
-          .values
-          .forEach(checkObjectHasBase64Dates);
+    test('Upgrade from v4.0 with good dates', () async {
+      final file = await TestUtil.readKdbxFile('test/test_files/v4.0.kdbx',
+          password: 'FooBar');
+      expect(file.header.version, KdbxVersion.V4);
+      file.upgrade(KdbxVersion.V4.major, 1);
+      final v4 = await TestUtil.saveAndRead(await TestUtil.saveAndRead(file));
+      expect(v4.header.version, KdbxVersion.V4_1);
+      checkDateValues(v4);
     }, tags: 'kdbx4');
   }, tags: ['kdbx4']);
 }
 
+void checkDateValues(KdbxFile v4) {
+  final metaValues = [
+    v4.body.meta.node.singleElement('DatabaseNameChanged')?.text,
+    v4.body.meta.node.singleElement('DatabaseDescriptionChanged')?.text,
+    v4.body.meta.node.singleElement('DefaultUserNameChanged')?.text,
+    v4.body.meta.node.singleElement('MasterKeyChanged')?.text,
+    v4.body.meta.node.singleElement('RecycleBinChanged')?.text,
+    v4.body.meta.node.singleElement('EntryTemplatesGroupChanged')?.text,
+    v4.body.meta.node.singleElement('SettingsChanged')?.text,
+  ];
+  metaValues.forEach(checkIsBase64Date);
+
+  v4.body.rootGroup.getAllEntries().values.forEach(checkObjectHasBase64Dates);
+  v4.body.rootGroup.getAllGroups().values.forEach(checkObjectHasBase64Dates);
+}
+
 // Sometimes the nodes can contain an XmlNodeList with a single element, rather than directly containing an XmlText node. Bug in XML lib?
 // Have to work around by using deprecated text property which works no matter which approach the library decides to take this time.
 void checkObjectHasBase64Dates(KdbxObject? obj) {
diff --git a/test/test_files/v4.0.kdbx b/test/test_files/v4.0.kdbx
new file mode 100644
index 0000000000000000000000000000000000000000..9c0724b162c189587276f4d11b1b6ac8f90ee831
GIT binary patch
literal 2497
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
LHl7Rm00000h?10x

literal 0
HcmV?d00001

diff --git a/test/test_files/v4_1-invalid-dates.kdbx b/test/test_files/v4_1-invalid-dates.kdbx
new file mode 100644
index 0000000000000000000000000000000000000000..fa5d919844dfea1fde0a143a1077177aecac6945
GIT binary patch
literal 993
zcmZR+xoB4UZ||*)3@i*x0t^fch6g`A+h6D$urGpDG3!s%e`Xe-AR`d7C;*8saWme3
zxa`VXsu|v@y*+>H-Q>2ESyHM?7$mB!Y+l)`u!D?fQJW!mlKuPKhx^}u?S0<Y%H0hV
zWMFh+1(GVEp`I=vMemby@AqiBcu)MkatZTeE*>Y49l;7f;=}X1nlsENT{^t{c(cjI
zJqBCPUS4m)9um-dNv7yzY1>B@kjem<vsghqPYxi#1jHZ!7V!m%Fff2@0y-U}CJdxQ
z7{mpG^Sug5hrBv6vQE30M(>#*zde1q;jjA1^Ut){n~2vr$G&b}bSm-0nZq6F+`(TD
zM`c$rUN~!MFeT=-OQ;@O@8U-VZhB%dX;<d0SY@yBNiV&k|GILs_#{T@h$j73`B-m<
z1fX*+JN6d0x7C!GSN~4tIFrGDX?nS8_}ad{lwM&eo!85pbq}iZK3X!{MZ-g0>5}1P
zl^T~^^Iw4hpTCv<nY4R?fct};n}Wj_*}t>?DF6PKeJb1U`V~2*CtkUHeOxF$Px2C1
zp#Dv<nL-WDGaeW23squ2E+Y0nYeQ}P3L~53(23D%hu%%$d?lIm*COnJuhXjN=543t
z7hF$xbjSb28ta+~H#e}#A9%I>^<Eyovz}}^SF9$if4ZcducE@;>-eX2#e7erkFzvw
zwy&{$`D@ASF6EMK8xqco&VBjFMlCAto|i+JGw;0zI=02T&R$w=rnm0<@{`ewlm5n^
z)l_a2d!Bgq#-^pmC;f1LFBqj&eqFzn*LKyG$#1>WCj~F$>B(bV-(7m$BC37u5vv)u
zeJaClS=LDJh<`F)p1mj8vc=VHInVo9`!D~#z^43hq5QfFdEF6D94}aHyRnP$%f&AR
zE&_9{ZcnZJ=CrEkMU>5%d8@OvzjrHf<VWd0`f}*MQ!CH36N=%_!#5v&;g)E>O6IB0
zs|%OTi}d|eTew;yZjn0MkrFK{t$2GTw~|(&gMT&6A{~^o&HprQsdI|46+2TcwzJW`
zsqpNcmpi`;9s01QI&<G5Q_G|dmwPR1)mA^4b0~L1g#GM?@=+6i+bJAme7fZQuDa<H
zC31F~ta;$FVQ!S;$)^`r$=IuY-PX3qbE&H0dbY=>%4dhK{4w=N`?5*#0+mu1yv&0&
zmMjs`FmEesx_x?Lk)oXU$_MUdRq<*@mlIUCT)X$wPN*|2bhfS5-8Ehlr@pEEmf7ac
zWhqegM!(&y$?bxSwYZ(*<Ex^gZJMIb{NA!0;$~HU&1<94H0Ss;h9yFL>t(KOT6|k^
JMiMBY0{~Bmsb>HH

literal 0
HcmV?d00001