@tutao/node-mimimi 277.250414.1 → 284.250428.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tutao/node-mimimi",
-  "version": "277.250414.1",
+  "version": "284.250428.2",
   "main": "./dist/binding.js",
   "types": "./dist/binding.d.ts",
   "napi": {
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@tutao/otest": "277.250414.1",
+    "@tutao/otest": "284.250428.2",
     "@napi-rs/cli": "3.0.0-alpha.68",
     "typescript": "5.3.3",
     "zx": "8.1.5"
@@ -30,8 +30,8 @@
     "version": "napi version"
   },
   "optionalDependencies": {
-    "@tutao/node-mimimi-win32-x64-msvc": "277.250414.1",
-    "@tutao/node-mimimi-linux-x64-gnu": "277.250414.1",
-    "@tutao/node-mimimi-darwin-universal": "277.250414.1"
+    "@tutao/node-mimimi-win32-x64-msvc": "284.250428.2",
+    "@tutao/node-mimimi-linux-x64-gnu": "284.250428.2",
+    "@tutao/node-mimimi-darwin-universal": "284.250428.2"
   }
 }

package/src/importer/importable_mail.rs

@@ -156,6 +156,7 @@ impl From<MailContact> for MailAddress {
 			name: value.name,
 			contact: None,
 			_finalIvs: Default::default(),
+			_errors: Default::default(),
 		}
 	}
 }
@@ -578,9 +579,10 @@ impl ImportableMail {
 			.into_iter()
 			.map(|reply_to| EncryptedMailAddress {
 				_id: Some(tutasdk::CustomId::from_custom_string(FIXED_CUSTOM_ID)),
-				_finalIvs: Default::default(),
 				name: reply_to.name,
 				address: reply_to.mail_address,
+				_finalIvs: Default::default(),
+				_errors: Default::default(),
 			})
 			.collect();
 
@@ -605,7 +607,6 @@ impl ImportableMail {
 			_format: 0,
 			ownerEncSessionKey: owner_enc_sk,
 			ownerKeyVersion: owner_enc_sk_version,
-			_finalIvs: Default::default(),
 			compressedHeaders: headers_string,
 			subject,
 			compressedBodyText: html_body_text,
@@ -632,7 +633,8 @@ impl ImportableMail {
 			inReplyTo: in_reply_to,
 			references,
 			importedAttachments: vec![],
-			_errors: None,
+			_errors: Default::default(),
+			_finalIvs: Default::default(),
 		}
 	}
 }
@@ -653,10 +655,7 @@ impl ImportableMail {
 	pub fn from_parsed_message(parsed_message: &mail_parser::Message) -> Self {
 		let subject = parsed_message.subject().unwrap_or_default().to_string();
 
-		let date = parsed_message
-			.date()
-			.as_ref()
-			.map(|date_time| DateTime::from_millis(date_time.to_timestamp() as u64 * 1000));
+		let date = get_importable_date_time(parsed_message);
 
 		let name_as_address_if_empty_address = |mut address: MailContact| -> MailContact {
 			if address.mail_address.is_empty() && !address.name.is_empty() {
@@ -770,6 +769,22 @@ impl ImportableMail {
 	}
 }
 
+/**
+* convert the "Date:" header value from the parsed message to something we can import.
+* if the value isn't valid (parser returned -1 or the value doesn't fit in an u64
+* when converted to milliseconds), we'll use midnight, 1st of January 1970 as a default.
+*/
+fn get_importable_date_time(message: &mail_parser::Message) -> Option<DateTime> {
+	message
+		.date()
+		.map(mail_parser::DateTime::to_timestamp)
+		.map(|timestamp| timestamp.max(0))
+		.into_iter()
+		.filter_map(|millis| (millis as u64).checked_mul(1000))
+		.map(DateTime::from_millis)
+		.next()
+}
+
 #[cfg(test)]
 mod mime_string_to_importable_mail_test;
 #[cfg(test)]

package/src/importer/messages.rs

@@ -65,6 +65,8 @@ pub struct MailImportMessage {
 pub enum PreparationError {
 	/// Can not create a native Rest client
 	NoNativeRestClient,
+	/// Can not create a native file client
+	NoNativeFileClient,
 	/// some error occurred while reading import directory
 	CannotReadOldStateId,
 	/// Error when trying to resume the session passed from client
@@ -134,6 +136,7 @@ impl From<PreparationError> for napi::Error {
 	fn from(prep_err: PreparationError) -> Self {
 		let code = match prep_err {
 			PreparationError::NoNativeRestClient => "NoNativeRestClient",
+			PreparationError::NoNativeFileClient => "NoNativeFileClient",
 			PreparationError::CannotReadOldStateId => "ImportDirectoryPreparation",
 			PreparationError::LoginError => "LoginError",
 			PreparationError::FailedToReadEmls => "FailedToReadEmls",

package/src/importer.rs

@@ -19,6 +19,7 @@ use crate::importer::messages::{
 	ImportErrorKind, ImportOkKind, MailImportErrorMessage, PreparationError,
 };
 use crate::importer_api::TutaCredentials;
+use tutasdk::bindings::native_file_client::NativeFileClient;
 use tutasdk::entities::generated::tutanota::{
 	ImportMailGetIn, ImportMailPostIn, ImportMailPostOut, ImportMailState,
 };
@@ -234,7 +235,7 @@ impl ImportEssential {
 			ownerKeyVersion: owner_enc_sk_for_import_state_get.version as i64,
 			totalMails: total_importable_mails,
 			targetMailFolder: target_mailset,
-			_errors: None,
+			_errors: Default::default(),
 			_finalIvs: Default::default(),
 		};
 
@@ -308,6 +309,7 @@ impl Importer {
 	}
 
 	pub(super) async fn create_sdk(
+		config_directory: &str,
 		tuta_credentials: TutaCredentials,
 	) -> Result<Arc<LoggedInSdk>, PreparationError> {
 		let base_url = tuta_credentials.api_url.clone();
@@ -315,14 +317,19 @@ impl Importer {
 			log::error!("Can not create new native rest client: {e:?}");
 			PreparationError::NoNativeRestClient
 		})?;
+		let file_client = NativeFileClient::try_new(config_directory.into()).map_err(|e| {
+			log::error!("Can not create new native rest client: {e:?}");
+			PreparationError::NoNativeRestClient
+		})?;
 
-		let logged_in_sdk = tutasdk::Sdk::new(base_url, Arc::new(rest_client))
-			.login(tuta_credentials.into())
-			.await
-			.map_err(|e| {
-				log::error!("Can not login to sdk: {e:?}");
-				PreparationError::LoginError
-			})?;
+		let logged_in_sdk =
+			tutasdk::Sdk::new(base_url, Arc::new(rest_client), Arc::new(file_client))
+				.login(tuta_credentials.into())
+				.await
+				.map_err(|e| {
+					log::error!("Can not login to sdk: {e:?}");
+					PreparationError::LoginError
+				})?;
 
 		Ok(logged_in_sdk)
 	}
@@ -366,7 +373,7 @@ impl Importer {
 			fs_email_client: FileImport::new(eml_files_to_import),
 		};
 
-		let logged_in_sdk = Self::create_sdk(tuta_credentials).await?;
+		let logged_in_sdk = Self::create_sdk(&config_directory, tuta_credentials).await?;
 		let remote_import_state = logged_in_sdk
 			.mail_facade()
 			.get_crypto_entity_client()
@@ -775,6 +782,21 @@ pub mod tests {
 		assert_eq!(remote_state.successfulMails, 1);
 	}
 
+	#[cfg_attr(
+		not(feature = "test-with-local-http-server"),
+		ignore = "require local http server."
+	)]
+	#[tokio::test]
+	async fn can_import_single_eml_file_with_invalid_date() {
+		let importer = init_file_importer(vec!["brokendate.eml"]).await;
+		importer.start_stateful_import().await.unwrap();
+
+		let remote_state = importer.essentials.load_remote_state().await.unwrap();
+		assert_eq!(remote_state.status, ImportStatus::Finished as i64);
+		assert_eq!(remote_state.failedMails, 0);
+		assert_eq!(remote_state.successfulMails, 1);
+	}
+
 	#[test]
 	fn max_request_size_in_test_is_different() {
 		assert_eq!(1024 * 5, MAX_REQUEST_SIZE);

package/src/importer_api.rs

@@ -238,7 +238,7 @@ impl ImporterApi {
 		let import_directory =
 			FileImport::prepare_file_import(config_directory, mailbox_id, source_paths)?;
 
-		let logged_in_sdk = Importer::create_sdk(tuta_credentials).await?;
+		let logged_in_sdk = Importer::create_sdk(config_directory, tuta_credentials).await?;
 		Importer::create_new_file_importer(
 			logged_in_sdk,
 			target_owner_group,

package/src/test_utils.rs

@@ -3,6 +3,7 @@ use crate::importer::Importer;
 use std::fs;
 use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
+use tutasdk::bindings::test_file_client::TestFileClient;
 use tutasdk::entities::generated::tutanota::MailFolder;
 use tutasdk::folder_system::MailSetKind;
 use tutasdk::net::native_rest_client::NativeRestClient;
@@ -48,6 +49,7 @@ pub async fn init_file_importer(source_paths: Vec<&str>) -> Importer {
 	let logged_in_sdk = Sdk::new(
 		"http://localhost:9000".to_string(),
 		Arc::new(NativeRestClient::try_new().unwrap()),
+		Arc::new(TestFileClient::default()),
 	)
 	.create_session(IMPORTED_MAIL_ADDRESS, IMPORTED_MAIL_ADDRESS_PASSKEY)
 	.await

package/tests/resources/testmail/brokendate.eml

@@ -0,0 +1,9 @@
+Content-Type: text/plain; charset=iso-8859-1; format=flowed
+Content-Transfer-Encoding: 8bit
+To: sorry@noemail.eu
+From: noreply@noemail.eu
+Date: Fri, Dec 14 2001 16:05:48 -0800
+MIME-Version: 1.0
+Subject: Broken date 
+
+This mail contains a date header that doesn't conform to the standard.