mirror of
https://github.com/usmannasir/cyberpanel.git
synced 2026-03-09 22:00:14 +01:00
6085364c98
- Use correct Dovecot namespace (separator='.', prefix='INBOX.'): folders are INBOX.Sent, INBOX.Drafts, INBOX.Deleted Items, etc. - Quote IMAP folder names with spaces (e.g. "INBOX.Deleted Items") - Add display_name and folder_type to folder list API response - Fix SMTP for SSO: use local relay on port 25 (permit_mynetworks) since Dovecot has no auth_master_user_separator for port 587 - Fix Sieve SASL PLAIN auth to use clean RFC 4616 format - Handle ManageSieve unavailability gracefully with helpful logging - Update frontend to show clean folder names and correct icons - Auto-prefix new folder names with INBOX. namespace
77 lines
3.0 KiB
Python
77 lines
3.0 KiB
Python
import smtplib
|
|
import ssl
|
|
|
|
|
|
class SMTPClient:
|
|
"""Wrapper around smtplib.SMTP for sending mail via Postfix.
|
|
|
|
Supports two modes:
|
|
1. Authenticated (port 587 + STARTTLS) — for standalone login sessions
|
|
2. Local relay (port 25, no auth) — for SSO sessions using master user
|
|
Postfix accepts relay from localhost (permit_mynetworks in main.cf)
|
|
"""
|
|
|
|
def __init__(self, email_address, password, host='localhost', port=587,
|
|
use_local_relay=False):
|
|
self.email_address = email_address
|
|
self.password = password
|
|
self.host = host
|
|
self.port = port
|
|
self.use_local_relay = use_local_relay
|
|
|
|
def send_message(self, mime_message):
|
|
"""Send a composed email via SMTP.
|
|
|
|
Returns:
|
|
dict: {success: bool, message_id: str or None, error: str or None}
|
|
"""
|
|
try:
|
|
if self.use_local_relay:
|
|
# SSO mode: send via port 25 without auth
|
|
# Postfix permits relay from localhost (permit_mynetworks)
|
|
smtp = smtplib.SMTP(self.host, 25)
|
|
smtp.ehlo()
|
|
smtp.send_message(mime_message)
|
|
smtp.quit()
|
|
else:
|
|
# Standalone mode: authenticated via port 587 + STARTTLS
|
|
ctx = ssl.create_default_context()
|
|
ctx.check_hostname = False
|
|
ctx.verify_mode = ssl.CERT_NONE
|
|
|
|
smtp = smtplib.SMTP(self.host, self.port)
|
|
smtp.ehlo()
|
|
smtp.starttls(context=ctx)
|
|
smtp.ehlo()
|
|
smtp.login(self.email_address, self.password)
|
|
smtp.send_message(mime_message)
|
|
smtp.quit()
|
|
|
|
message_id = mime_message.get('Message-ID', '')
|
|
return {'success': True, 'message_id': message_id}
|
|
except smtplib.SMTPAuthenticationError as e:
|
|
return {'success': False, 'message_id': None, 'error': 'Authentication failed: %s' % str(e)}
|
|
except smtplib.SMTPRecipientsRefused as e:
|
|
return {'success': False, 'message_id': None, 'error': 'Recipients refused: %s' % str(e)}
|
|
except Exception as e:
|
|
return {'success': False, 'message_id': None, 'error': str(e)}
|
|
|
|
def save_to_sent(self, imap_client, raw_message):
|
|
"""Append sent message to the Sent folder via IMAP.
|
|
|
|
CyberPanel's Dovecot uses INBOX.Sent as the Sent folder.
|
|
"""
|
|
# Try CyberPanel's actual folder name first, then fallbacks
|
|
sent_folders = ['INBOX.Sent', 'Sent', 'Sent Messages', 'Sent Items']
|
|
for folder in sent_folders:
|
|
try:
|
|
if imap_client.append_message(folder, raw_message, '\\Seen'):
|
|
return True
|
|
except Exception:
|
|
continue
|
|
try:
|
|
imap_client.create_folder('INBOX.Sent')
|
|
return imap_client.append_message('INBOX.Sent', raw_message, '\\Seen')
|
|
except Exception:
|
|
return False
|