Browse Source

ENGINE-895: binary-labelled ascii attachments with lines longer than 998 characters will now be base64 encoded in spite of this. (But try to use the right mime-type please)

pull/14/head
Krista Bennett 9 months ago
parent
commit
417459a43b
3 changed files with 375 additions and 2 deletions
  1. +29
    -2
      src/etpan_mime.c
  2. +344
    -0
      test/src/AsciiBinaryAtt998Test.cc
  3. +2
    -0
      test/test_files/randatt.txt

+ 29
- 2
src/etpan_mime.c View File

@ -22,6 +22,28 @@
#define MAX_MESSAGE_ID 128
#define MAX_IMF_LINE_LEN 998
static bool ascii_exceeds_line_length(const char* data, size_t size) {
const char* curr_pos = data;
const char* last_pos = data;
const char* end_pos = data + size;
const char* crlf = "\r\n";
while ((curr_pos + MAX_IMF_LINE_LEN) < end_pos) {
last_pos = curr_pos;
curr_pos = strnstr(curr_pos, crlf, end_pos - curr_pos);
if (!curr_pos)
return true;
if (curr_pos - last_pos > MAX_IMF_LINE_LEN)
return true;
curr_pos += 2;
}
return false;
}
/**
* @internal
*
@ -31,6 +53,7 @@
*
*
*/
static char * generate_boundary(void)
{
char id[MAX_MESSAGE_ID];
@ -385,6 +408,9 @@ struct mailmime * get_file_part(
encoding = NULL;
bool already_ascii = !(must_chunk_be_encoded(data, length, true));
// check to be sure, if it is already ascii, that line lengths aren't also
// exceeded. Otherwise, we should base64-encode anyway.
if (!is_nf_message_attachment && !already_ascii) {
encoding_type = MAILMIME_MECHANISM_BASE64;
@ -1051,8 +1077,9 @@ bool must_chunk_be_encoded(const void* value, size_t size, bool ignore_fws) {
}
}
cur_char_ptr++;
}
return false;
}
return ascii_exceeds_line_length(value, size);
}
#define TMP_TEMPLATE "pEp.XXXXXXXXXXXXXXXXXXXX"


+ 344
- 0
test/src/AsciiBinaryAtt998Test.cc View File

@ -0,0 +1,344 @@
#include <stdlib.h>
#include <string>
#include <cstring>
#include <iostream>
#include <fstream>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include "pEpEngine.h"
#include "test_util.h"
#include "TestConstants.h"
#include "Engine.h"
#include <gtest/gtest.h>
namespace {
//The fixture for AsciiBinary998Test
class AsciiBinary998Test : public ::testing::Test {
public:
Engine* engine;
PEP_SESSION session;
protected:
// You can remove any or all of the following functions if its body
// is empty.
AsciiBinary998Test() {
// You can do set-up work for each test here.
test_suite_name = ::testing::UnitTest::GetInstance()->current_test_info()->GTEST_SUITE_SYM();
test_name = ::testing::UnitTest::GetInstance()->current_test_info()->name();
test_path = get_main_test_home_dir() + "/" + test_suite_name + "/" + test_name;
}
~AsciiBinary998Test() override {
// You can do clean-up work that doesn't throw exceptions here.
}
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
void SetUp() override {
// Code here will be called immediately after the constructor (right
// before each test).
// Leave this empty if there are no files to copy to the home directory path
std::vector<std::pair<std::string, std::string>> init_files = std::vector<std::pair<std::string, std::string>>();
// Get a new test Engine.
engine = new Engine(test_path);
ASSERT_NE(engine, nullptr);
// Ok, let's initialize test directories etc.
engine->prep(NULL, NULL, NULL, init_files);
// Ok, try to start this bugger.
engine->start();
ASSERT_NE(engine->session, nullptr);
session = engine->session;
// Engine is up. Keep on truckin'
}
void TearDown() override {
// Code here will be called immediately after each test (right
// before the destructor).
engine->shut_down();
delete engine;
engine = NULL;
session = NULL;
}
private:
const char* test_suite_name;
const char* test_name;
string test_path;
// Objects declared here can be used by all tests in the AsciiBinary998Test suite.
};
} // namespace
TEST_F(AsciiBinary998Test, check_engine_895) {
PEP_STATUS status = PEP_STATUS_OK;
pEp_identity* alice = NULL;
status = set_up_preset(session, ALICE, true, true, true, true, true, &alice);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(alice, nullptr);
status = myself(session, alice);
char* alicename = strdup(alice->username);
pEp_identity* alice_is_bob = NULL;
status = set_up_preset(session, BOB, false, true, true, false, true, &alice_is_bob);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(alice_is_bob, nullptr);
alice_is_bob->user_id = strdup(alice->user_id);
alice_is_bob->me = true;
char* bob_key_copy = strdup(alice_is_bob->fpr);
pEp_identity* alice2 = new_identity(alice->address, NULL, alice->user_id, alice->username);
pEp_identity* bob = new_identity(alice_is_bob->address, NULL, alice_is_bob->user_id, alice_is_bob->username);
ASSERT_STRNE(alice->username, alice_is_bob->username);
char* bobname = strdup(alice_is_bob->username);
message* cheesy_message = new_message(PEP_dir_outgoing);
cheesy_message->from = alice2;
cheesy_message->to = new_identity_list(bob);
cheesy_message->shortmsg = strdup("This is from Alice, fools.");
cheesy_message->longmsg = strdup("I am totally not Bob. If I were Bob, I would not be sending messages to myself.");
int retval = 0;
#ifndef WIN32
struct stat fst;
retval = stat("test_files/randatt.txt", &fst);
#else
struct _stat fst;
retval = _stat("test_files/randatt.txt", &fst);
#endif
ASSERT_EQ(retval, 0);
size_t data_size = (size_t)(fst.st_size);
ASSERT_NE(data_size, 0);
char* data = (char*)calloc(1, data_size);
char* data_copy = (char*)calloc(1, data_size);
ifstream data_file("test_files/randatt.txt", ios::in | ios::binary);
data_file.read(data, data_size);
data_file.close();
memcpy(data_copy, data, data_size);
ASSERT_EQ(memcmp(data_copy, data, data_size), 0);
// First check encrypt and decrypt on their own
char* ctext = NULL;
size_t csize = 0;
stringlist_t* strlist = new_stringlist(alice->fpr);
stringlist_add(strlist, alice_is_bob->fpr);
status = encrypt_and_sign(session, strlist, data, data_size, &ctext, &csize);
ASSERT_OK;
free_stringlist(strlist);
strlist = NULL;
char* ptext = NULL;
size_t psize = 0;
status = decrypt_and_verify(session, ctext, csize, NULL, 0, &ptext, &psize, &strlist, NULL);
ASSERT_EQ(status, PEP_DECRYPTED_AND_VERIFIED);
ASSERT_EQ(memcmp(ptext, data, data_size), 0);
cheesy_message->attachments = new_bloblist(data, data_size, "application/octet-stream", "file://randatt.whatever");
message* enc_msg = NULL;
status = encrypt_message(session, cheesy_message, NULL, &enc_msg, PEP_enc_PGP_MIME, 0);
ASSERT_STREQ(enc_msg->from->username, alicename);
ASSERT_STREQ(enc_msg->to->ident->username, bobname);
message* dec_msg = NULL;
enc_msg->dir = PEP_dir_incoming;
stringlist_t* keylist = NULL;
PEP_rating rating;
PEP_decrypt_flags_t flags = 0;
status = decrypt_message(session, enc_msg, &dec_msg, &keylist, &rating, &flags);
ASSERT_OK;
ASSERT_EQ(memcmp(data_copy, dec_msg->attachments->value, data_size), 0);
ASSERT_EQ(data_size, dec_msg->attachments->size);
}
TEST_F(AsciiBinary998Test, check_increasing_attachment_size_mime_encode) {
PEP_STATUS status = PEP_STATUS_OK;
pEp_identity* alice = NULL;
status = set_up_preset(session, ALICE, true, true, true, true, true, &alice);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(alice, nullptr);
status = myself(session, alice);
char* alicename = strdup(alice->username);
pEp_identity* alice_is_bob = NULL;
status = set_up_preset(session, BOB, false, true, true, false, true, &alice_is_bob);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(alice_is_bob, nullptr);
alice_is_bob->user_id = strdup(alice->user_id);
alice_is_bob->me = true;
char* bob_key_copy = strdup(alice_is_bob->fpr);
pEp_identity* alice2 = new_identity(alice->address, NULL, alice->user_id, alice->username);
pEp_identity* bob = new_identity(alice_is_bob->address, NULL, alice_is_bob->user_id, alice_is_bob->username);
ASSERT_STRNE(alice->username, alice_is_bob->username);
char* bobname = strdup(alice_is_bob->username);
message* cheesy_message = new_message(PEP_dir_outgoing);
cheesy_message->from = alice2;
cheesy_message->to = new_identity_list(bob);
cheesy_message->shortmsg = strdup("This is from Alice, fools.");
cheesy_message->longmsg = strdup("I am totally not Bob. If I were Bob, I would not be sending messages to myself.");
string attachment_str = "";
for (int i = 0; i < 10000; i++) {
free_bloblist(cheesy_message->attachments);
cheesy_message->attachments = new_bloblist(strdup(attachment_str.c_str()), i, "application/octet-stream", "random.attachment");
char* encoded_msg = NULL;
mime_encode_message(cheesy_message, false, &encoded_msg, false);
message* decoded_msg = NULL;
mime_decode_message(encoded_msg, strlen(encoded_msg), &decoded_msg, NULL);
ASSERT_STREQ(decoded_msg->attachments->value, attachment_str.c_str());
attachment_str += 'A';
}
}
TEST_F(AsciiBinary998Test, check_997_strings_in_attachment) {
PEP_STATUS status = PEP_STATUS_OK;
pEp_identity* alice = NULL;
status = set_up_preset(session, ALICE, true, true, true, true, true, &alice);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(alice, nullptr);
status = myself(session, alice);
char* alicename = strdup(alice->username);
pEp_identity* alice_is_bob = NULL;
status = set_up_preset(session, BOB, false, true, true, false, true, &alice_is_bob);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(alice_is_bob, nullptr);
alice_is_bob->user_id = strdup(alice->user_id);
alice_is_bob->me = true;
char* bob_key_copy = strdup(alice_is_bob->fpr);
pEp_identity* alice2 = new_identity(alice->address, NULL, alice->user_id, alice->username);
pEp_identity* bob = new_identity(alice_is_bob->address, NULL, alice_is_bob->user_id, alice_is_bob->username);
ASSERT_STRNE(alice->username, alice_is_bob->username);
char* bobname = strdup(alice_is_bob->username);
message* cheesy_message = new_message(PEP_dir_outgoing);
cheesy_message->from = alice2;
cheesy_message->to = new_identity_list(bob);
cheesy_message->shortmsg = strdup("This is from Alice, fools.");
cheesy_message->longmsg = strdup("I am totally not Bob. If I were Bob, I would not be sending messages to myself.");
string attachment_str = "";
// Make a bunch of 997 character strings
string copy_str = "";
for (int i = 0; i < 998; i++) {
copy_str += "A";
}
for (int i = 0; i < 10; i++)
attachment_str += copy_str + "\n";
free_bloblist(cheesy_message->attachments);
cheesy_message->attachments = new_bloblist(strdup(attachment_str.c_str()), attachment_str.size(), "application/octet-stream", "random.attachment");
char* encoded_msg = NULL;
mime_encode_message(cheesy_message, false, &encoded_msg, false);
cout << encoded_msg;
message* decoded_msg = NULL;
mime_decode_message(encoded_msg, strlen(encoded_msg), &decoded_msg, NULL);
ASSERT_STREQ(decoded_msg->attachments->value, attachment_str.c_str());
}
TEST_F(AsciiBinary998Test, check_big_plaintext_998) {
PEP_STATUS status = PEP_STATUS_OK;
pEp_identity* alice = NULL;
status = set_up_preset(session, ALICE, true, true, true, true, true, &alice);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(alice, nullptr);
status = myself(session, alice);
char* alicename = strdup(alice->username);
pEp_identity* alice_is_bob = NULL;
status = set_up_preset(session, BOB, false, true, true, false, true, &alice_is_bob);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(alice_is_bob, nullptr);
alice_is_bob->user_id = strdup(alice->user_id);
alice_is_bob->me = true;
char* bob_key_copy = strdup(alice_is_bob->fpr);
pEp_identity* alice2 = new_identity(alice->address, NULL, alice->user_id, alice->username);
pEp_identity* bob = new_identity(alice_is_bob->address, NULL, alice_is_bob->user_id, alice_is_bob->username);
ASSERT_STRNE(alice->username, alice_is_bob->username);
char* bobname = strdup(alice_is_bob->username);
message* cheesy_message = new_message(PEP_dir_outgoing);
cheesy_message->from = alice2;
cheesy_message->to = new_identity_list(bob);
cheesy_message->shortmsg = strdup("This is from Alice, fools.");
cheesy_message->longmsg = strdup("I am totally not Bob. If I were Bob, I would not be sending messages to myself.");
string longmsg_str = "";
for (int i = 0; i < 998; i++) {
longmsg_str += "K";
}
cheesy_message->longmsg = strdup(longmsg_str.c_str());
char* encoded_msg = NULL;
mime_encode_message(cheesy_message, false, &encoded_msg, false);
ASSERT_NE(strstr(encoded_msg, "Content-Transfer-Encoding: 7bit"), nullptr);
}
TEST_F(AsciiBinary998Test, check_big_plaintext_999) {
PEP_STATUS status = PEP_STATUS_OK;
pEp_identity* alice = NULL;
status = set_up_preset(session, ALICE, true, true, true, true, true, &alice);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(alice, nullptr);
status = myself(session, alice);
char* alicename = strdup(alice->username);
pEp_identity* alice_is_bob = NULL;
status = set_up_preset(session, BOB, false, true, true, false, true, &alice_is_bob);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(alice_is_bob, nullptr);
alice_is_bob->user_id = strdup(alice->user_id);
alice_is_bob->me = true;
char* bob_key_copy = strdup(alice_is_bob->fpr);
pEp_identity* alice2 = new_identity(alice->address, NULL, alice->user_id, alice->username);
pEp_identity* bob = new_identity(alice_is_bob->address, NULL, alice_is_bob->user_id, alice_is_bob->username);
ASSERT_STRNE(alice->username, alice_is_bob->username);
char* bobname = strdup(alice_is_bob->username);
message* cheesy_message = new_message(PEP_dir_outgoing);
cheesy_message->from = alice2;
cheesy_message->to = new_identity_list(bob);
cheesy_message->shortmsg = strdup("This is from Alice, fools.");
cheesy_message->longmsg = strdup("I am totally not Bob. If I were Bob, I would not be sending messages to myself.");
string longmsg_str = "";
for (int i = 0; i < 999; i++) {
longmsg_str += "K";
}
cheesy_message->longmsg = strdup(longmsg_str.c_str());
char* encoded_msg = NULL;
mime_encode_message(cheesy_message, false, &encoded_msg, false);
ASSERT_NE(strstr(encoded_msg, "Content-Transfer-Encoding: quoted-printable"), nullptr);
}

+ 2
- 0
test/test_files/randatt.txt View File

@ -0,0 +1,2 @@
35NcDyQ4CgMi7XnZn5anTbPdb7OoaxFOx05Divv6FCv5bta3KbIti1fQTq3TfDiHfeVgR1JUHMQ2aUbK4Suu5MxDD5N27BS4D5ywAEK0uaxErtUgKc26Jpbx3YHqebPj4h1Sk4hQWuSOdBfGYhQEqYFvXUkXARs0zuyIxXY3zmanwvuRxVtuzaTgBexJhbgJHjgDrHhtoB7ixDEjQ0CeIEGjmTAe773uRQRHRmvkT2PBN4oj0w41YFhy6h8zydAEOdbWI8kDrlfDgzDySAvjnWApPrHXZhQPqpjQ5BR23dTC6rUFrpK3ExCKMDXgunkE5HwinxKf8LYAdLqHT2rrSQIMViHR3l0XYGX5CmpQYCfMJ0uT5F8cKtcr8cbsZpUpCseLyEufHMp64yb7PNT47XFRR9dQQ0UULFK0w8EVUxZdewpoe9VHR9wA9ZHn1n1u3WgD2zwgL6n1VTRf5FtTpzqk0U8dqSJinhESDMsqcHBrNr5rmjmoea23iPk89tuMhYuIas1XIwj7tHPi8bFEVCfZPusCWdHysln0YjYFmiGKJzr2qtItVCkrCdDEsdbLnyVgbVHtwrU2xzDojzrVo1dgKsLrOzJLwVECUIuwSGmfAiMXLcx1pl4bAQw7MiVUaiZ7ZjentSTscHLGvNtRv52kKf79szgz6FntHGLjgPQ1VsljgNPXTTbRHootE9OEwfZhChu6Xk1kILwTzD8uh8woeP3uDOiF46givZC75DsVdf9JTfeODPHt0SwKO3WmlMoOyCQmkjAACLfrWpR7JfV6rdtjra5nkjNQm95g6YXoqUNACGYBKPJUBgbj1Gflq5o6XwCwAMgjlCIf4QpaBRO5M2zWjC9KDh5spz7TqXJQYNFnFCbHccDvAlPe9UOZaHy1Oi73sIEVTYnLCDsX6ezN920HcVyMpClFs0OFwXiN4v8EOMc7ZaWWH3cCtaXHzcP1MLSdDF7RscZH4jPDx4Gwpej3f7BFKhDvXQeDDcZI5l8G0Os1ATv3emSk
w6wUqX1PYJ39y3lOa9u9sgXNt2N8nQUVZPrxuDn859pW3zsXFQqUfU8mblu6bBPkgAg42181juUnU1fKsIXtU3e4SuVgtuL6mKNQUkXU5YQN15H7dtYLPrukL3lnRXpMIoScl3thBTTTgQFgzjtyGoysRDgibEp6b0Valjy2WgRDDWUtJNEELDuf6n3rX6tX2Bxnp9ojQ0fNwweprLhQFNrXz8LMaTjVdDaqwcHXz4QQTC9OaNsZuCIceQzRVT6JGSurA8Dmj5Bb52q6jLj7HID7pU7aDMSaSkn1I7Ta8vcMTuM82NnlCxnVKAChwsrIHsu4x7cLQWMpge169dT0JVr8Mrt0m6Jl2ouCDdv5A7q0OfAhwBiNgdAwdTHF

Loading…
Cancel
Save