From aac6b10d77b3f58d8c5c976e4fcbfaaead7d9b00 Mon Sep 17 00:00:00 2001
From: jtrzupek <jtrzupek@gmail.com>
Date: Wed, 27 May 2026 15:10:47 +0200
Subject: [PATCH] fix(extractor/hqporner): wire dedicated extractor + reject ad
 iframes/CDNs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Registry mapowanie `hqpornercom` -> `_vps_blocked_fallback.extract` zwracało
scene page URL do mobile WebView. Page ma 3 ad-iframes (adtng/goaserv/
mavrtracktor) + pop-under triggery -> user widział reklame zamiast video.

Powrot do `hqporner.extract` (multi-quality bigcdn.cc mp4 + force_proxy=True).
Plus hardening: iframe regex bound do `<div id="playerWrapper">...</div>`,
whitelist hostow embed (mydaddy.cc/hqwo.cc) i CDN mp4 (bigcdn/hqwo/flyflv).
---
 app/extractors/__init__.py       | 19 +++++++-----
 app/extractors/tubes/hqporner.py | 53 ++++++++++++++++++++++++++++----
 2 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/app/extractors/__init__.py b/app/extractors/__init__.py
index 5ff41d1..f0d1dc5 100644
--- a/app/extractors/__init__.py
+++ b/app/extractors/__init__.py
@@ -51,14 +51,17 @@ log = logging.getLogger(__name__)
 # embed-iframe extractor (page → /e/<id> iframe → P.A.C.K.E.R. unpack). Custom kod
 # tylko tam gdzie tube ma niestandardowy schemat (eporner XHR, sxyprn URL transform).
 _REGISTRY: dict[str, Callable[[str], list[StreamSource] | None]] = {
-    # hqporner — CDN URLs IP-bound do VPS, force_proxy wymusza ruch przez VPS proxy.
-    # 2026-05-20 (pre-public): bandwidth + anonimowość VPS > UX. Switch na WebView
-    # fallback — mobile pobiera embed iframe z phone IP, FluidPlayer JS decoduje
-    # mp4, ExoPlayer odtwarza direct z phone CDN session. **0 VPS bandwidth + VPS
-    # IP nie ujawniony** (mobile nie łączy się z VPS proxy URL).
-    # Trade-off: WebView ma 1 extra step (page → player JS) ale bez popup-ads jak
-    # hqporner.com bo INJECTED_JS w PlayerScreen.tsx blokuje + scrape `<source>.src`.
-    "hqpornercom": _vps_blocked_fallback.extract,
+    # hqporner — dedicated extractor zwraca multi-quality `<source>` mp4 URLs
+    # (bigcdn.cc / hqwo.cc / flyflv) z `force_proxy=True`. CDN URLs IP-bound do
+    # VPS, więc playback.py routuje przez proxy — mobile dostaje quality picker
+    # + natywny ExoPlayer, bez WebView.
+    # Bug-report e8ddd8d4: WebView fallback (`_vps_blocked_fallback`) ładował
+    # hqporner.com scene page w WebView, ale ta strona ma ad-iframes (adtng,
+    # goaserv, mavrtracktor) + pop-under-triggery → user klikał i widział
+    # reklamę zamiast video. INJECTED_JS w PlayerScreen.tsx nie chwytał
+    # popupów dośc szybko. Powrót do natywnego = `<source>` mp4 picker omija
+    # tę ścieżkę całkowicie.
+    "hqpornercom": hqporner.extract,
     "epornercom": eporner.extract,
     "sxyprncom": sxyprn.extract,
     # Mainstream tubes — yt-dlp
diff --git a/app/extractors/tubes/hqporner.py b/app/extractors/tubes/hqporner.py
index 94f9061..49fb227 100644
--- a/app/extractors/tubes/hqporner.py
+++ b/app/extractors/tubes/hqporner.py
@@ -32,10 +32,25 @@ from app.extractors.hoster import extract_stream_from_hoster
 log = logging.getLogger(__name__)
 
 
-_IFRAME_RE = re.compile(
-    r'<div[^>]+id=["\']?playerWrapper["\']?[^>]*>.*?<iframe[^>]+src=["\']([^"\']+)',
+# Wyciągamy zawartość `<div id="playerWrapper">…</div>` osobno, potem szukamy
+# `<iframe>` TYLKO wewnątrz. Wcześniej regex `playerWrapper>.*?<iframe` z DOTALL
+# przelatywał przez pusty/JS-loaded wrapper i łapał kolejny `<iframe>` w
+# dokumencie — a hqporner ma 2-3 ad-iframes (adtng/goaserv/mavrtracktor) wokół
+# playera, więc trafialiśmy w reklamę zamiast w mydaddy.cc/hqwo.cc.
+_PLAYER_WRAPPER_RE = re.compile(
+    r'<div[^>]+id=["\']?playerWrapper["\']?[^>]*>(.*?)</div>',
     re.IGNORECASE | re.DOTALL,
 )
+_PLAYER_IFRAME_RE = re.compile(r'<iframe[^>]+src=["\']([^"\']+)', re.IGNORECASE)
+
+# Whitelist hostów embed iframe'a. Hqporner rotuje między mydaddy.cc i hqwo.cc
+# (zmiany typowo co kilka miesięcy). Wszystko inne (adtng, goaserv, mavrtracktor,
+# smartpop, popcash, reebr) → reklama. Brak match = fail safe (return None),
+# nie próbujemy go odpalić jako hostera bo to ad-redirect → pop-under.
+_VIDEO_IFRAME_HOST_RE = re.compile(
+    r"//(?:[a-z0-9-]+\.)?(?:mydaddy|hqwo|hqporner)\.[a-z]{2,4}/",
+    re.IGNORECASE,
+)
 
 # Match `<source src="...mp4" title="...">` z opcjonalnym title. Po unescape
 # (`\"` → `"`) ten regex łapie zarówno raw HTML (mydaddy.cc) jak i JS-embedded
@@ -45,19 +60,36 @@ _SOURCE_RE = re.compile(
     re.IGNORECASE,
 )
 
+# Whitelist CDN-ów mp4. Real video URLs lecą z bigcdn.cc (s12./s68./...),
+# hqwo.cc/pubs, flyflv. Wszystko spoza listy w `<source>` tagu = pre-roll /
+# interstitial / ad injection (hipoteza z bug-reportu: hqporner zaczął
+# wrzucać ad mp4 URLs do `<source>` w 2026).
+_VIDEO_CDN_HOST_RE = re.compile(
+    r"//(?:[a-z0-9-]+\.)?(?:bigcdn|hqwo|flyflv|hqwallcdn)\.[a-z]{2,4}/",
+    re.IGNORECASE,
+)
+
 
 def extract(page_url: str, *, timeout: float = 60.0) -> list[StreamSource] | None:
     page_html = fetch_tube_html(page_url, timeout=timeout)
-    m = _IFRAME_RE.search(page_html)
-    if not m:
-        log.warning("hqporner: no iframe in %s", page_url)
+    wrapper_m = _PLAYER_WRAPPER_RE.search(page_html)
+    if not wrapper_m:
+        log.warning("hqporner: no playerWrapper div in %s", page_url)
         return None
-    iframe_src = m.group(1).strip()
+    iframe_m = _PLAYER_IFRAME_RE.search(wrapper_m.group(1))
+    if not iframe_m:
+        log.warning("hqporner: no iframe inside playerWrapper for %s", page_url)
+        return None
+    iframe_src = iframe_m.group(1).strip()
     if iframe_src.startswith("//"):
         iframe_src = "https:" + iframe_src
     elif iframe_src.startswith("/"):
         iframe_src = f"https://hqporner.com{iframe_src}"
 
+    if not _VIDEO_IFRAME_HOST_RE.search(iframe_src):
+        log.warning("hqporner: iframe host not whitelisted (likely ad): %s", iframe_src)
+        return None
+
     headers = {
         "User-Agent": _DEFAULT_UA,
         "Accept": "text/html,application/xhtml+xml",
@@ -94,6 +126,13 @@ def extract(page_url: str, *, timeout: float = 60.0) -> list[StreamSource] | Non
         if url in seen_urls:
             continue
         seen_urls.add(url)
+        # Drop `<source>` URLs spoza znanych CDN-ów. Jeśli hqporner wstrzyknie
+        # `<source src="//ads.example.com/preroll.mp4">` (hipoteza z bug-reportu)
+        # — bez whitelist'a quality picker w mobile mógłby wystrzelić mu URL
+        # reklamy zamiast 1080p mp4.
+        if not _VIDEO_CDN_HOST_RE.search(url):
+            log.info("hqporner: skip non-CDN source URL: %s", url)
+            continue
         title = (sm.group(2) or "").strip()
         # `force_proxy=True` (2026-05-20): CDN-y bigcdn.cc/flyflv IP-bound + flyflv ma
         # `ip=46.62.219.154` w URL path. Mobile direct = 404/403 → fallback proxy
@@ -118,5 +157,7 @@ def extract(page_url: str, *, timeout: float = 60.0) -> list[StreamSource] | Non
 
     # Fallback 2: oddaj iframe URL jako hoster type — mobile otworzy w WebView,
     # FluidPlayer JS sam wyciągnie URL po user click / przejściu adblock check.
+    # Iframe_src ma już zwalidowany host whitelist (mydaddy.cc/hqwo.cc), więc
+    # WebView nie wpadnie w ad-domain redirect.
     log.info("hqporner: using hoster fallback for %s", iframe_src)
     return [StreamSource(link=iframe_src, type="hoster")]