Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 01:16:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make try_decrypt non-async

Browse Source 
Private keyring is now loaded outside of try_decrypt
This commit is contained in:
link2xt
2022-12-24 10:41:22 +00:00
parent 93054ef87c
commit e328de5293
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/decrypt.rs
View File

@@ -2,7 +2,7 @@
use std::collections::HashSet; use std::collections::HashSet;
use anyhow::{Context as _, Result}; use anyhow::Result;
use mailparse::ParsedMail; use mailparse::ParsedMail;
use crate::aheader::Aheader; use crate::aheader::Aheader;
@@ -24,9 +24,10 @@ use crate::pgp;
/// signature fingerprints and whether the message is encrypted. /// signature fingerprints and whether the message is encrypted.
/// ///
/// If the message is wrongly signed, HashSet will be empty. /// If the message is wrongly signed, HashSet will be empty.
pub async fn try_decrypt( pub fn try_decrypt(
context: &Context, context: &Context,
mail: &ParsedMail<'_>, mail: &ParsedMail<'_>,
private_keyring: &Keyring<SignedSecretKey>,
decryption_info: &DecryptionInfo, decryption_info: &DecryptionInfo,
) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>, bool)>> { ) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>, bool)>> {
// Possibly perform decryption // Possibly perform decryption
@@ -45,13 +46,10 @@ pub async fn try_decrypt(
Some(res) => res, Some(res) => res,
}; };
info!(context, "Detected Autocrypt-mime message"); info!(context, "Detected Autocrypt-mime message");
let private_keyring: Keyring<SignedSecretKey> = Keyring::new_self(context)
.await
.context("failed to get own keyring")?;
Ok(decrypt_part( Ok(decrypt_part(
encrypted_data_part, encrypted_data_part,
&private_keyring, private_keyring,
public_keyring_for_validate, public_keyring_for_validate,
)? )?
.map(|(raw, fprints)| (raw, fprints, true))) .map(|(raw, fprints)| (raw, fprints, true)))

8
src/mimeparser.rs
View File

@@ -23,7 +23,8 @@ use crate::dehtml::dehtml;
use crate::events::EventType; use crate::events::EventType;
use crate::format_flowed::unformat_flowed; use crate::format_flowed::unformat_flowed;
use crate::headerdef::{HeaderDef, HeaderDefMap}; use crate::headerdef::{HeaderDef, HeaderDefMap};
use crate::key::{DcKey, Fingerprint, SignedPublicKey}; use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
use crate::keyring::Keyring;
use crate::message::{self, Viewtype}; use crate::message::{self, Viewtype};
use crate::param::{Param, Params}; use crate::param::{Param, Params};
use crate::peerstate::Peerstate; use crate::peerstate::Peerstate;
@@ -220,6 +221,9 @@ impl MimeMessage {
headers.remove("chat-verified"); headers.remove("chat-verified");
let from = from.context("No from in message")?; let from = from.context("No from in message")?;
let private_keyring: Keyring<SignedSecretKey> = Keyring::new_self(context)
.await
.context("failed to get own keyring")?;
let mut decryption_info = let mut decryption_info =
prepare_decryption(context, &mail, &from.addr, message_time).await?; prepare_decryption(context, &mail, &from.addr, message_time).await?;
@@ -231,7 +235,7 @@ impl MimeMessage {
hop_info += &decryption_info.dkim_results.to_string(); hop_info += &decryption_info.dkim_results.to_string();
let (mail, mut signatures, encrypted) = let (mail, mut signatures, encrypted) =
match try_decrypt(context, &mail, &decryption_info).await { match try_decrypt(context, &mail, &private_keyring, &decryption_info) {
Ok(Some((raw, signatures, encrypted))) => { Ok(Some((raw, signatures, encrypted))) => {
// Only if `encrypted` and `signatures` set is non-empty, it is a valid // Only if `encrypted` and `signatures` set is non-empty, it is a valid
// autocrypt message. // autocrypt message.