Update renewer.py

renewer.py

@@ -3,6 +3,11 @@ import json
 import os
 import logging
 from datetime import datetime, timedelta
+try:
+    from bs4 import BeautifulSoup
+    BS4_AVAILABLE = True
+except ImportError:
+    BS4_AVAILABLE = False
 
 logging.basicConfig(
     level=logging.INFO,
@@ -26,6 +31,7 @@ def save_accounts(accounts):
 
 
 def get_host(username, token):
+    """Detect if account is on US or EU server using API token."""
     for host in ["www.pythonanywhere.com", "eu.pythonanywhere.com"]:
         try:
             r = requests.get(
@@ -40,84 +46,201 @@ def get_host(username, token):
     return None
 
 
-def extend_webapp(username, token, host):
-    """
-    الوظيفة الحقيقية لزر 'Run until 1 month from today':
-    1. POST /enable/  →  يُفعّل الـ webapp ويمدده شهر (= الزر في الواجهة)
-    2. POST /reload/  →  يُعيد تحميل الكود فقط (لا علاقة له بالتمديد)
-    """
+def get_host_by_password(username, password):
+    """Detect server by trying to login."""
+    for host in ["www.pythonanywhere.com", "eu.pythonanywhere.com"]:
+        try:
+            session = requests.Session()
+            r = session.get(f"https://{host}/login/", timeout=10)
+            if r.status_code == 200:
+                return host, session
+        except Exception:
+            continue
+    return None, None
+
+
+# ─────────────────────────────────────────────
+# Method 1: API Token → /webapps/{domain}/reload/
+# ─────────────────────────────────────────────
+
+def extend_webapp_token(username, token, host):
+    """Extend all webapps via API reload endpoint (token-based)."""
     results = []
     try:
-        # الخطوة 1: جلب قائمة الـ webapps
         r = requests.get(
             f"https://{host}/api/v0/user/{username}/webapps/",
             headers={"Authorization": f"Token {token}"},
             timeout=10
         )
         if r.status_code != 200:
-            logger.warning(f"[{username}] Failed to list webapps: {r.status_code} - {r.text}")
+            logger.warning(f"[{username}] Failed to list webapps: {r.status_code}")
             return results
 
         webapps = r.json()
-        if not webapps:
-            logger.warning(f"[{username}] No webapps found.")
-            return results
-
         for app in webapps:
             domain = app.get("domain_name")
-            logger.info(f"[{username}] Processing webapp: {domain}")
-
-            # الخطوة 2: POST /enable/ = "Run until 1 month from today"
-            # هذا هو الـ endpoint الصحيح الذي يضغط الزر
-            enable_r = requests.post(
-                f"https://{host}/api/v0/user/{username}/webapps/{domain}/enable/",
+            reload_r = requests.post(
+                f"https://{host}/api/v0/user/{username}/webapps/{domain}/reload/",
                 headers={"Authorization": f"Token {token}"},
                 timeout=10
             )
+            status = "✅ OK" if reload_r.status_code == 200 else f"❌ {reload_r.status_code}"
+            logger.info(f"[{username}] Reload {domain}: {status}")
+            results.append({"domain": domain, "status": status})
+    except Exception as e:
+        logger.error(f"[{username}] Error (token method): {e}")
+    return results
 
-            if enable_r.status_code == 200:
-                status = "✅ ممدود (enabled)"
-                logger.info(f"[{username}] {domain}: تم التمديد بنجاح ✅")
-            else:
-                # إذا كان مفعّلاً مسبقاً status=409 أو غيره، نجرب reload
-                logger.warning(f"[{username}] enable/ returned {enable_r.status_code}: {enable_r.text}")
-
-                # الخطوة 3: POST /reload/ كـ fallback للـ webapps المفعّلة أصلاً
-                reload_r = requests.post(
-                    f"https://{host}/api/v0/user/{username}/webapps/{domain}/reload/",
-                    headers={"Authorization": f"Token {token}"},
-                    timeout=10
-                )
-                if reload_r.status_code == 200:
-                    status = "✅ Reloaded (كان مفعّلاً)"
-                else:
-                    status = f"❌ فشل ({enable_r.status_code})"
 
+# ─────────────────────────────────────────────
+# Method 2: Password → session login → /extend
+# ─────────────────────────────────────────────
+
+def extend_webapp_password(username, password, host=None):
+    """Extend webapps via session login + CSRF extend endpoint (password-based)."""
+    if not BS4_AVAILABLE:
+        logger.error("beautifulsoup4 is not installed. Cannot use password method.")
+        return []
+
+    if not host:
+        host = "www.pythonanywhere.com"
+
+    results = []
+    session = requests.Session()
+
+    try:
+        # Step 1: Get login page and extract CSRF token
+        login_url = f"https://{host}/login/"
+        login_page = session.get(login_url, timeout=10)
+        soup = BeautifulSoup(login_page.text, "html.parser")
+        csrf_input = soup.find("input", {"name": "csrfmiddlewaretoken"})
+        if not csrf_input:
+            logger.error(f"[{username}] Could not find CSRF token on login page.")
+            return results
+        csrf = csrf_input["value"]
+
+        # Step 2: POST login credentials
+        login_data = {
+            "auth-username": username,
+            "auth-password": password,
+            "csrfmiddlewaretoken": csrf,
+            "next": "/"
+        }
+        login_resp = session.post(
+            login_url,
+            data=login_data,
+            headers={"Referer": login_url},
+            timeout=10,
+            allow_redirects=True
+        )
+        if login_resp.status_code not in (200, 302):
+            logger.error(f"[{username}] Login failed: HTTP {login_resp.status_code}")
+            return results
+
+        # Verify we are actually logged in
+        dashboard = session.get(f"https://{host}/dashboard/", timeout=10)
+        if "login" in dashboard.url.lower() or username.lower() not in dashboard.text.lower():
+            logger.error(f"[{username}] Login appears to have failed (redirected to login page).")
+            return results
+
+        logger.info(f"[{username}] Logged in successfully via password on {host}")
+
+        # Step 3: Open webapps page to get a fresh CSRF token
+        webapps_url = f"https://{host}/user/{username}/webapps/"
+        page = session.get(webapps_url, timeout=10)
+        soup = BeautifulSoup(page.text, "html.parser")
+        csrf_input = soup.find("input", {"name": "csrfmiddlewaretoken"})
+        if not csrf_input:
+            # Try meta tag fallback
+            meta = soup.find("meta", {"name": "csrf-token"})
+            csrf = meta["content"] if meta else None
+        else:
+            csrf = csrf_input["value"]
+
+        if not csrf:
+            logger.error(f"[{username}] Could not find CSRF token on webapps page.")
+            return results
+
+        # Step 4: Find all webapp domains on this page
+        domains = []
+        for link in soup.find_all("a", href=True):
+            href = link["href"]
+            if f"/user/{username}/webapps/" in href and "extend" not in href:
+                domain_part = href.split(f"/user/{username}/webapps/")[-1].strip("/")
+                if domain_part and "." in domain_part and domain_part not in domains:
+                    domains.append(domain_part)
+
+        # Fallback: try the default domain if none found
+        if not domains:
+            default_domain = f"{username}.pythonanywhere.com"
+            domains = [default_domain]
+            logger.warning(f"[{username}] Could not detect domains, trying default: {default_domain}")
+
+        # Step 5: POST extend for each domain
+        for domain in domains:
+            extend_url = f"https://{host}/user/{username}/webapps/{domain}/extend"
+            resp = session.post(
+                extend_url,
+                data={"csrfmiddlewaretoken": csrf},
+                headers={"Referer": webapps_url},
+                timeout=10
+            )
+            if resp.status_code in (200, 302):
+                status = "✅ OK"
+            else:
+                status = f"❌ {resp.status_code}"
+            logger.info(f"[{username}] Extend {domain}: {status}")
             results.append({"domain": domain, "status": status})
 
     except Exception as e:
-        logger.error(f"[{username}] Error: {e}")
+        logger.error(f"[{username}] Error (password method): {e}")
 
     return results
 
 
+# ─────────────────────────────────────────────
+# Unified renew_account
+# ─────────────────────────────────────────────
+
 def renew_account(account):
     username = account["username"]
-    token = account["token"]
-    host = account.get("host") or get_host(username, token)
+    token    = account.get("token", "").strip()
+    password = account.get("password", "").strip()
+    host     = account.get("host")
 
-    if not host:
-        logger.error(f"[{username}] Cannot connect - invalid credentials?")
-        return False, "Cannot connect"
+    results = []
+    success = False
+
+    # ── Priority 1: password method (uses /extend endpoint) ──
+    if password and BS4_AVAILABLE:
+        if not host:
+            host = "www.pythonanywhere.com"   # default; extend_webapp_password will auto-login
+        logger.info(f"[{username}] Using password method on {host}")
+        results = extend_webapp_password(username, password, host)
+        success = any("✅" in r.get("status", "") for r in results) if results else False
+
+    # ── Priority 2: token method (API reload) ──
+    elif token:
+        if not host:
+            host = get_host(username, token)
+        if not host:
+            logger.error(f"[{username}] Cannot connect - invalid token?")
+            return False, []
+        account["host"] = host
+        logger.info(f"[{username}] Using token method on {host}")
+        results = extend_webapp_token(username, token, host)
+        success = any("✅" in r.get("status", "") for r in results) if results else False
 
-    account["host"] = host
-    logger.info(f"[{username}] Connected to {host}")
+    # ── Fallback: try password method even without bs4 ──
+    else:
+        logger.error(f"[{username}] No token or password provided.")
+        return False, []
 
-    results = extend_webapp(username, token, host)
+    account["host"]         = host
     account["last_renewed"] = datetime.utcnow().isoformat()
     account["next_renewal"] = (datetime.utcnow() + timedelta(days=10)).isoformat()
     account["last_results"] = results
-    return True, results
+    return success, results
 
 
 def run_renewals():