Update app.py

app.py

@@ -170,6 +170,20 @@ FORWARD_HEADERS = {
     "Authorization",
 }
 
+def parse_cookie_txt(text):
+    cookies = {}
+    for line in text.splitlines():
+        line = line.strip()
+        if not line or line.startswith("#"):
+            continue
+        parts = line.split("\t")
+        if len(parts) >= 7:
+            name = parts[5]
+            value = parts[6]
+            cookies[name] = value
+    return cookies
+
+
 @app.route("/cors-proxy", methods=["GET", "POST", "PATCH", "PUT", "DELETE", "OPTIONS"], strict_slashes=False)
 def cors_proxy():
     # Preflight 対応
@@ -183,16 +197,33 @@ def cors_proxy():
                 "Access-Control-Allow-Methods": "GET, POST, PATCH, PUT, DELETE, OPTIONS",
             },
         )
+
     # cookie パラメータ取得
     cookie_param = request.args.get("cookie")
-    
-    cookies = None
+    cookie_txt_url = request.args.get("cookie_txt_url")
+
+    cookies = {}
+
+    # cookie= から
     if cookie_param:
-        cookies = {}
         for item in cookie_param.split(";"):
             if "=" in item:
                 k, v = item.split("=", 1)
                 cookies[k.strip()] = v.strip()
+
+    # cookie_txt_url から
+    if cookie_txt_url:
+        try:
+            txt_resp = requests.get(cookie_txt_url, timeout=10)
+            txt_resp.raise_for_status()
+            txt_cookies = parse_cookie_txt(txt_resp.text)
+            cookies.update(txt_cookies)
+        except requests.RequestException:
+            return "cookie_txt_url の取得に失敗しました", 400
+
+    if not cookies:
+        cookies = None
+
     url = request.args.get("url")
     if not url:
         return "url パラメータが必要です", 400
@@ -200,13 +231,12 @@ def cors_proxy():
     if not url.startswith(("http://", "https://")):
         return "http または https のURLのみ使用できます", 400
 
-    # 追加転送ヘッダ取得（例: send=x-games-flags,x-games-sdk-auth）
+    # 追加転送ヘッダ取得
     extra_headers = set()
     send_param = request.args.get("send")
     if send_param:
         extra_headers = {h.strip() for h in send_param.split(",") if h.strip()}
 
-    # 転送対象ヘッダを動的に構築（小文字比較で安全に）
     allowed_headers = {h.lower() for h in FORWARD_HEADERS}
     allowed_headers.update(h.lower() for h in extra_headers)
 
@@ -215,58 +245,70 @@ def cors_proxy():
         if k.lower() in allowed_headers
     }
 
-    # gzip 問題回避
     headers.pop("Accept-Encoding", None)
 
-    # url パラメータと send パラメータは転送しない
     forward_params = request.args.to_dict(flat=True)
     forward_params.pop("url", None)
     forward_params.pop("send", None)
     forward_params.pop("cookie", None)
+    forward_params.pop("cookie_txt_url", None)
+
     resp = requests.request(
         method=request.method,
         url=url,
         headers=headers,
         data=request.get_data(),
         params=forward_params,
-        cookies=cookies,  # ←追加
+        cookies=cookies,
         timeout=300,
     )
 
     response = Response(resp.content, resp.status_code)
 
-    # CORS ヘッダ付与
     response.headers["Access-Control-Allow-Origin"] = "*"
     response.headers["Access-Control-Allow-Headers"] = "*"
     response.headers["Access-Control-Allow-Methods"] = "GET, POST, PATCH, PUT, DELETE, OPTIONS"
 
-    # Content-Type は元のまま
     if "Content-Type" in resp.headers:
         response.headers["Content-Type"] = resp.headers["Content-Type"]
 
     return response
 
+
 @app.errorhandler(404)
 def cors_proxy_404(e):
     baseurl = request.args.get("baseurl23896")
     if not baseurl:
         return abort(404)
 
-    # baseurl23896 以外のパラメータをそのまま渡す
     forward_params = {
         k: v for k, v in request.args.items()
         if k != "baseurl23896"
     }
+
     cookie_param = request.args.get("cookie")
-    
-    cookies = None
+    cookie_txt_url = request.args.get("cookie_txt_url")
+
+    cookies = {}
+
     if cookie_param:
-        cookies = {}
         for item in cookie_param.split(";"):
             if "=" in item:
                 k, v = item.split("=", 1)
                 cookies[k.strip()] = v.strip()
-    # 転送先URLを組み立て
+
+    if cookie_txt_url:
+        try:
+            txt_resp = requests.get(cookie_txt_url, timeout=10)
+            txt_resp.raise_for_status()
+            txt_cookies = parse_cookie_txt(txt_resp.text)
+            cookies.update(txt_cookies)
+        except requests.RequestException:
+            return abort(400)
+
+    if not cookies:
+        cookies = None
+
     target_url = baseurl.rstrip("/") + request.path
     if forward_params:
         target_url += "?" + urlencode(forward_params, doseq=True)
@@ -280,7 +322,7 @@ def cors_proxy_404(e):
                 if k.lower() not in ["host", "content-length"]
             },
             data=request.get_data(),
-            cookies=cookies,  # ←追加
+            cookies=cookies,
             allow_redirects=False,
             timeout=10,
         )
@@ -293,6 +335,7 @@ def cors_proxy_404(e):
         "transfer-encoding",
         "connection",
     ]
+
     headers = [
         (k, v) for k, v in resp.headers.items()
         if k.lower() not in excluded_headers
@@ -300,6 +343,7 @@ def cors_proxy_404(e):
 
     return Response(resp.content, resp.status_code, headers)
 
+
 #------------------