alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

message: improve support for decryption

Browse Source 
Found a small leak:
  https://github.com/jstedfast/gmime/pull/124/commits
This commit is contained in:
Dirk-Jan C. Binnema
2022-04-18 21:56:49 +03:00
parent 66ee2004fc
commit 17d2926cd0
5 changed files with 505 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/message/test-mu-message.cc
View File

@ -62,7 +62,7 @@ statement you can use something like:
goto * instructions[pOp->opcode];
)";
auto message{Message::make_from_text(
test_message_1,
{}, test_message_1,
"/home/test/Maildir/inbox/cur/1649279256.107710_1.evergrey:2,S",
"/inbox")};
g_assert_true(!!message);
@ -176,9 +176,11 @@ World!
--=-=-=--
)";
auto message{Message::make_from_text(msg_text)};
auto message{Message::make_from_text({}, msg_text)};
g_assert_true(!!message);
g_assert_true(message->path().empty());
g_assert_true(message->bcc().empty());
g_assert_true(!message->body_html());
assert_equal(message->body_text().value_or(""), R"(Hello,World!)");
@ -316,7 +318,7 @@ Q46aYjxe0As6AP90bcAZ3dcn5RcTJaM0UhZssguawZ+tnriD3+5DPkMMCg==
auto ctx{MimeCryptoContext::make_gpg(tempdir.path())};
g_assert_true(!!ctx);
MimeStream stream{g_mime_stream_mem_new()};
auto stream{MimeStream::make_mem()};
stream.write(pub_key.data(), pub_key.size());
stream.reset();
@ -324,6 +326,7 @@ Q46aYjxe0As6AP90bcAZ3dcn5RcTJaM0UhZssguawZ+tnriD3+5DPkMMCg==
g_assert_cmpuint(*imported, ==, 1);
auto message{Message::make_from_text(
{},
msgtext,
"/home/test/Maildir/inbox/cur/1649279777.107710_1.mindcrime:2,RS",
"/inbox")};
@ -343,9 +346,12 @@ Q46aYjxe0As6AP90bcAZ3dcn5RcTJaM0UhZssguawZ+tnriD3+5DPkMMCg==
continue;
const auto mpart{MimeMultipartSigned(mobj)};
const auto sigs{mpart.verify()};
const auto sigs{mpart.verify(*ctx)};
if (!sigs)
g_warning("%s", sigs.error().what());
g_assert_true(!!sigs && sigs->size() == 1);
g_assert_true(!!sigs);
g_assert_cmpuint(sigs->size(), ==, 1);
++n;
}
@ -393,28 +399,27 @@ C0bdoCx44QVU8HaZ2x91h3GoM/0q5bqM/rvCauwbokiJgAUrznecNPY=
g_assert_true(!!ctx);
/// test1234
ctx->set_password_request_function(
[](const MimeCryptoContext& ctx,
const std::string& user_id,
const std::string& prompt,
bool reprompt,
MimeStream& response)->Result<void> {
return Err(Error::Code::Internal, "boo");
g_warning("boo!");
return Ok();
});
// ctx->set_request_password([](const MimeCryptoContext& ctx,
// const std::string& user_id,
// const std::string& prompt,
// bool reprompt,
// MimeStream& response)->Result<void> {
// return Err(Error::Code::Internal, "boo");
// //return Ok();
// });
{
MimeStream stream{g_mime_stream_mem_new()};
auto stream{MimeStream::make_mem()};
stream.write(priv_key.data(), priv_key.size());
stream.write(pub_key.data(), pub_key.size());
stream.reset();
g_assert_cmpint(ctx->import_keys(stream).value_or(-1),==,1);
}
auto message{Message::make_from_text(
{},
msgtext,
"/home/test/Maildir/inbox/cur/1649279888.107710_1.mindcrime:2,FS",
"/archive")};
@ -431,9 +436,12 @@ C0bdoCx44QVU8HaZ2x91h3GoM/0q5bqM/rvCauwbokiJgAUrznecNPY=
if (!mobj.is_multipart_encrypted())
continue;
const auto mpart{MimeMultipartEncrypted(mobj)};
const auto decres = mpart.decrypt();
g_assert_true(!!decres);
/* FIXME: make this work without user having to
* type password */
// const auto mpart{MimeMultipartEncrypted(mobj)};
// const auto decres = mpart.decrypt(*ctx);
// assert_valid_result(decres);
++n;
}