From 8f65068fd6112d6de75a1f70e5380b5234317aaf Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Tue, 28 Sep 2021 16:55:46 +0300 Subject: [PATCH 1/3] Added a quick fix to show only signed messages.| #1459 --- .../com/flowcrypt/email/security/pgp/PgpDecrypt.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpDecrypt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpDecrypt.kt index 1c4308b52f..eec2a07ee8 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpDecrypt.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpDecrypt.kt @@ -82,8 +82,10 @@ object PgpDecrypt { ) decryptionStream.use { it.copyTo(outStream) } - return DecryptionResult.withDecrypted( + return DecryptionResult( content = destOutputStream, + isEncrypted = decryptionStream.result.isEncrypted, + isSigned = decryptionStream.result.isSigned, filename = decryptionStream.result.fileName ) } catch (e: Exception) { @@ -171,6 +173,8 @@ object PgpDecrypt { // also false when error happens. val isEncrypted: Boolean = false, + val isSigned: Boolean = false, + // pgp messages may include original filename in them val filename: String? = null, @@ -184,10 +188,6 @@ object PgpDecrypt { fun withError(exception: DecryptionException): DecryptionResult { return DecryptionResult(exception = exception) } - - fun withDecrypted(content: ByteArrayOutputStream, filename: String?): DecryptionResult { - return DecryptionResult(content = content, isEncrypted = true, filename = filename) - } } } From 590313942ea509a0bb7c8e4b0de76c12c21af3ae Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Mon, 11 Oct 2021 19:00:57 +0300 Subject: [PATCH 2/3] Updated docker-mailserver to 0.0.11.| #1459 --- docker-mailserver/docker-compose.yml | 2 +- .../flowcrypt.test/default/dovecot.list.index | Bin 0 -> 784 bytes .../default/dovecot.list.index.log | Bin 7604 -> 40 bytes .../default/dovecot.list.index.log.2 | Bin 0 -> 8276 bytes .../INBOX/dbox-Mails/dovecot.index.cache | Bin 17736 -> 15620 bytes .../INBOX/dbox-Mails/dovecot.index.log | Bin 9312 -> 9944 bytes .../default/mailboxes/INBOX/dbox-Mails/u.26 | 41 ++++++++++++++++++ .../Sent/dbox-Mails/dovecot.index.cache | Bin 0 -> 404 bytes .../Sent/dbox-Mails/dovecot.index.log | Bin 368 -> 704 bytes .../default/mailboxes/Sent/dbox-Mails/u.1 | 32 ++++++++++++++ .../INBOX/dbox-Mails/dovecot.index.log | Bin 1236 -> 1252 bytes 11 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 docker-mailserver/maildata_source/flowcrypt.test/default/dovecot.list.index create mode 100644 docker-mailserver/maildata_source/flowcrypt.test/default/dovecot.list.index.log.2 create mode 100644 docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/INBOX/dbox-Mails/u.26 create mode 100644 docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/Sent/dbox-Mails/dovecot.index.cache create mode 100644 docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/Sent/dbox-Mails/u.1 diff --git a/docker-mailserver/docker-compose.yml b/docker-mailserver/docker-compose.yml index 5c81843000..cba6d4c63d 100644 --- a/docker-mailserver/docker-compose.yml +++ b/docker-mailserver/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mail: - image: flowcrypt/flowcrypt-email-server:0.0.10 + image: flowcrypt/flowcrypt-email-server:0.0.11 hostname: ${HOSTNAME} domainname: ${DOMAINNAME} container_name: ${CONTAINER_NAME} diff --git a/docker-mailserver/maildata_source/flowcrypt.test/default/dovecot.list.index b/docker-mailserver/maildata_source/flowcrypt.test/default/dovecot.list.index new file mode 100644 index 0000000000000000000000000000000000000000..0d21b5eed161b46fe660f30bec293133a2d87ac7 GIT binary patch literal 784 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 literal 0 HcmV?d00001 diff --git a/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/INBOX/dbox-Mails/dovecot.index.cache b/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/INBOX/dbox-Mails/dovecot.index.cache index 2bf317b31f4cc416304bb6bec536ea8302a0322b..042d8c08010afec569b727d06a2d9dfc21a3cac2 100644 GIT binary patch delta 3338 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 diff --git a/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/INBOX/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/INBOX/dbox-Mails/dovecot.index.log index 44f1f7a6c0bfb72e51253f6f7062af426e14839b..c6d3ba6d393e69b2182ce69d1abd79b3248d7e6c 100644 GIT binary patch delta 401 zcmZvYJxjx26osFfw0=uW>qjb@%QVPY44hjV^I5>(_bZ{*=w*f1Nh|B9waO~jV z;Oge+B4qRr2>K5^NfrkoFX!Bob1(PY&rW>s)UBFBuaqmBUZq|r1D!q7cWdp0e%TO3 z(VY*@5mlo8*=eGC|GXt>i{{7MZalnvi$mgE(9?vWuL(_TR{qpGsxLN8xYlwLtG%CE zuVBKlbLM_^Js+tnG(D?02tRJS@~FcmC)CUlV>k)-Qym^H$cx7X(8um1j0;E88Yy(< zKoXY@ObKHb^oypJoDmKcVOIF2ZDhr-s7H9?bHcm`8=xMJYfu!vZ)E|4x}vK-Z@{uJ iXk{m=wzDHRLAr2yge3H{`W4_>*G-R9Hm`+}CGi(5{5O06 delta 7 OcmccN`@myEf(if-F$01C diff --git a/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/INBOX/dbox-Mails/u.26 b/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/INBOX/dbox-Mails/u.26 new file mode 100644 index 0000000000..97c4466402 --- /dev/null +++ b/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/INBOX/dbox-Mails/u.26 @@ -0,0 +1,41 @@ +2 M1e C61645f5f +N 00000000000004CB +Return-Path: +Delivered-To: default@flowcrypt.test +Received: from mail.flowcrypt.test + by mail.flowcrypt.test with LMTP + id 4eX1NV9fZGEKBQAAc/RpdQ + (envelope-from ) + for ; Mon, 11 Oct 2021 15:59:27 +0000 +Received: from localhost (localhost [127.0.0.1]) + by mail.flowcrypt.test (Postfix) with ESMTP id D93A51C2074 + for ; Mon, 11 Oct 2021 15:59:27 +0000 (UTC) +Date: Mon, 11 Oct 2021 18:59:24 +0300 (GMT+03:00) +From: default@flowcrypt.test +To: default@flowcrypt.test +Message-ID: <163818563.5.1633967964807@flowcrypt.test> +Subject: SIGNED message. "gpg --sign --armor" +Mime-Version: 1.0 +Content-Type: multipart/mixed; + boundary="----=_Part_4_204938738.1633967964803" + +------=_Part_4_204938738.1633967964803 +Content-Type: text/plain; charset=us-ascii +Content-Transfer-Encoding: 7bit + +-----BEGIN PGP MESSAGE----- + +owGbwMvMwCGmFN+gfIiXM5zxtG4SQ2Iw74rgzPS81BSFktSKEoW0/CKFlNS0xNKc +Eoe0nPzy5KLKghK9ktTiEq6OXhYGMQ4GUzFFFtvXL7+VX9252+LpIheYcaxMQLMO +iMtg183AxSkAUynizshwbBMnx4e4tn6NgJYtG/od3HL1y26GvpgqUtr2o37HpC+v +GRmudmly/g+Osdt3t6Rb+8t8i8Y94ZJ3P/zNlk015FihXM0JAA== +=A8uF +-----END PGP MESSAGE----- + +------=_Part_4_204938738.1633967964803-- + + +R61645f5f +V4ec +Ga19408365f5f64610a05000073f46975 + diff --git a/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/Sent/dbox-Mails/dovecot.index.cache b/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/Sent/dbox-Mails/dovecot.index.cache new file mode 100644 index 0000000000000000000000000000000000000000..9dd608bea1a0719098515f5d89bd61f91b6c367d GIT binary patch literal 404 zcmbu5Jr2S!427M-z{n9eK^CsSJs@pNYpFkxlSV32N5st4I1f0q6;fB8Jd30yUJDuk#pPUoE+e$EH(i_kMp5w;QQ y&LOzY9d%E(o?OQk8A=JDp$4@x96aRI8XgvqceQWHISf!))+bqY-hKJsgYX9$9c?iH literal 0 HcmV?d00001 diff --git a/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/Sent/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/Sent/dbox-Mails/dovecot.index.log index b46203ec4a9a0a610ce43222179aec33222bd072..429a1d84b0590b1809bed5c8ccf3bea7aa95f45d 100644 GIT binary patch delta 346 zcmaKnF$%&^5JV?2ft3FUDLjBjNZ|=YZ9|BHc7kAGp&ty0;883*LXPAO^!@#&)GdBy zc4u}cue8sfyX5S>zet6vB!O>y-J611Wy+K&SKG9kH61jaM^o3UCJ5l>e?;7+%o1=B z`L%+Nz=J;Si+hynY~l_Fi+&zI?6=3^I41Kf*^1|0a$v5p{Hbli;eUnR!cGx^2{)4? iv6Zv8;BVs)K+9}>o delta 7 OcmX@W`hjUf0V4nn4g%Q# diff --git a/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/Sent/dbox-Mails/u.1 b/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/Sent/dbox-Mails/u.1 new file mode 100644 index 0000000000..3151729eab --- /dev/null +++ b/docker-mailserver/maildata_source/flowcrypt.test/default/mailboxes/Sent/dbox-Mails/u.1 @@ -0,0 +1,32 @@ +2 M1e C61645f5f +N 000000000000033D +Date: Mon, 11 Oct 2021 18:59:24 +0300 (GMT+03:00) +From: default@flowcrypt.test +To: default@flowcrypt.test +Message-ID: <163818563.5.1633967964807@flowcrypt.test> +Subject: SIGNED message. "gpg --sign --armor" +MIME-Version: 1.0 +Content-Type: multipart/mixed; + boundary="----=_Part_4_204938738.1633967964803" +User-Agent: FlowCrypt_Android_1.2.3_dev_123__2021_10_11 + +------=_Part_4_204938738.1633967964803 +Content-Type: text/plain; charset=us-ascii +Content-Transfer-Encoding: 7bit + +-----BEGIN PGP MESSAGE----- + +owGbwMvMwCGmFN+gfIiXM5zxtG4SQ2Iw74rgzPS81BSFktSKEoW0/CKFlNS0xNKc +Eoe0nPzy5KLKghK9ktTiEq6OXhYGMQ4GUzFFFtvXL7+VX9252+LpIheYcaxMQLMO +iMtg183AxSkAUynizshwbBMnx4e4tn6NgJYtG/od3HL1y26GvpgqUtr2o37HpC+v +GRmudmly/g+Osdt3t6Rb+8t8i8Y94ZJ3P/zNlk015FihXM0JAA== +=A8uF +-----END PGP MESSAGE----- + +------=_Part_4_204938738.1633967964803-- + + +R61645f5c +V355 +Ge010cd325f5f6461f204000073f46975 + diff --git a/docker-mailserver/maildata_source/flowcrypt.test/has_msgs_no_backups/mailboxes/INBOX/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/flowcrypt.test/has_msgs_no_backups/mailboxes/INBOX/dbox-Mails/dovecot.index.log index c2cb7fafd3e7f2def17fea58e9fdaf705098e73c..eecf140e3abc78e17add732fae772c11f449db23 100644 GIT binary patch delta 24 fcmcb@`Gj-B6&8VphK3de1_pru1{Maj_>@EdY^nz} delta 7 OcmaFDd4+Ss6&3&veFIYf From 68d50ae8116c956e4aaa7dc81f0d9d292d8766ee Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Mon, 11 Oct 2021 19:10:08 +0300 Subject: [PATCH 3/3] Added a test for a case "gpg: signed only but armored".| #1459 --- .../messages/info/signed_msg_armored.json | 46 +++++++++++++++++++ .../messages/mime/signed_msg_armored.txt | 33 +++++++++++++ .../ui/activity/MessageDetailsActivityTest.kt | 9 ++++ 3 files changed, 88 insertions(+) create mode 100644 FlowCrypt/src/androidTest/assets/messages/info/signed_msg_armored.json create mode 100644 FlowCrypt/src/androidTest/assets/messages/mime/signed_msg_armored.txt diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_armored.json b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_armored.json new file mode 100644 index 0000000000..a81e2f9b76 --- /dev/null +++ b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_armored.json @@ -0,0 +1,46 @@ +{ + "encryptionType": "STANDARD", + "msgBlocks": [ + { + "complete": true, + "content": " \u003c!DOCTYPE html\u003e\n \u003chtml\u003e\n \u003chead\u003e\n \u003cmeta name\u003d\"viewport\" content\u003d\"width\u003ddevice-width\"/\u003e\n \u003cstyle\u003e\n body { word-wrap: break-word; word-break: break-word; hyphens: auto; margin-left: 0px; padding-left: 0px; }\n body img { display: inline !important; height: auto !important; max-width: 95% !important; }\n body pre { white-space: pre-wrap !important; }\n body \u003e div.MsgBlock \u003e table { zoom: 75% } /* table layouts tend to overflow - eg emails from fb */\n \u003c/style\u003e\n \u003c/head\u003e\n \u003cbody\u003e\u003cdiv class\u003d\"MsgBlock GRAY\" style\u003d\"background: white;padding-left: 8px;min-height: 50px;padding-top: 4px;padding-bottom: 4px;width: 100%;border: 1px solid #f0f0f0;border-left: 8px solid #989898;border-right: none;\"\u003e\u003chtml\u003e\u003chead\u003e\u003c/head\u003e\u003cbody\u003eSigned text for default@flowcrypt.test\u003cbr\u003e\u003c/body\u003e\u003c/html\u003e\u003c/div\u003e\u003c!-- next MsgBlock --\u003e\n\u003c/body\u003e\n \u003c/html\u003e", + "type": "plainHtml" + } + ], + "msgEntity": { + "cc": [], + "email": "default@flowcrypt.test", + "flags": "\\SEEN", + "folder": "INBOX", + "from": [ + { + "address": "default@flowcrypt.test" + } + ], + "fromAddress": "default@flowcrypt.test", + "hasAttachments": false, + "id": 70, + "isNew": false, + "isSeen": true, + "msgState": "NONE", + "receivedDate": 1633967967000, + "replyTo": "default@flowcrypt.test", + "replyToAddress": [ + { + "address": "default@flowcrypt.test" + } + ], + "sentDate": 1633967964000, + "state": -1, + "subject": "SIGNED message. \"gpg --sign --armor\"", + "to": [ + { + "address": "default@flowcrypt.test" + } + ], + "toAddress": "default@flowcrypt.test", + "uid": 26, + "uidAsHEX": "1a" + }, + "text": "Signed text for default@flowcrypt.test" +} diff --git a/FlowCrypt/src/androidTest/assets/messages/mime/signed_msg_armored.txt b/FlowCrypt/src/androidTest/assets/messages/mime/signed_msg_armored.txt new file mode 100644 index 0000000000..93c6500434 --- /dev/null +++ b/FlowCrypt/src/androidTest/assets/messages/mime/signed_msg_armored.txt @@ -0,0 +1,33 @@ +Return-Path: +Delivered-To: default@flowcrypt.test +Received: from mail.flowcrypt.test + by mail.flowcrypt.test with LMTP + id 4eX1NV9fZGEKBQAAc/RpdQ + (envelope-from ) + for ; Mon, 11 Oct 2021 15:59:27 +0000 +Received: from localhost (localhost [127.0.0.1]) + by mail.flowcrypt.test (Postfix) with ESMTP id D93A51C2074 + for ; Mon, 11 Oct 2021 15:59:27 +0000 (UTC) +Date: Mon, 11 Oct 2021 18:59:24 +0300 (GMT+03:00) +From: default@flowcrypt.test +To: default@flowcrypt.test +Message-ID: <163818563.5.1633967964807@flowcrypt.test> +Subject: SIGNED message. "gpg --sign --armor" +Mime-Version: 1.0 +Content-Type: multipart/mixed; + boundary="----=_Part_4_204938738.1633967964803" + +------=_Part_4_204938738.1633967964803 +Content-Type: text/plain; charset=us-ascii +Content-Transfer-Encoding: 7bit + +-----BEGIN PGP MESSAGE----- + +owGbwMvMwCGmFN+gfIiXM5zxtG4SQ2Iw74rgzPS81BSFktSKEoW0/CKFlNS0xNKc +Eoe0nPzy5KLKghK9ktTiEq6OXhYGMQ4GUzFFFtvXL7+VX9252+LpIheYcaxMQLMO +iMtg183AxSkAUynizshwbBMnx4e4tn6NgJYtG/od3HL1y26GvpgqUtr2o37HpC+v +GRmudmly/g+Osdt3t6Rb+8t8i8Y94ZJ3P/zNlk015FihXM0JAA== +=A8uF +-----END PGP MESSAGE----- + +------=_Part_4_204938738.1633967964803-- diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt index 43bc70e63e..2dbbc90e0a 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt @@ -568,6 +568,15 @@ class MessageDetailsActivityTest : BaseMessageDetailsActivityTest() { matchReplyButtons(details) } + @Test + fun testSignedArmoredMsg() { + val msgInfo = getMsgInfo( + "messages/info/signed_msg_armored.json", + "messages/mime/signed_msg_armored.txt" + ) + baseCheck(msgInfo) + } + private fun testMissingKey(incomingMsgInfo: IncomingMessageInfo?) { assertThat(incomingMsgInfo, notNullValue())