Skip to content

fix #3012 【API】BcUtil::isAdminSystem でAPI経由で処理しているURLが管理画面ではないと判断される件を修正 #4414

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

Open
kaburk wants to merge 1 commit into
base: 5.2.x
Choose a base branch
from
+36 −7
Open

fix #3012 【API】BcUtil::isAdminSystem でAPI経由で処理しているURLが管理画面ではないと判断される件を修正 #4414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions plugins/baser-core/src/Utility/BcUtil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,8 +572,18 @@ public static function isAdminSystem($url = null)
return false;
}
}
$adminPrefix = BcUtil::getPrefix(true);
return (boolean)(preg_match('/^(|\/)' . $adminPrefix . '\//', $url) || preg_match('/^(|\/)' . $adminPrefix . '$/', $url));
$baserCorePrefix = (string) BcUtil::getBaserCorePrefix();
$adminAlias = Configure::read('BcPrefixAuth.Admin.alias') ?: '/' . BcUtil::getAdminPrefix();
$apiAdminAlias = Configure::read('BcPrefixAuth.Api/Admin.alias')
?: '/' . (string) Configure::read('BcApp.apiPrefix') . '/admin';

$prefixes = [
$baserCorePrefix . $adminAlias,
$baserCorePrefix . $apiAdminAlias,
];
$prefixes = array_map(fn($prefix) => preg_quote(ltrim($prefix, '/'), '/'), $prefixes);

return (bool) preg_match('/^\/?(?:' . implode('|', $prefixes) . ')(?:$|\/)/', $url);
}

/**
Expand Down
29 changes: 24 additions & 5 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 @@ -349,14 +349,26 @@ public function testClearModelCache()
*
* @param string $url 対象URL
* @param bool $expect 期待値
* @param string|null $apiPrefix APIプレフィックス
* @dataProvider isAdminSystemDataProvider
*/
public function testIsAdminSystem($url, $expect)
public function testIsAdminSystem($url, $expect, ?string $apiPrefix = null)
{
$this->loadFixtureScenario(InitAppScenario::class);
$this->getRequest($url);
$result = BcUtil::isAdminSystem();
$this->assertEquals($expect, $result, '正しく管理システムかチェックできません');
$currentApiPrefix = Configure::read('BcApp.apiPrefix');
$currentApiAdminAlias = Configure::read('BcPrefixAuth.Api/Admin.alias');
if ($apiPrefix !== null) {
Configure::write('BcApp.apiPrefix', $apiPrefix);
Configure::write('BcPrefixAuth.Api/Admin.alias', '/' . $apiPrefix . '/admin');
}
try {
$this->getRequest($url);
$result = BcUtil::isAdminSystem();
$this->assertEquals($expect, $result, '正しく管理システムかチェックできません');
} finally {
Configure::write('BcApp.apiPrefix', $currentApiPrefix);
Configure::write('BcPrefixAuth.Api/Admin.alias', $currentApiAdminAlias);
}
}

/**
Expand All @@ -371,6 +383,13 @@ public static function isAdminSystemDataProvider()
['baser/admin/hoge', true],
['/baser/admin/hoge', true],
['baser/admin/', true],
['baser/api/admin', true],
['baser/api/admin/hoge', true],
['/baser/api/admin/hoge', true],
['baser/api/admin/', true],
['baser/rest/admin/hoge', true, 'rest'],
['baser/api/admin/hoge', false, 'rest'],
['baser/api', false],
['hoge', false],
['hoge/', false],
];
Expand Down Expand Up @@ -1545,7 +1564,7 @@ public function testIsSameReferrerAsCurrent($referer, $expected)
public static function isSameReferrerAsCurrentDataProvider()
{
return [
// refererがnullの場合　
// refererがnullの場合
[null, false],
// referer!=$siteDomainの場合
["/baser/admin", false],
Expand Down
Loading