修正: 85PO動画のX-Frame-Options遮断解消とクリーン埋め込みプロキシ対応

- UnifiedEmbedSanitizerに85POを統合し、同一オリジン中継(/api/clean-embed)経由でX-Frame-Options遮断を完全解消
- IsCloudflareChallengeHtmlにkt_player/video_urlの検出を追加し、正常プレイヤーHTMLの誤判定を防止
- ProxyEmbedRequestAsyncのUA調整(curl/8.13.0)によりアセットおよび動画ストリームのプロキシ取得を完全化
- UnifiedHttpHelperにWindows標準curl.exeによるCloudflare回避フォールバックを追加
- プレイヤー内video_urlの自動プロキシ化と広告コード無効化による即時動画再生を実現
This commit is contained in:
armonica committed 2026-11-11 19:35:16 +09:00
1 parent bec51879c7
commit 22a6f74184
4 files changed
+169 -20

No files matched your search

@@ -1,4 +1,6 @@
using System.Diagnostics;
using System.Net; using System.Net;
using System.Text;
using System.Text.Json; using System.Text.Json;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@@ -52,13 +54,35 @@ public class UnifiedHttpHelper
req.Headers.Referrer = new Uri(referer); req.Headers.Referrer = new Uri(referer);
} }
using var resp = await _httpClient.SendAsync(req, ct); using var resp = await this._httpClient.SendAsync(req, ct);
resp.EnsureSuccessStatusCode(); resp.EnsureSuccessStatusCode();
return await resp.Content.ReadAsStringAsync(ct); var content = await resp.Content.ReadAsStringAsync(ct);
// Cloudflare チャレンジ画面の場合は Windows 環境であれば curl.exe で再試行
if (OperatingSystem.IsWindows() && IsCloudflareChallenge(content))
{
this._logger.LogInformation("Cloudflareチャレンジを検知したためcurl.exeでの取得を試行します: {Url}", url);
return await this.GetHtmlViaCurlAsync(url, referer, ct);
}
return content;
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "HTTPリクエストに失敗しました: {Url}", url); if (OperatingSystem.IsWindows())
{
try
{
this._logger.LogInformation("HttpClientリクエスト失敗のためcurl.exeでの取得を試行します: {Url}", url);
return await this.GetHtmlViaCurlAsync(url, referer, ct);
}
catch (Exception curlEx)
{
this._logger.LogWarning(curlEx, "curl.exeでのフォールバック取得にも失敗しました: {Url}", url);
}
}
this._logger.LogError(ex, "HTTPリクエストに失敗しました: {Url}", url);
throw; throw;
} }
} }
@@ -148,4 +172,70 @@ public class UnifiedHttpHelper
var contentType = resp.Content.Headers.ContentType?.MediaType ?? "image/jpeg"; var contentType = resp.Content.Headers.ContentType?.MediaType ?? "image/jpeg";
return (data, contentType); return (data, contentType);
} }
/// <summary>
/// レスポンス文字列がCloudflareのチャレンジ画面であるかを判定します。
/// </summary>
private static bool IsCloudflareChallenge(string? html)
{
if (string.IsNullOrWhiteSpace(html))
{
return false;
}
return html.Contains("<title>Attention Required! | Cloudflare</title>", StringComparison.OrdinalIgnoreCase) ||
html.Contains("<title>Just a moment...</title>", StringComparison.OrdinalIgnoreCase) ||
html.Contains("cf-browser-verification", StringComparison.OrdinalIgnoreCase) ||
html.Contains("cf_chl_prog", StringComparison.OrdinalIgnoreCase);
}
/// <summary>
/// Windows標準のcurl.exeを利用して、Cloudflare TLSフィンガープリント保護下のHTMLを取得します。
/// </summary>
private async Task<string> GetHtmlViaCurlAsync(string url, string? referer, CancellationToken ct)
{
var curlPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "curl.exe");
if (!File.Exists(curlPath))
{
curlPath = "curl.exe";
}
var psi = new ProcessStartInfo
{
FileName = curlPath,
UseShellExecute = false,
RedirectStandardOutput = true,
RedirectStandardError = true,
CreateNoWindow = true,
StandardOutputEncoding = Encoding.UTF8
};
psi.ArgumentList.Add("-s");
psi.ArgumentList.Add("-L");
psi.ArgumentList.Add("-A");
psi.ArgumentList.Add("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36");
psi.ArgumentList.Add("-m");
psi.ArgumentList.Add("15");
if (!string.IsNullOrEmpty(referer))
{
psi.ArgumentList.Add("-e");
psi.ArgumentList.Add(referer);
}
psi.ArgumentList.Add(url);
using var process = new Process { StartInfo = psi };
process.Start();
var output = await process.StandardOutput.ReadToEndAsync(ct);
await process.WaitForExitAsync(ct);
if (process.ExitCode == 0 && !string.IsNullOrWhiteSpace(output))
{
return output;
}
throw new HttpRequestException($"curl exited with code {process.ExitCode}");
}
} }
@@ -758,8 +758,9 @@ public static class UnifiedHtmlRenderer
/// </summary> /// </summary>
public static string RenderVideoViewer(UnifiedVideoItem video) public static string RenderVideoViewer(UnifiedVideoItem video)
{ {
bool is123Av = UnifiedEmbedSanitizer.Is123AvDomain(video.Site, video.OriginalUrl, video.EmbedUrl); bool isCleanEmbed = UnifiedEmbedSanitizer.Is123AvDomain(video.Site, video.OriginalUrl, video.EmbedUrl);
var effectiveEmbedUrl = (!string.IsNullOrWhiteSpace(video.EmbedUrl) && is123Av) bool is85Po = string.Equals(video.Site, "85po", StringComparison.OrdinalIgnoreCase);
var effectiveEmbedUrl = (!string.IsNullOrWhiteSpace(video.EmbedUrl) && isCleanEmbed)
? UnifiedEmbedSanitizer.ToCleanEmbedUrl(video.EmbedUrl, video.OriginalUrl) ? UnifiedEmbedSanitizer.ToCleanEmbedUrl(video.EmbedUrl, video.OriginalUrl)
: (video.EmbedUrl ?? ""); : (video.EmbedUrl ?? "");
@@ -768,7 +769,7 @@ public static class UnifiedHtmlRenderer
var safeEmbedUrl = !string.IsNullOrWhiteSpace(effectiveEmbedUrl) ? Encoder.Encode(effectiveEmbedUrl) : ""; var safeEmbedUrl = !string.IsNullOrWhiteSpace(effectiveEmbedUrl) ? Encoder.Encode(effectiveEmbedUrl) : "";
var safeStreamUrl = !string.IsNullOrWhiteSpace(video.StreamUrl) ? Encoder.Encode(video.StreamUrl) : ""; var safeStreamUrl = !string.IsNullOrWhiteSpace(video.StreamUrl) ? Encoder.Encode(video.StreamUrl) : "";
var safePoster = !string.IsNullOrWhiteSpace(video.PosterUrl) ? Encoder.Encode(video.PosterUrl) : ""; var safePoster = !string.IsNullOrWhiteSpace(video.PosterUrl) ? Encoder.Encode(video.PosterUrl) : "";
var sandboxAttr = is123Av ? """sandbox="allow-scripts allow-same-origin allow-forms allow-presentation" """ : ""; var sandboxAttr = (isCleanEmbed && !is85Po) ? """sandbox="allow-scripts allow-same-origin allow-forms allow-presentation" """ : "";
bool hasStream = !string.IsNullOrEmpty(safeStreamUrl); bool hasStream = !string.IsNullOrEmpty(safeStreamUrl);
bool hasEmbed = !string.IsNullOrEmpty(safeEmbedUrl); bool hasEmbed = !string.IsNullOrEmpty(safeEmbedUrl);
@@ -1009,7 +1010,7 @@ public static class UnifiedHtmlRenderer
} }
// 123av ドメイン接続時の透明リンクエリア・外部リンク除去バックアップ監視 // 123av ドメイン接続時の透明リンクエリア・外部リンク除去バックアップ監視
const is123AvDomain = {{(is123Av ? "true" : "false")}}; const is123AvDomain = {{(isCleanEmbed ? "true" : "false")}};
const videoIframe = document.getElementById('videoIframe'); const videoIframe = document.getElementById('videoIframe');
if (is123AvDomain) { if (is123AvDomain) {
try { try {
@@ -97,7 +97,12 @@ public class UnifiedEmbedSanitizer
"v-scope", "v-scope",
"player(json.parse", "player(json.parse",
"embed-dev-", "embed-dev-",
"/assets/t4/embed/" "/assets/t4/embed/",
"kt_player",
"kt_player.js",
"85po.com",
"85ro.com",
"85po.net"
}; };
#endregion #endregion
@@ -181,6 +186,8 @@ public class UnifiedEmbedSanitizer
// 正常な動画プレイヤーの構成要素が含まれていればチャレンジ画面ではない // 正常な動画プレイヤーの構成要素が含まれていればチャレンジ画面ではない
if (html.Contains("id=\"player\"", StringComparison.OrdinalIgnoreCase) || if (html.Contains("id=\"player\"", StringComparison.OrdinalIgnoreCase) ||
html.Contains("id='player'", StringComparison.OrdinalIgnoreCase) || html.Contains("id='player'", StringComparison.OrdinalIgnoreCase) ||
html.Contains("kt_player", StringComparison.OrdinalIgnoreCase) ||
html.Contains("video_url", StringComparison.OrdinalIgnoreCase) ||
html.Contains("plyr", StringComparison.OrdinalIgnoreCase) || html.Contains("plyr", StringComparison.OrdinalIgnoreCase) ||
html.Contains("hls.min.js", StringComparison.OrdinalIgnoreCase) || html.Contains("hls.min.js", StringComparison.OrdinalIgnoreCase) ||
html.Contains("jwplayer", StringComparison.OrdinalIgnoreCase) || html.Contains("jwplayer", StringComparison.OrdinalIgnoreCase) ||
@@ -201,13 +208,17 @@ public class UnifiedEmbedSanitizer
/// <returns>除去対象である場合は true、それ以外は false</returns> /// <returns>除去対象である場合は true、それ以外は false</returns>
public static bool Is123AvDomain(string? siteKey, string? originalUrl = null, string? embedUrl = null) public static bool Is123AvDomain(string? siteKey, string? originalUrl = null, string? embedUrl = null)
{ {
if (string.Equals(siteKey, "123av", StringComparison.OrdinalIgnoreCase)) if (string.Equals(siteKey, "123av", StringComparison.OrdinalIgnoreCase) ||
string.Equals(siteKey, "85po", StringComparison.OrdinalIgnoreCase))
{ {
return true; return true;
} }
if (!string.IsNullOrWhiteSpace(originalUrl) && if (!string.IsNullOrWhiteSpace(originalUrl) &&
(originalUrl.Contains("123av.", StringComparison.OrdinalIgnoreCase) || (originalUrl.Contains("123av.", StringComparison.OrdinalIgnoreCase) ||
originalUrl.Contains("85po.com", StringComparison.OrdinalIgnoreCase) ||
originalUrl.Contains("85ro.com", StringComparison.OrdinalIgnoreCase) ||
originalUrl.Contains("85po.net", StringComparison.OrdinalIgnoreCase) ||
originalUrl.Contains("jav-master", StringComparison.OrdinalIgnoreCase) || originalUrl.Contains("jav-master", StringComparison.OrdinalIgnoreCase) ||
originalUrl.Contains("javplayer.cc", StringComparison.OrdinalIgnoreCase))) originalUrl.Contains("javplayer.cc", StringComparison.OrdinalIgnoreCase)))
{ {
@@ -216,6 +227,9 @@ public class UnifiedEmbedSanitizer
if (!string.IsNullOrWhiteSpace(embedUrl) && if (!string.IsNullOrWhiteSpace(embedUrl) &&
(embedUrl.Contains("123av.", StringComparison.OrdinalIgnoreCase) || (embedUrl.Contains("123av.", StringComparison.OrdinalIgnoreCase) ||
embedUrl.Contains("85po.com", StringComparison.OrdinalIgnoreCase) ||
embedUrl.Contains("85ro.com", StringComparison.OrdinalIgnoreCase) ||
embedUrl.Contains("85po.net", StringComparison.OrdinalIgnoreCase) ||
embedUrl.Contains("jav-master", StringComparison.OrdinalIgnoreCase) || embedUrl.Contains("jav-master", StringComparison.OrdinalIgnoreCase) ||
embedUrl.Contains("javplayer.cc", StringComparison.OrdinalIgnoreCase) || embedUrl.Contains("javplayer.cc", StringComparison.OrdinalIgnoreCase) ||
embedUrl.Contains("sadie-shop.site", StringComparison.OrdinalIgnoreCase))) embedUrl.Contains("sadie-shop.site", StringComparison.OrdinalIgnoreCase)))
@@ -247,7 +261,7 @@ public class UnifiedEmbedSanitizer
var effectiveReferer = !string.IsNullOrWhiteSpace(refererUrl) var effectiveReferer = !string.IsNullOrWhiteSpace(refererUrl)
? refererUrl.Trim() ? refererUrl.Trim()
: "https://123av.com/"; : (trimmed.Contains("85po", StringComparison.OrdinalIgnoreCase) || trimmed.Contains("85ro", StringComparison.OrdinalIgnoreCase) ? "https://www.85po.com/" : "https://123av.com/");
return $"/api/clean-embed?url={Uri.EscapeDataString(trimmed)}&referer={Uri.EscapeDataString(effectiveReferer)}"; return $"/api/clean-embed?url={Uri.EscapeDataString(trimmed)}&referer={Uri.EscapeDataString(effectiveReferer)}";
} }
@@ -274,7 +288,7 @@ public class UnifiedEmbedSanitizer
var effectiveReferer = !string.IsNullOrWhiteSpace(refererUrl) var effectiveReferer = !string.IsNullOrWhiteSpace(refererUrl)
? refererUrl.Trim() ? refererUrl.Trim()
: "https://123av.com/"; : (targetUrl.Contains("85po", StringComparison.OrdinalIgnoreCase) || targetUrl.Contains("85ro", StringComparison.OrdinalIgnoreCase) ? "https://www.85po.com/" : "https://123av.com/");
string? rawHtml = null; string? rawHtml = null;
@@ -337,6 +351,30 @@ public class UnifiedEmbedSanitizer
embedPathAndQuery = RewritePosterQueryParam(embedPathAndQuery, embedUrl); embedPathAndQuery = RewritePosterQueryParam(embedPathAndQuery, embedUrl);
} }
// 85PO 向けプレイヤー設定のリライト(広告無効化、リダイレクト無効化、動画URLプロキシ化)
if (embedUrl.Contains("85po.com", StringComparison.OrdinalIgnoreCase) ||
embedUrl.Contains("85ro.com", StringComparison.OrdinalIgnoreCase) ||
embedUrl.Contains("85po.net", StringComparison.OrdinalIgnoreCase))
{
var effectiveRef = !string.IsNullOrWhiteSpace(refererUrl) ? refererUrl.Trim() : embedUrl;
// 広告設定を無効化(広告待ち時間をゼロに)
html = Regex.Replace(html, @"adv_(?:start|pre|post|pause)_html:\s*['""][^'""]*['""]", "adv_start_html: '', adv_pre_html: '', adv_post_html: '', adv_pause_html: ''", RegexOptions.IgnoreCase);
html = Regex.Replace(html, @"empty_referer_redirect:\s*['""][^'""]*['""]", "empty_referer_redirect: ''", RegexOptions.IgnoreCase);
// video_url および video_alt_url をプロキシURLに変換
html = Regex.Replace(
html,
@"(?<prefix>\bvideo_(?:alt_)?url\d*:\s*['""])(?<url>https?://[^'""]+)(?<suffix>['""])",
m =>
{
var rawUrl = m.Groups["url"].Value;
var proxied = $"/api/proxy-embed-req?url={Uri.EscapeDataString(rawUrl)}&referer={Uri.EscapeDataString(effectiveRef)}";
return m.Groups["prefix"].Value + proxied + m.Groups["suffix"].Value;
},
RegexOptions.IgnoreCase);
}
// 0. 万が一 FlareSolverr 等で <div id="player" class="plyr ...">...</div> が静的に展開されていた場合は // 0. 万が一 FlareSolverr 等で <div id="player" class="plyr ...">...</div> が静的に展開されていた場合は
// クライアント側で正規の new Plyr(video) が初期化できるよう空の <div id="player"></div> にリセット // クライアント側で正規の new Plyr(video) が初期化できるよう空の <div id="player"></div> にリセット
if (html.Contains("embed-dev-", StringComparison.OrdinalIgnoreCase) && if (html.Contains("embed-dev-", StringComparison.OrdinalIgnoreCase) &&
@@ -482,8 +520,12 @@ public class UnifiedEmbedSanitizer
try try
{ {
bool isSurrit = targetUri.Host.EndsWith("surrit.com", StringComparison.OrdinalIgnoreCase); bool isSurrit = targetUri.Host.EndsWith("surrit.com", StringComparison.OrdinalIgnoreCase);
var client = isSurrit ? SurritClient.Value : this._httpClientFactory.CreateClient(); bool is85po = targetUri.Host.Contains("85po.com", StringComparison.OrdinalIgnoreCase) ||
if (!isSurrit) targetUri.Host.Contains("85ro.com", StringComparison.OrdinalIgnoreCase) ||
targetUri.Host.Contains("85po.net", StringComparison.OrdinalIgnoreCase) ||
targetUri.Host.Contains("ppxdd.com", StringComparison.OrdinalIgnoreCase);
var client = (isSurrit || is85po) ? SurritClient.Value : this._httpClientFactory.CreateClient();
if (!isSurrit && !is85po)
{ {
client.Timeout = TimeSpan.FromSeconds(30); client.Timeout = TimeSpan.FromSeconds(30);
} }
@@ -493,11 +535,11 @@ public class UnifiedEmbedSanitizer
var effectiveReferer = !string.IsNullOrWhiteSpace(referer) var effectiveReferer = !string.IsNullOrWhiteSpace(referer)
? referer.Trim() ? referer.Trim()
: (isSurrit ? "https://missav.ai/" : $"{targetUri.Scheme}://{targetUri.Authority}/"); : (isSurrit ? "https://missav.ai/" : (is85po ? "https://www.85po.com/" : $"{targetUri.Scheme}://{targetUri.Authority}/"));
string refererOrigin = isSurrit string refererOrigin = isSurrit
? "https://missav.ai" ? "https://missav.ai"
: $"{targetUri.Scheme}://{targetUri.Authority}"; : (is85po ? "https://www.85po.com" : $"{targetUri.Scheme}://{targetUri.Authority}");
if (Uri.TryCreate(effectiveReferer, UriKind.Absolute, out var refUri)) if (Uri.TryCreate(effectiveReferer, UriKind.Absolute, out var refUri))
{ {
@@ -511,6 +553,12 @@ public class UnifiedEmbedSanitizer
req.Headers.TryAddWithoutValidation("Accept", "*/*"); req.Headers.TryAddWithoutValidation("Accept", "*/*");
req.Headers.TryAddWithoutValidation("Referer", "https://missav.ai/"); req.Headers.TryAddWithoutValidation("Referer", "https://missav.ai/");
} }
else if (is85po)
{
req.Headers.TryAddWithoutValidation("User-Agent", "curl/8.13.0");
req.Headers.TryAddWithoutValidation("Accept", "*/*");
req.Headers.TryAddWithoutValidation("Referer", effectiveReferer);
}
else else
{ {
req.Headers.TryAddWithoutValidation("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36"); req.Headers.TryAddWithoutValidation("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36");
@@ -1058,11 +1106,10 @@ public class UnifiedEmbedSanitizer
var EMBED_PATH = '{{jsPathAndQuery}}'; var EMBED_PATH = '{{jsPathAndQuery}}';
var REFERER_URL = '{{jsReferer}}'; var REFERER_URL = '{{jsReferer}}';
// 0. document.referrer を https://123av.com/ に固定 // 0. document.referrer を元ページURLに設定
// (embed-dev-*.js の透明リンク広告 IIFE は /^https:\/\/123av.com/.test(document.referrer) が true のとき即座に return して何もしない仕様)
try { try {
Object.defineProperty(document, 'referrer', { Object.defineProperty(document, 'referrer', {
get: function() { return 'https://123av.com/'; }, get: function() { return REFERER_URL || 'https://123av.com/'; },
configurable: true configurable: true
}); });
} catch (e) {} } catch (e) {}
@@ -216,13 +216,24 @@ public class VideoEmbedExtractor
host = parsedUri.Host.ToLowerInvariant(); host = parsedUri.Host.ToLowerInvariant();
} }
// 言語プレフィックスの抽出 (/ja/, /en/ 等)
string langPrefix = "";
if (url.Contains("/ja/", StringComparison.OrdinalIgnoreCase))
{
langPrefix = "/ja";
}
else if (url.Contains("/en/", StringComparison.OrdinalIgnoreCase))
{
langPrefix = "/en";
}
// メタデータ取得用URLの決定 // メタデータ取得用URLの決定
// 85POは embed ページ(または /ja/v/)からタイトルおよびサムネイルを安定して取得可能 // 85POの公式埋め込みプレイヤーURLは言語プレフィックスなしの /embed/{id}
string targetFetchUrl = !string.IsNullOrEmpty(videoId) string targetFetchUrl = !string.IsNullOrEmpty(videoId)
? $"https://{host}/embed/{videoId}" ? $"https://{host}/embed/{videoId}"
: (url.StartsWith("http", StringComparison.OrdinalIgnoreCase) ? url : $"https://{host}/"); : (url.StartsWith("http", StringComparison.OrdinalIgnoreCase) ? url : $"https://{host}/");
string originalPageUrl = !string.IsNullOrEmpty(videoId) string originalPageUrl = !string.IsNullOrEmpty(videoId)
? $"https://{host}/v/{videoId}.html" ? $"https://{host}{langPrefix}/v/{videoId}.html"
: url; : url;
string? title = null; string? title = null;
string? posterUrl = null; string? posterUrl = null;