Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Add ignoreUnknownCharacters to base64 decode on iOS (#2399)
Leendert de Borst4811e69ddcd0
diff --git a/apps/mobile-app/ios/VaultStoreKit/Database/Mappers/ItemMapper.swift b/apps/mobile-app/ios/VaultStoreKit/Database/Mappers/ItemMapper.swiftindex bcd0c82cb..7ca010a8a 100644--- a/apps/mobile-app/ios/VaultStoreKit/Database/Mappers/ItemMapper.swift+++ b/apps/mobile-app/ios/VaultStoreKit/Database/Mappers/ItemMapper.swift@@ -33,7 +33,7 @@ public struct ItemRow {// Handle logo data - can be base64 string or Blobif let logoBase64 = row["Logo"] as? String {- self.logo = Data(base64Encoded: logoBase64)+ self.logo = Data(base64Encoded: logoBase64, options: .ignoreUnknownCharacters)} else if let logoBlob = row["Logo"] as? SQLite.Blob {self.logo = Data(logoBlob.bytes)} else {diff --git a/apps/mobile-app/ios/VaultStoreKit/Database/Mappers/PasskeyMapper.swift b/apps/mobile-app/ios/VaultStoreKit/Database/Mappers/PasskeyMapper.swiftindex 86e3290e4..bcfa492ed 100644--- a/apps/mobile-app/ios/VaultStoreKit/Database/Mappers/PasskeyMapper.swift+++ b/apps/mobile-app/ios/VaultStoreKit/Database/Mappers/PasskeyMapper.swift@@ -42,13 +42,13 @@ public struct PasskeyRow {// Handle optional blob fieldsif let userHandleBase64 = row["UserHandle"] as? String {- self.userHandle = Data(base64Encoded: userHandleBase64)+ self.userHandle = Data(base64Encoded: userHandleBase64, options: .ignoreUnknownCharacters)} else {self.userHandle = nil}if let prfKeyBase64 = row["PrfKey"] as? String {- self.prfKey = Data(base64Encoded: prfKeyBase64)+ self.prfKey = Data(base64Encoded: prfKeyBase64, options: .ignoreUnknownCharacters)} else {self.prfKey = nil}diff --git a/apps/mobile-app/ios/VaultStoreKit/Services/VaultMergeService.swift b/apps/mobile-app/ios/VaultStoreKit/Services/VaultMergeService.swiftindex e65b0723d..9201744fc 100644--- a/apps/mobile-app/ios/VaultStoreKit/Services/VaultMergeService.swift+++ b/apps/mobile-app/ios/VaultStoreKit/Services/VaultMergeService.swift@@ -50,8 +50,8 @@ public class VaultMergeService {// Decrypt both vaults// Format is: base64(encrypted(base64(rawSqlite)))// Step 1: Decode outer base64 to get encrypted bytes- guard let localVaultData = Data(base64Encoded: localVaultBase64),- let serverVaultData = Data(base64Encoded: serverVaultBase64) else {+ guard let localVaultData = Data(base64Encoded: localVaultBase64, options: .ignoreUnknownCharacters),+ let serverVaultData = Data(base64Encoded: serverVaultBase64, options: .ignoreUnknownCharacters) else {print("[VaultMergeService] Failed to decode outer base64")throw VaultMergeError.invalidInput("Invalid base64 vault data")}@@ -62,11 +62,11 @@ public class VaultMergeService {// Step 3: Decode inner base64 to get raw SQLite bytesguard let localDecryptedString = String(data: localDecryptedBase64, encoding: .utf8),- let localDecrypted = Data(base64Encoded: localDecryptedString) else {+ let localDecrypted = Data(base64Encoded: localDecryptedString, options: .ignoreUnknownCharacters) else {throw VaultMergeError.invalidInput("Invalid inner base64 in local vault")}guard let serverDecryptedString = String(data: serverDecryptedBase64, encoding: .utf8),- let serverDecrypted = Data(base64Encoded: serverDecryptedString) else {+ let serverDecrypted = Data(base64Encoded: serverDecryptedString, options: .ignoreUnknownCharacters) else {throw VaultMergeError.invalidInput("Invalid inner base64 in server vault")}@@ -138,7 +138,7 @@ public class VaultMergeService {) throws -> (vaultBase64: String, prunedCount: Int) {// Decrypt vault: base64(encrypted(base64(sqlite)))// Step 1: Decode outer base64 to get encrypted bytes- guard let vaultData = Data(base64Encoded: vaultBase64) else {+ guard let vaultData = Data(base64Encoded: vaultBase64, options: .ignoreUnknownCharacters) else {throw VaultMergeError.invalidInput("Invalid base64 vault data")}@@ -147,7 +147,7 @@ public class VaultMergeService {// Step 3: Decode inner base64 to get raw SQLite bytesguard let decryptedString = String(data: decryptedBase64, encoding: .utf8),- let decrypted = Data(base64Encoded: decryptedString) else {+ let decrypted = Data(base64Encoded: decryptedString, options: .ignoreUnknownCharacters) else {throw VaultMergeError.invalidInput("Invalid inner base64 in vault")}diff --git a/apps/mobile-app/ios/VaultStoreKit/VaultStore+Crypto.swift b/apps/mobile-app/ios/VaultStoreKit/VaultStore+Crypto.swiftindex 41a2316b3..044eb4bac 100644--- a/apps/mobile-app/ios/VaultStoreKit/VaultStore+Crypto.swift+++ b/apps/mobile-app/ios/VaultStoreKit/VaultStore+Crypto.swift@@ -128,7 +128,7 @@ extension VaultStore {// Try to decrypt the vault to verify the password is correctguard let encryptedDbBase64 = getEncryptedDatabase(),- let encryptedDbData = Data(base64Encoded: encryptedDbBase64) else {+ let encryptedDbData = Data(base64Encoded: encryptedDbBase64, options: .ignoreUnknownCharacters) else {return nil}diff --git a/apps/mobile-app/ios/VaultStoreKit/VaultStore+Database.swift b/apps/mobile-app/ios/VaultStoreKit/VaultStore+Database.swiftindex a3f9b020e..f70bc2528 100644--- a/apps/mobile-app/ios/VaultStoreKit/VaultStore+Database.swift+++ b/apps/mobile-app/ios/VaultStoreKit/VaultStore+Database.swift@@ -29,7 +29,7 @@ extension VaultStore {throw AppError.encryptionKeyNotFound}- guard let encryptedDbData = Data(base64Encoded: encryptedDbBase64) else {+ guard let encryptedDbData = Data(base64Encoded: encryptedDbBase64, options: .ignoreUnknownCharacters) else {throw AppError.base64DecodeFailed}@@ -61,7 +61,7 @@ extension VaultStore {/// Setup the database with the decrypted dataprivate func setupDatabaseWithDecryptedData(_ decryptedDbBase64: Data) throws {// Step 1: Decode base64- guard let decryptedDbData = Data(base64Encoded: decryptedDbBase64) else {+ guard let decryptedDbData = Data(base64Encoded: decryptedDbBase64, options: .ignoreUnknownCharacters) else {throw AppError.base64DecodeFailed}