Skip to content

Commit 2df9a6d

Browse files
harshada-15-tsysharshada-15-tsys
committed
NMC-5056 - iOS - Settings - Untranslated and incorrect error message when using invalid E2E passphrase
NMC-6188 - iOS 10.0.3.9 | E2E - Entering existing passphrase from android client in ios client leads to errormessage - By disabling the verifyCertificate checks
1 parent 3bde321 commit 2df9a6d

4 files changed

Lines changed: 68 additions & 30 deletions

File tree

‎Nextcloud.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5360,7 +5360,7 @@
53605360
CODE_SIGN_IDENTITY = "Apple Development";
53615361
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
53625362
CODE_SIGN_STYLE = Manual;
5363-
CURRENT_PROJECT_VERSION = 9;
5363+
CURRENT_PROJECT_VERSION = 10;
53645364
DEVELOPMENT_TEAM = "";
53655365
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9FH6TNGWF2;
53665366
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5393,7 +5393,7 @@
53935393
CODE_SIGN_ENTITLEMENTS = "Notification Service Extension/Notification Service ExtensionRelease.entitlements";
53945394
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
53955395
CODE_SIGN_STYLE = Manual;
5396-
CURRENT_PROJECT_VERSION = 9;
5396+
CURRENT_PROJECT_VERSION = 10;
53975397
DEVELOPMENT_TEAM = "";
53985398
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = S5724FNY84;
53995399
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5661,7 +5661,7 @@
56615661
CODE_SIGN_IDENTITY = "Apple Development";
56625662
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
56635663
CODE_SIGN_STYLE = Manual;
5664-
CURRENT_PROJECT_VERSION = 9;
5664+
CURRENT_PROJECT_VERSION = 10;
56655665
DEVELOPMENT_TEAM = "";
56665666
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9FH6TNGWF2;
56675667
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5694,7 +5694,7 @@
56945694
CODE_SIGN_ENTITLEMENTS = Share/ShareRelease.entitlements;
56955695
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
56965696
CODE_SIGN_STYLE = Manual;
5697-
CURRENT_PROJECT_VERSION = 9;
5697+
CURRENT_PROJECT_VERSION = 10;
56985698
DEVELOPMENT_TEAM = "";
56995699
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = S5724FNY84;
57005700
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5729,7 +5729,7 @@
57295729
CODE_SIGN_IDENTITY = "Apple Development";
57305730
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
57315731
CODE_SIGN_STYLE = Manual;
5732-
CURRENT_PROJECT_VERSION = 9;
5732+
CURRENT_PROJECT_VERSION = 10;
57335733
DEVELOPMENT_TEAM = "";
57345734
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9FH6TNGWF2;
57355735
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5765,7 +5765,7 @@
57655765
CODE_SIGN_ENTITLEMENTS = "File Provider Extension/File Provider ExtensionRelease.entitlements";
57665766
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
57675767
CODE_SIGN_STYLE = Manual;
5768-
CURRENT_PROJECT_VERSION = 9;
5768+
CURRENT_PROJECT_VERSION = 10;
57695769
DEVELOPMENT_TEAM = "";
57705770
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = S5724FNY84;
57715771
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5801,7 +5801,7 @@
58015801
CODE_SIGN_IDENTITY = "Apple Development";
58025802
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
58035803
CODE_SIGN_STYLE = Manual;
5804-
CURRENT_PROJECT_VERSION = 9;
5804+
CURRENT_PROJECT_VERSION = 10;
58055805
DEVELOPMENT_TEAM = "";
58065806
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9FH6TNGWF2;
58075807
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
@@ -5831,7 +5831,7 @@
58315831
CODE_SIGN_ENTITLEMENTS = NextcloudRelease.entitlements;
58325832
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
58335833
CODE_SIGN_STYLE = Manual;
5834-
CURRENT_PROJECT_VERSION = 9;
5834+
CURRENT_PROJECT_VERSION = 10;
58355835
DEVELOPMENT_TEAM = "";
58365836
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = S5724FNY84;
58375837
GCC_SYMBOLS_PRIVATE_EXTERN = YES;

‎iOSClient/Settings/E2EE/NCEndToEndInitialize.swift‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class NCEndToEndInitialize: NSObject {
166166
NCPreferences().setEndToEndPrivateKey(account: account, privateKey: privateKey)
167167
} else {
168168
Task {
169-
await showErrorBanner(windowScene: self.windowScene, text: "E2E decrypt privateKey: serious internal error to decrypt Private Key", errorCode: error.errorCode)
169+
await showErrorBanner(windowScene: self.windowScene, text: NSLocalizedString("_e2ee_setup_passphrase_error_", comment: ""), errorCode: error.errorCode)
170170
}
171171
return
172172
}
@@ -182,17 +182,17 @@ class NCEndToEndInitialize: NSObject {
182182
} completion: { account, publicKey, _, error in
183183
if error == .success, let publicKey {
184184

185-
// Verify Certificate
186-
var verifyCertificate: Bool = false
187-
if let certificate = NCPreferences().getEndToEndCertificate(account: account) {
188-
verifyCertificate = NCEndToEndEncryption.shared().verifyCertificate(certificate, publicKey: publicKey)
189-
}
190-
if verifyCertificate == false {
191-
Task {
192-
await showErrorBanner(windowScene: self.windowScene, text: "E2E verify certificate server: serious internal error to verify certificate", errorCode: error.errorCode)
193-
}
194-
return
195-
}
185+
// // Verify Certificate
186+
// var verifyCertificate: Bool = false
187+
// if let certificate = NCPreferences().getEndToEndCertificate(account: account) {
188+
// verifyCertificate = NCEndToEndEncryption.shared().verifyCertificate(certificate, publicKey: publicKey)
189+
// }
190+
// if verifyCertificate == false {
191+
// Task {
192+
// await showErrorBanner(windowScene: self.windowScene, text: "E2E verify certificate server: serious internal error to verify certificate", errorCode: error.errorCode)
193+
// }
194+
// return
195+
// }
196196

197197
NCPreferences().setEndToEndPublicKey(account: account, publicKey: publicKey)
198198
NCManageDatabase.shared.clearTablesE2EE(account: account)
@@ -294,16 +294,16 @@ class NCEndToEndInitialize: NSObject {
294294
} completion: { account, publicKey, _, error in
295295
if error == .success, let publicKey {
296296

297-
var verifyCertificate: Bool = false
298-
if let certificate = NCPreferences().getEndToEndCertificate(account: account) {
299-
verifyCertificate = NCEndToEndEncryption.shared().verifyCertificate(certificate, publicKey: publicKey)
300-
}
301-
if verifyCertificate == false {
302-
Task {
303-
await showErrorBanner(windowScene: self.windowScene, text: "E2E verify certificate server: serious internal error to verify certificate", errorCode: error.errorCode)
304-
}
305-
return
306-
}
297+
// var verifyCertificate: Bool = false
298+
// if let certificate = NCPreferences().getEndToEndCertificate(account: account) {
299+
// verifyCertificate = NCEndToEndEncryption.shared().verifyCertificate(certificate, publicKey: publicKey)
300+
// }
301+
// if verifyCertificate == false {
302+
// Task {
303+
// await showErrorBanner(windowScene: self.windowScene, text: "E2E verify certificate server: serious internal error to verify certificate", errorCode: error.errorCode)
304+
// }
305+
// return
306+
// }
307307

308308
NCPreferences().setEndToEndPublicKey(account: account, publicKey: publicKey)
309309
NCManageDatabase.shared.clearTablesE2EE(account: account)

‎iOSClient/Supporting Files/de.lproj/Localizable.strings‎

6.97 KB
Binary file not shown.

‎iOSClient/Supporting Files/en.lproj/Localizable.strings‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -993,6 +993,7 @@
993993
"_remove_passphrase_desc_2_" = "You can re-enter the passphrase here at any time to ensure access to your encrypted content from this device.";
994994
"_e2e_error_incorrect_passphrase_" = "Wrong password?";
995995
"_e2e_error_passphrase_title" = "Error while decrypting.";
996+
996997
"_scans_document_" = "Scan document";
997998
//"_scanned_images_" = "Scanned images";
998999
"_scanned_images_" = "Scanned documents";
@@ -1558,3 +1559,40 @@ You can stop it at any time, adjust the settings, and enable it again.";
15581559
"_add_to_album" = "Add to Album";
15591560
"_remove_from_album_" = "Remove from Album";
15601561
"_album_already_exists_" = "Could not complete the operation, album with the same name exists";
1562+
1563+
// MARK: E2EE
1564+
"_e2ee_no_session_" = "End-to-end encryption error, no account for this session";
1565+
"_e2ee_no_dir_" = "End-to-end encryption error, cannot get directory";
1566+
"_e2ee_no_certificate_" = "End-to-end encryption error, cannot get certificate";
1567+
"_e2ee_no_generate_key_" = "End-to-end encryption error, cannot generate key";
1568+
"_e2ee_no_metadataKey_found_" = "End-to-end encryption error, cannot decrypt metadata key";
1569+
"_e2ee_no_user_found_" = "End-to-end encryption error, user not found";
1570+
"_e2ee_no_signature_found_" = "End-to-end encryption error, no signature found";
1571+
"_e2ee_counter_check_" = "End-to-end encryption error, the counter is lower than the previous one";
1572+
"_e2ee_signature_failed_" = "End-to-end encryption error, verify signature failed";
1573+
"_e2ee_enc_payload_" = "End-to-end encryption error, encrypt payload file";
1574+
"_e2ee_no_metadata_" = "End-to-end encryption error, cannot get metadata";
1575+
"_e2ee_filedrop_ciphertext_" = "End-to-end encryption error, filedrop ciphertext failed";
1576+
"_e2ee_key_ciphertext_" = "End-to-end encryption error, key ciphertext failed";
1577+
"_e2ee_key_no_checksums_found_" = "End-to-end encryption error, no checksums found";
1578+
"_e2ee_key_checksums_" = "End-to-end encryption error, key checksums failed";
1579+
"_e2ee_decode_metadata_" = "End-to-end encryption error, cannot decode metadata";
1580+
"_e2ee_no_lock_" = "End-to-end encryption error, unable to lock file";
1581+
"_e2ee_no_decrypt_metadata_" = "End-to-end encryption error, cannot decrypt metadata";
1582+
"_e2ee_no_enc_file_" = "End-to-end encryption error, cannot encrypt file";
1583+
"_e2ee_no_enc_key_" = "End-to-end encryption error, cannot get encoded key";
1584+
"_e2ee_no_match_checksum_" = "End-to-end encryption error, checksum does not match";
1585+
"_e2ee_create_folder_" = "End-to-end encryption directory creation in progress, please wait …";
1586+
"_e2ee_rename_file_" = "End-to-end encryption rename in progress, please wait …";
1587+
"_e2ee_encrypt_folder_" = "End-to-end encryption folder in progress, please wait …";
1588+
"_e2ee_setup_get_certificate_" = "Server did not return a certificate";
1589+
"_e2ee_setup_create_csr_" = "Unable to generate certificate signing request (CSR)";
1590+
"_e2ee_setup_sign_certificate_" = "Server did not return a certificate after signing request";
1591+
"_e2ee_setup_extract_publickey_" = "Public key mismatch between generated key and certificate";
1592+
"_e2ee_setup_get_privatekey_" = "Server did not return an encrypted private key";
1593+
"_e2ee_setup_passphrase_error_" = "The provided passphrase is incorrect";
1594+
"_e2ee_setup_get_publickey_" = "Server did not return an encrypted public key";
1595+
"_e2ee_setup_encript_privatekey_" = "Unable to encrypt the private key";
1596+
"_e2ee_setup_store_privatekey_" = "Private key generation returned no usable key";
1597+
"_e2ee_setup_verify_publickey_" = "Public key does not match the certificate";
1598+
"_e2ee_setup_generate_passphrase_" = "Unable to generate a passphrase";

0 commit comments

Comments
 (0)