Skip to content

fix #4499 【システム】TRUST_PROXY=true 環境で BcUtil::isSameOriginAsCurrent() … #4500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryuring merged 3 commits into from
Aug 14, 2026
+12 −1
Merged

fix #4499 【システム】TRUST_PROXY=true 環境で BcUtil::isSameOriginAsCurrent() … #4500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e46fd8
fix #4499 【システム】TRUST_PROXY=true 環境で BcUtil::isSameOriginAsCurrent() …
Aug 13, 2026
0869bbc
PHP8.1でテストが通らないため、テストコードを調整してみる
Aug 13, 2026
1cd7b7c
Improve comments in isSameOriginAsCurrent method
ryuring Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion plugins/baser-core/src/Utility/BcUtil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2127,7 +2127,14 @@ public static function isSameReferrerAsCurrent()
*/
public static function isSameOriginAsCurrent()
{
$https = !empty($_SERVER['HTTPS']) && strtolower((string)$_SERVER['HTTPS']) !== 'off';
// TRUST_PROXY=true 環境では $_SERVER['HTTPS'] がリバースプロキシ配下で
// 設定されないため、BcRequestFilterMiddleware が trustProxy 済みで上書きする
// $request->is('https') を優先して使う。
// 取得できない場合のみ $_SERVER を見る。
$request = Router::getRequest();
$https = $request
? $request->is('https')
: (!empty($_SERVER['HTTPS']) && strtolower((string)$_SERVER['HTTPS']) !== 'off');
$host = $_SERVER['HTTP_HOST'] ?? '';
if ($host === '') {
return false;
Expand Down
4 changes: 4 additions & 0 deletions plugins/baser-core/tests/TestCase/Utility/BcUtilTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1606,6 +1606,10 @@ public static function isSameReferrerAsCurrentDataProvider()
*/
public function testIsSameOriginAsCurrent(array $server, bool $expected)
{
// 準備：他のテスト(test_getViewPath等)が残した Router::setRequest() の残留状態が
// Router::getRequest() 経由の判定に影響しないよう、リクエストをクリアする
Router::reload();

// 準備：判定に使う $_SERVER をクリアしてから流し込む
foreach (['HTTPS', 'HTTP_HOST', 'HTTP_ORIGIN', 'HTTP_REFERER'] as $key) {
unset($_SERVER[$key]);
Expand Down
Loading