filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Check if blob exists before exporting + Allow NILs in IMAP auth=plain text challenges (closes #462 #577)

Browse Source
This commit is contained in:
mdecimus
2024-07-03 15:33:11 +02:00
parent ec2cfc2fcd
commit af199e2b37
2 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
crates/cli/src/modules/export.rs
View File

@@ -82,34 +82,36 @@ impl ExportCommands {
let mut blob_path = path.clone();
blob_path.push(&blob_id);
futures.push(async move {
let mut retry_count = 0;
if tokio::fs::metadata(&blob_path).await.is_err() {
futures.push(async move {
let mut retry_count = 0;
let bytes = loop {
match client.download(&blob_id).await {
Ok(bytes) => break bytes,
Err(_) if retry_count < RETRY_ATTEMPTS => {
tokio::time::sleep(std::time::Duration::from_secs(1)).await;
retry_count += 1;
let bytes = loop {
match client.download(&blob_id).await {
Ok(bytes) => break bytes,
Err(_) if retry_count < RETRY_ATTEMPTS => {
tokio::time::sleep(std::time::Duration::from_secs(1)).await;
retry_count += 1;
}
result => {
result.unwrap_result("download blob");
return;
}
}
result => {
result.unwrap_result("download blob");
return;
}
}
};
};
tokio::fs::OpenOptions::new()
.create(true)
.write(true)
.truncate(true)
.open(&blob_path)
.await
.unwrap_result(&format!("open {}", blob_path.display()))
.write_all(&bytes)
.await
.unwrap_result(&format!("write {}", blob_path.display()));
});
tokio::fs::OpenOptions::new()
.create(true)
.write(true)
.truncate(true)
.open(&blob_path)
.await
.unwrap_result(&format!("open {}", blob_path.display()))
.write_all(&bytes)
.await
.unwrap_result(&format!("write {}", blob_path.display()));
});
}
if futures.len() == num_concurrent {
futures.next().await.unwrap();

12
crates/imap/src/op/authenticate.rs
View File

@@ -233,10 +233,14 @@ pub fn decode_challenge_plain(challenge: &[u8]) -> Result<Credentials<String>, &
let mut arg_num = 0;
for &ch in challenge {
if ch != 0 {
if arg_num == 1 {
username.push(ch);
} else if arg_num == 2 {
secret.push(ch);
match arg_num.cmp(&2) {
std::cmp::Ordering::Less => {
username.push(ch);
}
std::cmp::Ordering::Equal => {
secret.push(ch);
}
std::cmp::Ordering::Greater => (),
}
} else {
arg_num += 1;