Update app.py

app.py

@@ -10,6 +10,7 @@ import tempfile
 import smtplib
 from email.message import EmailMessage
 import mimetypes
+import dns.resolver
 
 from flask import Flask, render_template_string, request, redirect, url_for, flash, jsonify, session, Response
 from huggingface_hub import HfApi, hf_hub_download
@@ -20,7 +21,7 @@ import requests
 load_dotenv()
 
 app = Flask(__name__)
-app.secret_key = 'super_secret_key_mail_app_123'
+app.secret_key = 'super_secret_key_mail_app_123_direct_smtp'
 app.config.update(
     SESSION_COOKIE_SAMESITE='None',
     SESSION_COOKIE_SECURE=True,
@@ -176,12 +177,12 @@ def load_data():
             if 'organization_name' not in settings: settings['organization_name'] = f'Mail Client {env_id}'; changed = True
             if 'admin_password_enabled' not in settings: settings['admin_password_enabled'] = False; changed = True
             if 'admin_password' not in settings: settings['admin_password'] = ''; changed = True
-            if 'smtp_host' not in settings: settings['smtp_host'] = 'smtp.gmail.com'; changed = True
-            if 'smtp_port' not in settings: settings['smtp_port'] = 587; changed = True
             if 'smtp_user' not in settings: settings['smtp_user'] = ''; changed = True
-            if 'smtp_pass' not in settings: settings['smtp_pass'] = ''; changed = True
             if 'sender_name' not in settings: settings['sender_name'] = ''; changed = True
             if 'is_deleted' not in settings: settings['is_deleted'] = False; changed = True
+            if 'smtp_host' in settings: del settings['smtp_host']; changed = True
+            if 'smtp_port' in settings: del settings['smtp_port']; changed = True
+            if 'smtp_pass' in settings: del settings['smtp_pass']; changed = True
 
         if changed or not os.path.exists(DATA_FILE):
             try:
@@ -217,10 +218,7 @@ def get_env_data(env_id):
                 'organization_name': f'Mail Client {env_id}',
                 'admin_password_enabled': False,
                 'admin_password': '',
-                'smtp_host': 'smtp.gmail.com',
-                'smtp_port': 587,
                 'smtp_user': '',
-                'smtp_pass': '',
                 'sender_name': '',
                 'is_deleted': False
             }
@@ -243,13 +241,16 @@ def check_deleted_env():
         if env_id in all_data and all_data[env_id].get('settings', {}).get('is_deleted', False):
             return "<h1 style='text-align:center; margin-top:20vh; font-family:sans-serif;'>Клиент отключен</h1>", 403
 
-def send_email(settings, to_email, subject, body, files):
+def send_email_direct(settings, to_email, subject, body, files):
     msg = EmailMessage()
     msg['Subject'] = subject
     
     sender_name = settings.get('sender_name', '').strip()
     smtp_user = settings.get('smtp_user', '').strip()
     
+    if not smtp_user:
+        raise Exception("Email отправителя не настроен в админ панели.")
+    
     if sender_name:
         msg['From'] = f"{sender_name} <{smtp_user}>"
     else:
@@ -268,14 +269,22 @@ def send_email(settings, to_email, subject, body, files):
             msg.add_attachment(file_data, maintype=maintype, subtype=subtype, filename=f.filename)
             f.seek(0)
 
-    host = settings.get('smtp_host', '')
-    port = int(settings.get('smtp_port', 587))
-    password = settings.get('smtp_pass', '')
+    try:
+        domain = to_email.split('@')[1]
+        records = dns.resolver.resolve(domain, 'MX')
+        mx_record = sorted(records, key=lambda x: x.preference)[0].exchange.to_text()
+    except Exception as e:
+        raise Exception(f"Не удалось определить MX сервер для домена {to_email.split('@')[-1]}: {str(e)}")
 
-    with smtplib.SMTP(host, port) as server:
-        server.starttls()
-        server.login(smtp_user, password)
-        server.send_message(msg)
+    try:
+        with smtplib.SMTP(mx_record, 25, timeout=15) as server:
+            server.ehlo()
+            if server.has_extn('STARTTLS'):
+                server.starttls()
+                server.ehlo()
+            server.send_message(msg)
+    except Exception as e:
+        raise Exception(f"Ошибка при доставке письма на сервер {mx_record}: {str(e)}")
 
 LOGIN_TEMPLATE = '''
 <!DOCTYPE html>
@@ -448,7 +457,7 @@ ADMIN_TEMPLATE = '''
         .btn-success { background: var(--success); }
         .btn-danger { background: var(--danger); }
         .card { background: var(--surface); padding: 20px; border-radius: 16px; box-shadow: 0 4px 15px rgba(0,0,0,0.03); margin-bottom: 20px; }
-        input[type="text"], input[type="number"], input[type="password"] { width: 100%; padding: 16px 20px; border: 1px solid var(--border); border-radius: 12px; font-size: 16px; outline: none; transition: border-color 0.2s; background: #fafafa; box-sizing: border-box; }
+        input[type="email"], input[type="text"], input[type="password"] { width: 100%; padding: 16px 20px; border: 1px solid var(--border); border-radius: 12px; font-size: 16px; outline: none; transition: border-color 0.2s; background: #fafafa; box-sizing: border-box; }
         input:focus { border-color: var(--info); background: #fff; }
         .settings-row { display: flex; align-items: center; gap: 15px; flex-wrap: wrap; margin-bottom: 15px; }
         .settings-row label { flex: 1; min-width: 150px; font-weight: 600; font-size: 1.05rem; }
@@ -490,27 +499,15 @@ ADMIN_TEMPLATE = '''
                     <label>Название клиента:</label>
                     <input type="text" name="organization_name" value="{{ settings.organization_name }}" required>
                 </div>
-                <div class="settings-row">
-                    <label>Имя отправителя:</label>
-                    <input type="text" name="sender_name" value="{{ settings.sender_name }}" placeholder="Иван Иванов">
-                </div>
                 
-                <h2 style="margin-top:30px; margin-bottom:20px; font-size:1.2rem; color:var(--primary);"><i class="fas fa-server"></i> SMTP Сервер (Отправка писем)</h2>
-                <div class="settings-row">
-                    <label>SMTP Host:</label>
-                    <input type="text" name="smtp_host" value="{{ settings.smtp_host }}" required placeholder="smtp.gmail.com">
-                </div>
+                <h2 style="margin-top:30px; margin-bottom:20px; font-size:1.2rem; color:var(--primary);"><i class="fas fa-server"></i> Настройки отправителя (Встроенный SMTP)</h2>
                 <div class="settings-row">
-                    <label>SMTP Port:</label>
-                    <input type="number" name="smtp_port" value="{{ settings.smtp_port }}" required placeholder="587">
+                    <label>Email отправителя (от кого):</label>
+                    <input type="email" name="smtp_user" value="{{ settings.smtp_user }}" required placeholder="your@email.com">
                 </div>
                 <div class="settings-row">
-                    <label>Email (Логин):</label>
-                    <input type="text" name="smtp_user" value="{{ settings.smtp_user }}" required placeholder="your@email.com">
-                </div>
-                <div class="settings-row">
-                    <label>Пароль приложения:</label>
-                    <input type="password" name="smtp_pass" value="{{ settings.smtp_pass }}" placeholder="Пароль">
+                    <label>Имя отправителя:</label>
+                    <input type="text" name="sender_name" value="{{ settings.sender_name }}" placeholder="Иван Иванов">
                 </div>
                 
                 <h2 style="margin-top:30px; margin-bottom:20px; font-size:1.2rem; color:var(--primary);"><i class="fas fa-lock"></i> Безопасность</h2>
@@ -867,10 +864,7 @@ def create_environment():
             "organization_name": f"Mail Client {new_id}",
             "admin_password_enabled": False, 
             "admin_password": "",
-            "smtp_host": "smtp.gmail.com",
-            "smtp_port": 587,
             "smtp_user": "",
-            "smtp_pass": "",
             "sender_name": "",
             "is_deleted": False
         }
@@ -954,11 +948,7 @@ def admin(env_id):
         if request.form.get('action') == 'update_settings':
             settings['organization_name'] = request.form.get('organization_name', '').strip()
             settings['sender_name'] = request.form.get('sender_name', '').strip()
-            settings['smtp_host'] = request.form.get('smtp_host', '').strip()
-            settings['smtp_port'] = int(request.form.get('smtp_port', 587))
             settings['smtp_user'] = request.form.get('smtp_user', '').strip()
-            if request.form.get('smtp_pass'):
-                settings['smtp_pass'] = request.form.get('smtp_pass', '').strip()
             
             settings['admin_password_enabled'] = 'admin_password_enabled' in request.form
             settings['admin_password'] = request.form.get('admin_password', '').strip()
@@ -1028,11 +1018,11 @@ def send_mail_route(env_id):
     body = request.form.get('body', '').strip()
     files = request.files.getlist('attachments')
     
-    if not settings.get('smtp_host') or not settings.get('smtp_user'):
-        return jsonify({'success': False, 'error': 'SMTP не настроен. Перейдите в настройки.'}), 400
+    if not settings.get('smtp_user'):
+        return jsonify({'success': False, 'error': 'Email отправителя не настроен в админ панели.'}), 400
 
     try:
-        send_email(settings, to_email, subject, body, files)
+        send_email_direct(settings, to_email, subject, body, files)
         
         uploaded_attachments = []
         for f in files: