aknuth
/
email-amazon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: aknuth:6fccc0b2f97d2b81b2eadc1d6fda8c8b3c54ee80
Branches Tags
aknuth:main
aknuth:contabo
..
compare: aknuth:38fcf8c4d8af3c7303ac0d13d223eebf103b6545
Branches Tags
aknuth:contabo
aknuth:main

No commits in common. "6fccc0b2f97d2b81b2eadc1d6fda8c8b3c54ee80" and "38fcf8c4d8af3c7303ac0d13d223eebf103b6545" have entirely different histories.
6fccc0b2f9 ... 38fcf8c4d8

1 changed files with 17 additions and 88 deletions
Show Stats Expand all files Collapse all files

105
email-worker/email_processing/rules_processor.py
View File

@ -77,8 +77,7 @@ class RulesProcessor:
forwards, forwards,
domain, domain,
worker_name, worker_name,
metrics_callback, metrics_callback
rule=rule
) )
def _handle_ooo( def _handle_ooo(
@ -142,104 +141,34 @@ class RulesProcessor:
forwards: list, forwards: list,
domain: str, domain: str,
worker_name: str, worker_name: str,
metrics_callback=None, metrics_callback=None
rule: dict = None # NEU
): ):
"""Handle email forwarding""" """Handle email forwarding"""
# NEU: SMTP Override aus Rule lesen
smtp_override = None
if rule:
smtp_override = rule.get('forward_smtp_override')
for forward_to in forwards: for forward_to in forwards:
try: try:
fwd_msg = self._create_forward_message( fwd_msg = self._create_forward_message(parsed, recipient, forward_to, original_from)
parsed, recipient, forward_to, original_from
)
fwd_bytes = fwd_msg.as_bytes() fwd_bytes = fwd_msg.as_bytes()
# NEU: Legacy SMTP Override (Migration) # Distinguish: Internal (Port 2525) vs External (SES)
if smtp_override: if is_internal_address(forward_to):
success = self._send_via_legacy_smtp( # Internal address → direct via Port 2525 (no loop!)
recipient, forward_to, fwd_bytes, success = self._send_internal_email(recipient, forward_to, fwd_bytes, worker_name)
smtp_override, worker_name
)
if success: if success:
log(f"✓ Forwarded via legacy SMTP to {forward_to} " log(f"✓ Forwarded internally to {forward_to}", 'SUCCESS', worker_name)
f"({smtp_override.get('host', '?')})",
'SUCCESS', worker_name)
else: else:
log(f"⚠ Legacy SMTP forward failed to {forward_to}", log(f"⚠ Internal forward failed to {forward_to}", 'WARNING', worker_name)
'WARNING', worker_name)
elif is_internal_address(forward_to):
success = self._send_internal_email(
recipient, forward_to, fwd_bytes, worker_name
)
if success:
log(f"✓ Forwarded internally to {forward_to}",
'SUCCESS', worker_name)
else:
log(f"⚠ Internal forward failed to {forward_to}",
'WARNING', worker_name)
else: else:
success = self.ses.send_raw_email( # External address → via SES
recipient, forward_to, fwd_bytes, worker_name success = self.ses.send_raw_email(recipient, forward_to, fwd_bytes, worker_name)
)
if success: if success:
log(f"✓ Forwarded externally to {forward_to} via SES", log(f"✓ Forwarded externally to {forward_to} via SES", 'SUCCESS', worker_name)
'SUCCESS', worker_name)
if metrics_callback: if metrics_callback:
metrics_callback('forward', domain) metrics_callback('forward', domain)
except Exception as e: except Exception as e:
log(f"⚠ Forward failed to {forward_to}: {e}", log(f"⚠ Forward failed to {forward_to}: {e}", 'ERROR', worker_name)
'ERROR', worker_name)
@staticmethod
def _send_via_legacy_smtp(
from_addr: str,
to_addr: str,
raw_message: bytes,
smtp_config: dict,
worker_name: str
) -> bool:
"""
Send email directly to a legacy SMTP server (for migration).
Bypasses SES completely to avoid mail loops.
"""
try:
host = smtp_config.get('host', '')
# DynamoDB speichert Zahlen als Decimal, daher int()
port = int(smtp_config.get('port', 25))
use_tls = smtp_config.get('tls', False)
username = smtp_config.get('username')
password = smtp_config.get('password')
if not host:
log(f" ✗ Legacy SMTP: no host configured", 'ERROR', worker_name)
return False
with smtplib.SMTP(host, port, timeout=30) as conn:
conn.ehlo()
if use_tls:
conn.starttls()
conn.ehlo()
if username and password:
conn.login(username, password)
conn.sendmail(from_addr, [to_addr], raw_message)
return True
except Exception as e:
log(
f" ✗ Legacy SMTP failed ({smtp_config.get('host', '?')}:"
f"{smtp_config.get('port', '?')}): {e}",
'ERROR', worker_name
)
return False
@staticmethod @staticmethod
def _send_internal_email(from_addr: str, to_addr: str, raw_message: bytes, worker_name: str) -> bool: def _send_internal_email(from_addr: str, to_addr: str, raw_message: bytes, worker_name: str) -> bool:
""" """