Merge pull request #1668 from floccusaddon/fix/encryption-salt

fix(GoogleDrive,WebDAV): Allow passing salt in file contents
floccusaddon · Jul 6, 2024 · af25b70 · af25b70
2 parents 20a2426 + 95b2bb6
commit af25b70
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/lib/adapters/GoogleDrive.ts b/src/lib/adapters/GoogleDrive.ts
@@ -210,7 +210,7 @@ export default class GoogleDriveAdapter extends CachingAdapter {
 
     this.accessToken = await this.getAccessToken(this.server.refreshToken)
 
-    const fileList = await this.listFiles('name = ' + "'" + this.server.bookmark_file + "'")
+    const fileList = await this.listFiles(`name = '${this.server.bookmark_file}'`)
     const file = fileList.files.filter(file => !file.trashed)[0]
     if (file) {
       this.fileId = file.id
@@ -234,7 +234,13 @@ export default class GoogleDriveAdapter extends CachingAdapter {
 
       if (this.server.password) {
         try {
-          xmlDocText = await Crypto.decryptAES(this.server.password, xmlDocText, this.server.bookmark_file)
+          try {
+            // TODO: Use this when encrypting
+            const json = JSON.parse(xmlDocText)
+            xmlDocText = await Crypto.decryptAES(this.server.password, json.ciphertext, json.salt)
+          } catch (e) {
+            xmlDocText = await Crypto.decryptAES(this.server.password, xmlDocText, this.server.bookmark_file)
+          }
         } catch (e) {
           if (xmlDocText.includes('<?xml version="1.0" encoding="UTF-8"?>')) {
             // not encrypted, yet => noop

diff --git a/src/lib/adapters/WebDav.ts b/src/lib/adapters/WebDav.ts
@@ -210,7 +210,12 @@ export default class WebDavAdapter extends CachingAdapter {
 
       if (this.server.passphrase) {
         try {
-          xmlDocText = await Crypto.decryptAES(this.server.passphrase, xmlDocText, this.server.bookmark_file)
+          try {
+            const json = JSON.parse(xmlDocText)
+            xmlDocText = await Crypto.decryptAES(this.server.passphrase, json.ciphertext, json.salt)
+          } catch (e) {
+            xmlDocText = await Crypto.decryptAES(this.server.passphrase, xmlDocText, this.server.bookmark_file)
+          }
         } catch (e) {
           if (xmlDocText.includes('<?xml version="1.0" encoding="UTF-8"?>') || xmlDocText.includes('<!DOCTYPE NETSCAPE-Bookmark-file-1>')) {
             // not encrypted, yet => noop