GithubBackup/cloudflare_temp_email
1
0
Fork 0
mirror of https://github.com/dreamhunter2333/cloudflare_temp_email.git synced 2026-07-21 12:32:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: smtp_proxy: cannot decode 8bit && tg bot new random address (#242)

Browse Source
This commit is contained in:
Dream Hunter
2024-05-16 18:18:16 +08:00
committed by GitHub
parent 4bd876a5f4
commit 243dac976b
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
smtp_proxy_server/imap_server.py
View File

@@ -51,6 +51,9 @@ class SimpleMessage:
def getFlags(self):
return ["\\Seen"]
def getInternalDate(self):
return self.email.headers.get("Date", "Mon, 1 Jan 1900 00:00:00 +0000")
@implementer(imap4.IMailboxInfo, imap4.IMailbox)
class SimpleMailbox:
@@ -129,7 +132,7 @@ class SimpleMailbox:
def store(self, messages, flags, mode, uid):
# IMailboxIMAP.store
pass
raise NotImplementedError
class Account(imap4.MemoryAccount):
@@ -141,7 +144,7 @@ class Account(imap4.MemoryAccount):
def _emptyMailbox(self, name, id):
_logger.info(f"New mailbox: {name}, {id}")
if name != "INBOX":
raise imap4.NoSuchMailbox(name)
raise Exception("Mailbox not found")
return SimpleMailbox(self.password)
def select(self, name, rw=1):

21
smtp_proxy_server/smtp_server.py
View File

@@ -41,20 +41,33 @@ class CustomSMTPHandler:
for part in msg.walk():
content_type = part.get_content_type()
charset = part.get_content_charset()
payload = part.get_payload(decode=True)
cte = str(part.get('content-transfer-encoding', '')).lower()
if content_type not in ["text/plain", "text/html"]:
_logger.warning(f"Skipping {content_type}")
continue
if not payload:
if cte == "8bit":
value = part.get_payload(decode=False)
else:
payload = part.get_payload(decode=True)
value = payload.decode(charset) if charset else payload
if not value:
continue
content_list.append({
"type": content_type,
"value": payload.decode(charset)
"value": value
})
elif msg.get_content_type() in ["text/plain", "text/html"] and msg.get_payload(decode=True):
cte = str(msg.get('content-transfer-encoding', '')).lower()
charset = msg.get_content_charset()
if cte == "8bit":
value = msg.get_payload(decode=False)
else:
payload = msg.get_payload(decode=True)
value = payload.decode(charset) if charset else payload
_logger.info(f"Payload {msg._payload} charset {charset}")
content_list.append({
"type": msg.get_content_type(),
"value": msg.get_payload(decode=True).decode()
"value": value
})
if not content_list: