Skip to content

fix #4274 【システム】管理画面URLを変更している場合、ユーザーグループのアクセスルールが正しく機能しない #4395

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 2 commits into from
May 29, 2026
+34 −13
Merged

fix #4274 【システム】管理画面URLを変更している場合、ユーザーグループのアクセスルールが正しく機能しない #4395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fafb17e
fix #4274 【システム】管理画面URLを変更している場合、ユーザーグループのアクセスルールが正しく機能しない
kaburk May 22, 2026
4b18112
fix #4274 【システム】管理画面URLを変更している場合、ユーザーグループのアクセスルールが正しく機能しない
kaburk May 29, 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
31 changes: 18 additions & 13 deletions plugins/baser-core/src/Service/PermissionsService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
use BaserCore\Annotation\Checked;
use BaserCore\Annotation\Note;
use Cake\Routing\Router;
use Cake\Utility\Inflector;

/**
* Class PermissionsService
Expand Down Expand Up @@ -493,14 +492,6 @@ private function checkGroup(
if ($type === 1) return true;
}

// URLのプレフィックスを標準の文字列に戻す
foreach(Configure::read('BcPrefixAuth') as $key => $value) {
$prefixAreas = Configure::read('BcApp.' . Inflector::variable($key) . 'Prefix');
if(!$prefixAreas) continue;
$regex = '/^' . preg_quote('/' . Configure::read('BcApp.baserCorePrefix') . '/' . $prefixAreas . '/', '/') . '/';
$url = preg_replace($regex, '/baser/' . Inflector::underscore($key) . '/', $url);
}

return $this->isAuthorized($prefixAuthSetting['permissionType'], $url, $method, $groupPermission);
}

Expand Down Expand Up @@ -555,10 +546,24 @@ public function convertRegexUrl(string $url)
$url = str_replace('{loginUserId}', $user->id, $url);
}
}
$prefix = BcUtil::getPrefix();
if($prefix !== '/baser/admin') {
$url = preg_replace('/^\/baser\/admin/', BcUtil::getPrefix(), $url);
}
$baserCorePrefix = BcUtil::getBaserCorePrefix();
$apiPrefix = Configure::read('BcApp.apiPrefix');
$adminPrefix = BcUtil::getAdminPrefix();
$apiAdminAlias = Configure::read('BcPrefixAuth.Api/Admin.alias') ?: '/' . $apiPrefix . '/admin';
$adminAlias = Configure::read('BcPrefixAuth.Admin.alias') ?: '/' . $adminPrefix;
// DB に保存された標準プレフィックス(/baser/api/admin, /baser/admin)を
// .env の設定値に基づく実際のプレフィックスに変換する
$url = preg_replace(
[
'/^\/baser\/' . preg_quote($apiPrefix, '/') . '\/admin/',
'/^\/baser\/admin/',
],
[
'/' . $baserCorePrefix . $apiAdminAlias,
'/' . $baserCorePrefix . $adminAlias,
],
$url
Comment thread
ryuring marked this conversation as resolved.
);
$pattern = preg_quote($url, '/');
$pattern = str_replace('\*', '.*?', $pattern);
return '/^' . str_replace('\/.*?', '(|\/.*?)', $pattern) . '$/is';
Expand Down
16 changes: 16 additions & 0 deletions plugins/baser-core/tests/TestCase/Service/PermissionsServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,22 @@ public function testConvertRegexUrl(): void
$expected = '/^\/admin\/posts(|\/.*?)$/is';
$result = $this->PermissionsService->convertRegexUrl($url);
$this->assertEquals($expected, $result);

// DB保存の標準プレフィックスが実際のprefix aliasに変換されることを確認
$baserCorePrefix = BcUtil::getBaserCorePrefix();
$adminAlias = Configure::read('BcPrefixAuth.Admin.alias');
$apiAdminAlias = Configure::read('BcPrefixAuth.Api/Admin.alias');

$url = '/baser/admin/baser-core/contents/index';
$expected = '/^\/' . preg_quote($baserCorePrefix . $adminAlias . '/baser-core/contents/index', '/') . '$/is';
$result = $this->PermissionsService->convertRegexUrl($url);
$this->assertEquals($expected, $result);

$url = '/baser/api/admin/baser-core/contents/index.json';
$expected = '/^\/' . preg_quote($baserCorePrefix . $apiAdminAlias . '/baser-core/contents/index.json', '/') . '$/is';
$result = $this->PermissionsService->convertRegexUrl($url);
$this->assertEquals($expected, $result);

}

/**
Expand Down
Loading