fix: fetch() selects message body by structure, not length (v0.1.3)
select the literal payload by isinstance bytearray instead of len>20. aioimaplib stores the message body as the only bytearray in the response; every other line (including the '<id> FETCH (...' header) is plain bytes. the length heuristic matched the header line first for any 2+ digit message id or BODY[]/UID fetch, returning a blank Message and silently breaking OTP retrieval on real mailboxes. Signed-off-by: disqualifier <dev@disqualifier.me>
This commit is contained in:
parent
a4abe354eb
commit
d97ce706b4
@ -11,16 +11,16 @@ This reads codes from email; it does not generate them (that is `pyotp`'s job).
|
|||||||
`requirements.txt`:
|
`requirements.txt`:
|
||||||
|
|
||||||
```
|
```
|
||||||
aiomail @ git+ssh://git@git.rethinkstudios.io/rethink-public/aiomail.git@v0.1.2
|
aiomail @ git+ssh://git@git.rethinkstudios.io/rethink-public/aiomail.git@v0.1.3
|
||||||
# OAuth token providers (Microsoft / Google) need the extra:
|
# OAuth token providers (Microsoft / Google) need the extra:
|
||||||
aiomail[oauth] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aiomail.git@v0.1.2
|
aiomail[oauth] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aiomail.git@v0.1.3
|
||||||
```
|
```
|
||||||
|
|
||||||
Direct:
|
Direct:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
pip install "aiomail @ git+ssh://git@git.rethinkstudios.io/rethink-public/aiomail.git@v0.1.2"
|
pip install "aiomail @ git+ssh://git@git.rethinkstudios.io/rethink-public/aiomail.git@v0.1.3"
|
||||||
pip install "aiomail[oauth] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aiomail.git@v0.1.2"
|
pip install "aiomail[oauth] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aiomail.git@v0.1.3"
|
||||||
```
|
```
|
||||||
|
|
||||||
Requires `aioimaplib` and `beautifulsoup4` (pulled transitively). The `oauth`
|
Requires `aioimaplib` and `beautifulsoup4` (pulled transitively). The `oauth`
|
||||||
|
|||||||
@ -4,7 +4,7 @@ build-backend = "hatchling.build"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "aiomail"
|
name = "aiomail"
|
||||||
version = "0.1.2"
|
version = "0.1.3"
|
||||||
description = "async IMAP one-time-code retrieval with password/OAuth2 auth and dynamic matching"
|
description = "async IMAP one-time-code retrieval with password/OAuth2 auth and dynamic matching"
|
||||||
requires-python = ">=3.10"
|
requires-python = ">=3.10"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
|||||||
@ -29,4 +29,4 @@ __all__ = [
|
|||||||
"DEFAULT_FOLDERS",
|
"DEFAULT_FOLDERS",
|
||||||
]
|
]
|
||||||
|
|
||||||
__version__ = "0.1.2"
|
__version__ = "0.1.3"
|
||||||
|
|||||||
@ -169,7 +169,11 @@ class IMAPClient:
|
|||||||
if result != "OK" or not data:
|
if result != "OK" or not data:
|
||||||
return None
|
return None
|
||||||
for item in data:
|
for item in data:
|
||||||
if isinstance(item, (bytes, bytearray)) and len(item) > 20:
|
# aioimaplib stores the literal message payload as the only bytearray in
|
||||||
|
# the response; every other line (including the `<id> FETCH (...` header)
|
||||||
|
# is plain bytes. select by structure, not length — a length heuristic
|
||||||
|
# mismatches the header line for any 2+ digit id or a BODY[]/UID fetch.
|
||||||
|
if isinstance(item, bytearray):
|
||||||
return email.message_from_bytes(bytes(item))
|
return email.message_from_bytes(bytes(item))
|
||||||
if isinstance(item, tuple) and len(item) > 1:
|
if isinstance(item, tuple) and len(item) > 1:
|
||||||
return email.message_from_bytes(item[1])
|
return email.message_from_bytes(item[1])
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user