Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-11 05:06:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other: stuff mostly passes but bodystructure parse is broken?

Browse Source
This commit is contained in:
James Houlahan
2021-05-31 12:56:55 +02:00
committed by Jakub Cuth
parent f6ff85f69d
commit f63238faed
2 changed files with 37 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/message/build_framework_test.go
View File

@ -133,7 +133,7 @@ func section(t *testing.T, b []byte, section ...int) *testSection {
bs, err := NewBodyStructure(bytes.NewReader(b)) bs, err := NewBodyStructure(bytes.NewReader(b))
require.NoError(t, err) require.NoError(t, err)
raw, err := bs.GetSection(bytes.NewReader(b), append([]int{}, section...)) raw, err := bs.GetSection(bytes.NewReader(b), section)
require.NoError(t, err) require.NoError(t, err)
return &testSection{ return &testSection{

84
pkg/message/build_test.go
View File

@ -209,7 +209,7 @@ func TestBuildSignedHTMLEncryptedMessage(t *testing.T) {
expectContentDispositionParam(`filename`, is(`OpenPGP_signature`)) expectContentDispositionParam(`filename`, is(`OpenPGP_signature`))
} }
func _TestBuildSignedPlainEncryptedMessageWithPubKey(t *testing.T) { func TestBuildSignedPlainEncryptedMessageWithPubKey(t *testing.T) {
m := gomock.NewController(t) m := gomock.NewController(t)
defer m.Finish() defer m.Finish()
@ -225,43 +225,40 @@ func _TestBuildSignedPlainEncryptedMessageWithPubKey(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
section(t, res). section(t, res).
expectContentType(is(`multipart/mixed`)). expectDate(is(`Wed, 01 Jan 2020 00:00:00 +0000`)).
expectDate(is(`Wed, 01 Jan 2020 00:00:00 +0000`))
section(t, res, 1).
expectContentType(is(`multipart/signed`)). expectContentType(is(`multipart/signed`)).
expectContentTypeParam(`micalg`, is(`pgp-sha256`)). expectContentTypeParam(`micalg`, is(`pgp-sha256`)).
expectContentTypeParam(`protocol`, is(`application/pgp-signature`)) expectContentTypeParam(`protocol`, is(`application/pgp-signature`))
section(t, res, 1, 1). section(t, res, 1).
expectContentType(is(`multipart/mixed`)). expectContentType(is(`multipart/mixed`)).
expectContentTypeParam(`protected-headers`, is(`v1`)). expectContentTypeParam(`protected-headers`, is(`v1`)).
expectHeader(`Subject`, is(`simple plaintext body`)). expectHeader(`Subject`, is(`simple plaintext body`)).
expectHeader(`From`, is(`"pm.bridge.qa" <pm.bridge.qa@gmail.com>`)). expectHeader(`From`, is(`"pm.bridge.qa" <pm.bridge.qa@gmail.com>`)).
expectHeader(`To`, is(`schizofrenic@pm.me`)). expectHeader(`To`, is(`schizofrenic@pm.me`)).
expectSection(verifiesAgainst(section(t, res, 1, 1, 1, 2).pubKey(), section(t, res, 1, 2).signature())) expectSection(verifiesAgainst(section(t, res, 1, 1, 2).pubKey(), section(t, res, 2).signature()))
section(t, res, 1, 1, 1). section(t, res, 1, 1).
expectContentType(is(`multipart/mixed`)) expectContentType(is(`multipart/mixed`))
section(t, res, 1, 1, 1, 1). section(t, res, 1, 1, 1).
expectContentType(is(`text/plain`)). expectContentType(is(`text/plain`)).
expectBody(contains(`Why don't crabs give to charity? Because they're shellfish.`)) expectBody(contains(`Why don't crabs give to charity? Because they're shellfish.`))
section(t, res, 1, 1, 1, 2). section(t, res, 1, 1, 2).
expectContentType(is(`application/pgp-keys`)). expectContentType(is(`application/pgp-keys`)).
expectContentTypeParam(`name`, is(`OpenPGP_0x161C0875822359F7.asc`)). expectContentTypeParam(`name`, is(`OpenPGP_0x161C0875822359F7.asc`)).
expectContentDisposition(is(`attachment`)). expectContentDisposition(is(`attachment`)).
expectContentDispositionParam(`filename`, is(`OpenPGP_0x161C0875822359F7.asc`)) expectContentDispositionParam(`filename`, is(`OpenPGP_0x161C0875822359F7.asc`))
section(t, res, 1, 2). section(t, res, 2).
expectContentType(is(`application/pgp-signature`)). expectContentType(is(`application/pgp-signature`)).
expectContentTypeParam(`name`, is(`OpenPGP_signature.asc`)). expectContentTypeParam(`name`, is(`OpenPGP_signature.asc`)).
expectContentDisposition(is(`attachment`)). expectContentDisposition(is(`attachment`)).
expectContentDispositionParam(`filename`, is(`OpenPGP_signature`)) expectContentDispositionParam(`filename`, is(`OpenPGP_signature`))
} }
func _TestBuildSignedHTMLEncryptedMessageWithPubKey(t *testing.T) { func TestBuildSignedHTMLEncryptedMessageWithPubKey(t *testing.T) {
m := gomock.NewController(t) m := gomock.NewController(t)
defer m.Finish() defer m.Finish()
@ -277,44 +274,41 @@ func _TestBuildSignedHTMLEncryptedMessageWithPubKey(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
section(t, res). section(t, res).
expectContentType(is(`multipart/mixed`)). expectDate(is(`Wed, 01 Jan 2020 00:00:00 +0000`)).
expectDate(is(`Wed, 01 Jan 2020 00:00:00 +0000`))
section(t, res, 1).
expectContentType(is(`multipart/signed`)). expectContentType(is(`multipart/signed`)).
expectContentTypeParam(`micalg`, is(`pgp-sha256`)). expectContentTypeParam(`micalg`, is(`pgp-sha256`)).
expectContentTypeParam(`protocol`, is(`application/pgp-signature`)) expectContentTypeParam(`protocol`, is(`application/pgp-signature`))
section(t, res, 1, 1). section(t, res, 1).
expectContentType(is(`multipart/mixed`)). expectContentType(is(`multipart/mixed`)).
expectContentTypeParam(`protected-headers`, is(`v1`)). expectContentTypeParam(`protected-headers`, is(`v1`)).
expectHeader(`Subject`, is(`simple html body`)). expectHeader(`Subject`, is(`simple html body`)).
expectHeader(`From`, is(`"pm.bridge.qa" <pm.bridge.qa@gmail.com>`)). expectHeader(`From`, is(`"pm.bridge.qa" <pm.bridge.qa@gmail.com>`)).
expectHeader(`To`, is(`schizofrenic@pm.me`)). expectHeader(`To`, is(`schizofrenic@pm.me`)).
expectSection(verifiesAgainst(section(t, res, 1, 1, 1, 2).pubKey(), section(t, res, 1, 2).signature())) expectSection(verifiesAgainst(section(t, res, 1, 1, 2).pubKey(), section(t, res, 2).signature()))
section(t, res, 1, 1, 1). section(t, res, 1, 1).
expectContentType(is(`multipart/mixed`)) expectContentType(is(`multipart/mixed`))
section(t, res, 1, 1, 1, 1). section(t, res, 1, 1, 1).
expectContentType(is(`text/html`)). expectContentType(is(`text/html`)).
expectBody(contains(`Do I enjoy making courthouse puns`)). expectBody(contains(`Do I enjoy making courthouse puns`)).
expectBody(contains(`Can February March`)) expectBody(contains(`Can February March`))
section(t, res, 1, 1, 1, 2). section(t, res, 1, 1, 2).
expectContentType(is(`application/pgp-keys`)). expectContentType(is(`application/pgp-keys`)).
expectContentTypeParam(`name`, is(`OpenPGP_0x161C0875822359F7.asc`)). expectContentTypeParam(`name`, is(`OpenPGP_0x161C0875822359F7.asc`)).
expectContentDisposition(is(`attachment`)). expectContentDisposition(is(`attachment`)).
expectContentDispositionParam(`filename`, is(`OpenPGP_0x161C0875822359F7.asc`)) expectContentDispositionParam(`filename`, is(`OpenPGP_0x161C0875822359F7.asc`))
section(t, res, 1, 2). section(t, res, 2).
expectContentType(is(`application/pgp-signature`)). expectContentType(is(`application/pgp-signature`)).
expectContentTypeParam(`name`, is(`OpenPGP_signature.asc`)). expectContentTypeParam(`name`, is(`OpenPGP_signature.asc`)).
expectContentDisposition(is(`attachment`)). expectContentDisposition(is(`attachment`)).
expectContentDispositionParam(`filename`, is(`OpenPGP_signature`)) expectContentDispositionParam(`filename`, is(`OpenPGP_signature`))
} }
func _TestBuildSignedMultipartAlternativeEncryptedMessageWithPubKey(t *testing.T) { func TestBuildSignedMultipartAlternativeEncryptedMessageWithPubKey(t *testing.T) {
m := gomock.NewController(t) m := gomock.NewController(t)
defer m.Finish() defer m.Finish()
@ -330,60 +324,57 @@ func _TestBuildSignedMultipartAlternativeEncryptedMessageWithPubKey(t *testing.T
require.NoError(t, err) require.NoError(t, err)
section(t, res). section(t, res).
expectContentType(is(`multipart/mixed`)). expectDate(is(`Wed, 01 Jan 2020 00:00:00 +0000`)).
expectDate(is(`Wed, 01 Jan 2020 00:00:00 +0000`))
section(t, res, 1).
expectContentType(is(`multipart/signed`)). expectContentType(is(`multipart/signed`)).
expectContentTypeParam(`micalg`, is(`pgp-sha256`)). expectContentTypeParam(`micalg`, is(`pgp-sha256`)).
expectContentTypeParam(`protocol`, is(`application/pgp-signature`)) expectContentTypeParam(`protocol`, is(`application/pgp-signature`))
section(t, res, 1, 1). section(t, res, 1).
expectContentType(is(`multipart/mixed`)). expectContentType(is(`multipart/mixed`)).
expectContentTypeParam(`protected-headers`, is(`v1`)). expectContentTypeParam(`protected-headers`, is(`v1`)).
expectHeader(`Subject`, is(`Alternative`)). expectHeader(`Subject`, is(`Alternative`)).
expectHeader(`From`, is(`"pm.bridge.qa" <pm.bridge.qa@gmail.com>`)). expectHeader(`From`, is(`"pm.bridge.qa" <pm.bridge.qa@gmail.com>`)).
expectHeader(`To`, is(`schizofrenic@pm.me`)). expectHeader(`To`, is(`schizofrenic@pm.me`)).
expectSection(verifiesAgainst(section(t, res, 1, 1, 1, 3).pubKey(), section(t, res, 1, 2).signature())) expectSection(verifiesAgainst(section(t, res, 1, 1, 3).pubKey(), section(t, res, 2).signature()))
section(t, res, 1, 1, 1). section(t, res, 1, 1).
expectContentType(is(`multipart/mixed`)) expectContentType(is(`multipart/mixed`))
section(t, res, 1, 1, 1, 1). section(t, res, 1, 1, 1).
expectContentType(is(`multipart/alternative`)) expectContentType(is(`multipart/alternative`))
section(t, res, 1, 1, 1, 1, 1). section(t, res, 1, 1, 1, 1).
expectContentType(is(`text/plain`)). expectContentType(is(`text/plain`)).
expectBody(contains(`This Rich formated text`)). expectBody(contains(`This Rich formated text`)).
expectBody(contains(`What kind of shoes do ninjas wear`)). expectBody(contains(`What kind of shoes do ninjas wear`)).
expectBody(contains(`How does a penguin build its house`)) expectBody(contains(`How does a penguin build its house`))
section(t, res, 1, 1, 1, 1, 2). section(t, res, 1, 1, 1, 2).
expectContentType(is(`text/html`)). expectContentType(is(`text/html`)).
expectBody(contains(`This <font color="#ee24cc">Rich</font> formated text`)). expectBody(contains(`This <font color="#ee24cc">Rich</font> formated text`)).
expectBody(contains(`What kind of shoes do ninjas wear`)). expectBody(contains(`What kind of shoes do ninjas wear`)).
expectBody(contains(`How does a penguin build its house`)) expectBody(contains(`How does a penguin build its house`))
section(t, res, 1, 1, 1, 2). section(t, res, 1, 1, 2).
expectContentType(is(`application/pdf`)). expectContentType(is(`application/pdf`)).
expectTransferEncoding(is(`base64`)). expectTransferEncoding(is(`base64`)).
expectContentTypeParam(`name`, is(`minimal.pdf`)). expectContentTypeParam(`name`, is(`minimal.pdf`)).
expectContentDispositionParam(`filename`, is(`minimal.pdf`)) expectContentDispositionParam(`filename`, is(`minimal.pdf`))
section(t, res, 1, 1, 1, 3). section(t, res, 1, 1, 3).
expectContentType(is(`application/pgp-keys`)). expectContentType(is(`application/pgp-keys`)).
expectContentTypeParam(`name`, is(`OpenPGP_0x161C0875822359F7.asc`)). expectContentTypeParam(`name`, is(`OpenPGP_0x161C0875822359F7.asc`)).
expectContentDisposition(is(`attachment`)). expectContentDisposition(is(`attachment`)).
expectContentDispositionParam(`filename`, is(`OpenPGP_0x161C0875822359F7.asc`)) expectContentDispositionParam(`filename`, is(`OpenPGP_0x161C0875822359F7.asc`))
section(t, res, 1, 2). section(t, res, 2).
expectContentType(is(`application/pgp-signature`)). expectContentType(is(`application/pgp-signature`)).
expectContentTypeParam(`name`, is(`OpenPGP_signature.asc`)). expectContentTypeParam(`name`, is(`OpenPGP_signature.asc`)).
expectContentDisposition(is(`attachment`)). expectContentDisposition(is(`attachment`)).
expectContentDispositionParam(`filename`, is(`OpenPGP_signature`)) expectContentDispositionParam(`filename`, is(`OpenPGP_signature`))
} }
func _TestBuildSignedEmbeddedMessageRFC822EncryptedMessageWithPubKey(t *testing.T) { func TestBuildSignedEmbeddedMessageRFC822EncryptedMessageWithPubKey(t *testing.T) {
m := gomock.NewController(t) m := gomock.NewController(t)
defer m.Finish() defer m.Finish()
@ -399,41 +390,38 @@ func _TestBuildSignedEmbeddedMessageRFC822EncryptedMessageWithPubKey(t *testing.
require.NoError(t, err) require.NoError(t, err)
section(t, res). section(t, res).
expectContentType(is(`multipart/mixed`)). expectDate(is(`Wed, 01 Jan 2020 00:00:00 +0000`)).
expectDate(is(`Wed, 01 Jan 2020 00:00:00 +0000`))
section(t, res, 1).
expectContentType(is(`multipart/signed`)). expectContentType(is(`multipart/signed`)).
expectContentTypeParam(`micalg`, is(`pgp-sha256`)). expectContentTypeParam(`micalg`, is(`pgp-sha256`)).
expectContentTypeParam(`protocol`, is(`application/pgp-signature`)) expectContentTypeParam(`protocol`, is(`application/pgp-signature`))
section(t, res, 1, 1). section(t, res, 1).
expectContentType(is(`multipart/mixed`)). expectContentType(is(`multipart/mixed`)).
expectContentTypeParam(`protected-headers`, is(`v1`)). expectContentTypeParam(`protected-headers`, is(`v1`)).
expectHeader(`Subject`, is(`Fwd: HTML with attachment external PGP`)). expectHeader(`Subject`, is(`Fwd: HTML with attachment external PGP`)).
expectHeader(`From`, is(`"pm.bridge.qa" <pm.bridge.qa@gmail.com>`)). expectHeader(`From`, is(`"pm.bridge.qa" <pm.bridge.qa@gmail.com>`)).
expectHeader(`To`, is(`schizofrenic@pm.me`)). expectHeader(`To`, is(`schizofrenic@pm.me`)).
expectSection(verifiesAgainst(section(t, res, 1, 1, 1, 2).pubKey(), section(t, res, 1, 2).signature())) expectSection(verifiesAgainst(section(t, res, 1, 1, 2).pubKey(), section(t, res, 2).signature()))
section(t, res, 1, 1, 1). section(t, res, 1, 1).
expectContentType(is(`multipart/mixed`)) expectContentType(is(`multipart/mixed`))
section(t, res, 1, 1, 1, 1). section(t, res, 1, 1, 1).
expectContentType(is(`text/plain`)) expectContentType(is(`text/plain`))
section(t, res, 1, 1, 1, 2). section(t, res, 1, 1, 2).
expectContentType(is(`application/pgp-keys`)). expectContentType(is(`application/pgp-keys`)).
expectContentTypeParam(`name`, is(`OpenPGP_0x161C0875822359F7.asc`)). expectContentTypeParam(`name`, is(`OpenPGP_0x161C0875822359F7.asc`)).
expectContentDisposition(is(`attachment`)). expectContentDisposition(is(`attachment`)).
expectContentDispositionParam(`filename`, is(`OpenPGP_0x161C0875822359F7.asc`)) expectContentDispositionParam(`filename`, is(`OpenPGP_0x161C0875822359F7.asc`))
section(t, res, 1, 1, 1, 3). section(t, res, 1, 1, 3).
expectContentType(is(`message/rfc822`)). expectContentType(is(`message/rfc822`)).
expectContentTypeParam(`name`, is(`HTML with attachment external PGP.eml`)). expectContentTypeParam(`name`, is(`HTML with attachment external PGP.eml`)).
expectContentDisposition(is(`attachment`)). expectContentDisposition(is(`attachment`)).
expectContentDispositionParam(`filename`, is(`HTML with attachment external PGP.eml`)) expectContentDispositionParam(`filename`, is(`HTML with attachment external PGP.eml`))
section(t, res, 1, 2). section(t, res, 2).
expectContentType(is(`application/pgp-signature`)). expectContentType(is(`application/pgp-signature`)).
expectContentTypeParam(`name`, is(`OpenPGP_signature.asc`)). expectContentTypeParam(`name`, is(`OpenPGP_signature.asc`)).
expectContentDisposition(is(`attachment`)). expectContentDisposition(is(`attachment`)).