Skip to content

filtermail: do not allow ASCII armor without actual payload#325

Merged
link2xt merged 1 commit intomainfrom
link2xt/filtermail-require-payload
Jul 3, 2024
Merged

filtermail: do not allow ASCII armor without actual payload#325
link2xt merged 1 commit intomainfrom
link2xt/filtermail-require-payload

Conversation

@link2xt
Copy link
Copy Markdown
Contributor

@link2xt link2xt commented Jun 19, 2024

Last line is removed as "optional checksum",
so it can contain anything.
Make sure that there is at least some actual payload besides this line.

@link2xt link2xt force-pushed the link2xt/filtermail-require-payload branch from 4c71ada to ace59cf Compare June 19, 2024 08:07
@missytake missytake force-pushed the link2xt/filtermail-require-payload branch from ace59cf to c3b4ecb Compare June 19, 2024 12:55
Comment on lines +179 to +185
payload = """-----BEGIN PGP MESSAGE-----\r
\r
=njUN
-----END PGP MESSAGE-----\r
\r
"""
assert check_armored_payload(payload) == False
Copy link
Copy Markdown
Contributor

@missytake missytake Jun 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about this?

-----BEGIN PGP MESSAGE-----\r
\r
-----END PGP MESSAGE-----\r

or this?

-----BEGIN PGP MESSAGE-----\r
-----END PGP MESSAGE-----\r

Copy link
Copy Markdown
Contributor

@hpk42 hpk42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changelog would be nice but also it's minor.

Last line is removed as "optional checksum",
so it can contain anything.
Make sure that there is at least some actual payload
besides this line.
@link2xt link2xt force-pushed the link2xt/filtermail-require-payload branch from c3b4ecb to f3e10cb Compare July 3, 2024 19:21
@link2xt link2xt merged commit e948bda into main Jul 3, 2024
@link2xt link2xt deleted the link2xt/filtermail-require-payload branch July 3, 2024 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants