feat(jd-database): 京东数据库写权限收窄到平台超管(编辑/删除/归类/分类管理)

2026-11-16 用户口径「京东数据库只有超管有编辑删除权限」:读(列表/类目/详情/分类列表)仍按 admin_jd_database 菜单权限放行;写(编辑、上传/替换图片、单行删除、批量删除、批量归类、分类新建/改名/删除)在菜单权限之上再要求平台超管(DeviceSessionPolicy#isSuper 只认站点 super_admin,company_super_admin 不在内),非超管 403。后端照 BrandGatingController#requirePlatformSuperAdmin / AdminDeviceLogController#requireSuperAdmin 同一判据;前端非超管隐藏勾选列/操作列/删除勾选/店铺分类入口并显示只读提示,列表/筛选/详情照常可用。判据:AdminJdProductControllerTest 新增读写分档结构钉+非超管 403 行为钉(商品五条写路由+分类三条写路由),挂载契约新增非超管只读/超管写入口两条。
This commit is contained in:
2026-11-16 18:54:26 +08:00
parent 5aab38cfa9
commit 8413cd335e
6 changed files with 270 additions and 25 deletions
@@ -57,15 +57,18 @@ import java.util.List;
*
* <p>鉴权照外观专利只读页私有 {@code requireXxxAccess} 形状:JWT → 内部令牌回退 → 超管放行 →
* 非超管菜单权限(column_key/route_path 双匹配)。菜单行由 V196 只插 columns 不预授权
* ⇒ 默认仅 super_admin 可见可访问,其余角色由超管在权限页手工勾授后才放行。</p>
* ⇒ 默认仅 super_admin 可见可访问,其余角色由超管在权限页手工勾授后才放行。
* <b>2026-11-16 起读/写分档</b>:读(列表/类目/详情)按上面的菜单口径放行;写(编辑/上传图片/
* 删除/批量删除/批量归类)在菜单口径之上再要求平台超管,非超管一律 403(前端同窗隐藏写入口)。</p>
*
* <p><b>公司口径(2026-11-16 用户定案「删除掉公司 tab,参考品牌数据库」)</b>:读侧零公司
* 维度——company_id 请求参数与 {@code superAdminScopedCompanyId} 谓词已随公共化收尾整批
* 摘除(2026-11-15 定案「京东数据库不区分公司、属于公共的」的最后一截),行上的 company_id
* 只剩「哪家公司客户端同步的」来源标记,不构成可见性边界;每个拿到本页菜单权限的管理员
* (含站点超管)看到同一份全量公共库。详情与写侧(编辑/删除)同样没有公司维度:
* 对全部公共行可编辑可删除(同商品类目「谁都能改」的 2026-10-06 定案形状),写侧端点的
* company_id 传参已随 2026-11-15 公共化摘除。</p>
* 对全部公共行可编辑可删除,但<b>写动作只对平台超管开放</b>(2026-11-16 用户口径
* 「京东数据库只有超管有编辑删除权限」,见 {@code requirePlatformSuperAdminWrite}),
* 写侧端点的 company_id 传参已随 2026-11-15 公共化摘除。</p>
*
* <p>导出端点已随 2026-11-15 客户口径「导出也不用」整段下线(控制器/服务/mapper 参数一起删);
* {@code sale_status} 查询参数同窗撤掉(商品状态筛选框已从前端下线)。店铺筛选参数
@@ -148,7 +151,7 @@ public class AdminJdProductController {
@Parameter(description = "商品行 id") @PathVariable("id") Long id,
@Valid @RequestBody JdProductUpdateRequest body,
HttpServletRequest request) {
RequestOperator operator = requireJdAccess(request);
RequestOperator operator = requirePlatformSuperAdminWrite(request);
Long updatedId = jdProductUpdateService.update(id, body);
log.info("[jd-product] 编辑商品 operatorId={} id={} title={}",
operator.id(), updatedId, body.getTitle());
@@ -172,7 +175,7 @@ public class AdminJdProductController {
@Parameter(description = "替换目标图片登记行 id(缺省=新增)")
@RequestParam(value = "replace_image_id", required = false) Long replaceImageId,
HttpServletRequest request) {
RequestOperator operator = requireJdAccess(request);
RequestOperator operator = requirePlatformSuperAdminWrite(request);
Long updatedId = jdProductUpdateService.uploadImage(id, file, imageType, attrName, replaceImageId);
log.info("[jd-product] 上传图片 operatorId={} id={} replaceImageId={} imageType={}",
operator.id(), updatedId, replaceImageId, imageType);
@@ -187,7 +190,7 @@ public class AdminJdProductController {
public ApiResponse<JdProductDeleteVo> delete(
@Parameter(description = "商品行 id") @PathVariable("id") Long id,
HttpServletRequest request) {
RequestOperator operator = requireJdAccess(request);
RequestOperator operator = requirePlatformSuperAdminWrite(request);
JdProductDeleteVo vo = jdProductDeleteService.delete(List.of(id));
// 管理端破坏性动作必须留痕:谁、删了哪些行、桶里清了几个对象(同分组删除口径)。
log.info("[jd-product] 删除商品 operatorId={} id={} deleted={} objectsDeleted={}",
@@ -204,7 +207,7 @@ public class AdminJdProductController {
public ApiResponse<Integer> batchAssignGroup(
@Valid @RequestBody JdProductBatchAssignGroupRequest body,
HttpServletRequest request) {
RequestOperator operator = requireJdAccess(request);
RequestOperator operator = requirePlatformSuperAdminWrite(request);
int updated = jdProductUpdateService.assignGroup(body.getIds(), body.getGroupId());
// 管理端写动作必须留痕:谁、把多少行归到哪个分类(null=移出分类)。
log.info("[jd-product] 批量归类 operatorId={} requested={} updated={} groupId={}",
@@ -218,7 +221,7 @@ public class AdminJdProductController {
public ApiResponse<JdProductDeleteVo> batchDelete(
@Valid @RequestBody JdProductBatchDeleteRequest body,
HttpServletRequest request) {
RequestOperator operator = requireJdAccess(request);
RequestOperator operator = requirePlatformSuperAdminWrite(request);
JdProductDeleteVo vo = jdProductDeleteService.delete(body.getIds());
log.info("[jd-product] 批量删除商品 operatorId={} requested={} deleted={} objectsDeleted={} kept={}",
operator.id(), body.getIds().size(), vo.getDeleted(),
@@ -238,6 +241,28 @@ public class AdminJdProductController {
return new RequestOperator(operator.getId(), superAdmin, operator);
}
/**
* 写端点的越权闸(2026-11-16 用户口径「京东数据库只有超管有编辑删除权限」)。
*
* <p>读保持菜单权限口径(拿到 {@code admin_jd_database} 列权限的管理员可见同一份公共库),
* 写(编辑 / 上传图片 / 单行删除 / 批量删除 / 批量归类)收窄到<b>平台超级管理员</b>:
* 与 {@code BrandGatingController#requirePlatformSuperAdmin}、
* {@code AdminDeviceLogController#requireSuperAdmin} 同一判据(
* {@code DeviceSessionPolicy#isSuper} 只认站点 super_admin,公司超管不在内)。</p>
*
* <p>写动作会置人工编辑锁({@code manual_locked=1})并物理删除桶内图片,属影响全平台公共
* 数据的动作,故不随读权限下放;非超管拿到 403 时前端已不渲染这些入口,本闸是兜底。</p>
*/
private RequestOperator requirePlatformSuperAdminWrite(HttpServletRequest request) {
RequestOperator operator = requireJdAccess(request);
if (!operator.superAdmin()) {
log.warn("[jd-product] 非平台超管写操作被拒 operatorId={} role={}",
operator.id(), adminAuthSupport.currentRole(operator.user()));
throw new BusinessException(403, "仅平台超级管理员可以编辑或删除京东数据库数据");
}
return operator;
}
private AdminUserEntity resolveOperator(HttpServletRequest request) {
try {
return adminAuthSupport.requireUser(request);
@@ -37,7 +37,9 @@ import java.util.List;
* 都不再引用,新行按 DEFAULT 0 落「平台公共」。</p>
*
* <p>鉴权与 {@code AdminJdProductController} 同款私有闸(同一 column_key/route_path):
* 普通授权用户可读写分组(AC-9),默认仅 super_admin。</p>
* 列表按菜单权限放行;<b>写(新建/改名/删除)2026-11-16 起收窄到平台超管</b>(用户口径
* 「京东数据库只有超管有编辑删除权限」——分类是全平台一份的公共数据,普通授权用户只看不写),
* 默认仅 super_admin。</p>
*/
@RestController
@RequiredArgsConstructor
@@ -66,7 +68,7 @@ public class AdminJdProductGroupController {
public ApiResponse<Long> create(
@Valid @RequestBody JdProductGroupSaveRequest body,
HttpServletRequest request) {
RequestOperator operator = requireJdAccess(request);
RequestOperator operator = requirePlatformSuperAdminWrite(request);
Long id = jdProductGroupService.create(body.getName(), body.getSortOrder());
log.info("[jd-product-group] 新建分组 operatorId={} groupId={}", operator.id(), id);
return ApiResponse.success(id);
@@ -79,7 +81,7 @@ public class AdminJdProductGroupController {
@Parameter(description = "分组 id") @PathVariable("id") Long id,
@Valid @RequestBody JdProductGroupSaveRequest body,
HttpServletRequest request) {
RequestOperator operator = requireJdAccess(request);
RequestOperator operator = requirePlatformSuperAdminWrite(request);
jdProductGroupService.rename(id, body.getName(), body.getSortOrder());
log.info("[jd-product-group] 分组改名 operatorId={} groupId={}", operator.id(), id);
return ApiResponse.success(Boolean.TRUE);
@@ -91,7 +93,7 @@ public class AdminJdProductGroupController {
public ApiResponse<Integer> delete(
@Parameter(description = "分组 id") @PathVariable("id") Long id,
HttpServletRequest request) {
RequestOperator operator = requireJdAccess(request);
RequestOperator operator = requirePlatformSuperAdminWrite(request);
int detached = jdProductGroupService.delete(id);
// 管理端破坏性动作必须留痕:谁、删了哪个分组、脱组了多少商品。
log.info("[jd-product-group] 删除分组 operatorId={} groupId={} detached={}",
@@ -111,6 +113,21 @@ public class AdminJdProductGroupController {
return new RequestOperator(operator.getId(), superAdmin, operator);
}
/**
* 写端点(新建/改名/删除)的越权闸:在菜单权限之上再要求平台超管,判据与
* {@code AdminJdProductController#requirePlatformSuperAdminWrite} 逐字同源
* (读列表仍按菜单权限放行)。
*/
private RequestOperator requirePlatformSuperAdminWrite(HttpServletRequest request) {
RequestOperator operator = requireJdAccess(request);
if (!operator.superAdmin()) {
log.warn("[jd-product-group] 非平台超管写操作被拒 operatorId={} role={}",
operator.id(), adminAuthSupport.currentRole(operator.user()));
throw new BusinessException(403, "仅平台超级管理员可以修改京东数据库分类");
}
return operator;
}
private AdminUserEntity resolveOperator(HttpServletRequest request) {
try {
return adminAuthSupport.requireUser(request);
@@ -7,7 +7,10 @@ import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.jd.mapper.JdProductImageMapper;
import com.nanri.aiimage.modules.jd.mapper.JdProductMapper;
import com.nanri.aiimage.modules.jd.model.dto.JdProductBatchAssignGroupRequest;
import com.nanri.aiimage.modules.jd.model.dto.JdProductBatchDeleteRequest;
import com.nanri.aiimage.modules.jd.model.dto.JdProductGroupSaveRequest;
import com.nanri.aiimage.modules.jd.model.dto.JdProductUpdateRequest;
import com.nanri.aiimage.modules.jd.model.entity.JdProductEntity;
import com.nanri.aiimage.modules.jd.model.entity.JdProductImageEntity;
import com.nanri.aiimage.modules.jd.model.entity.JdProductSkuEntity;
@@ -16,13 +19,16 @@ import com.nanri.aiimage.modules.jd.model.vo.JdProductDeleteVo;
import com.nanri.aiimage.modules.jd.model.vo.JdProductDetailVo;
import com.nanri.aiimage.modules.jd.model.vo.JdProductPageVo;
import com.nanri.aiimage.modules.jd.service.JdProductDeleteService;
import com.nanri.aiimage.modules.jd.service.JdProductGroupService;
import com.nanri.aiimage.modules.jd.service.JdProductQueryService;
import com.nanri.aiimage.modules.jd.service.JdProductUpdateService;
import com.nanri.aiimage.modules.permission.model.vo.PermissionMenuItemVo;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import jakarta.servlet.http.HttpServletRequest;
import org.apache.ibatis.annotations.Mapper;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.math.BigDecimal;
@@ -174,17 +180,144 @@ class AdminJdProductControllerTest {
@Test
void 分组控制器与同款鉴权闸就位() throws IOException {
assertTrue(Files.exists(GROUP_CONTROLLER),
"分组控制器必须落在 " + GROUP_CONTROLLER + "(AC-9:普通授权用户可读写分组)");
"分组控制器必须落在 " + GROUP_CONTROLLER);
String source = stripComments(Files.readString(GROUP_CONTROLLER));
assertTrue(source.contains("/api/admin/jd-product-groups"), "分组端点必须挂在 /api/admin/jd-product-groups");
for (String seam : List.of("requireUser", "X-Internal-Token", "isSuper",
"getUserColumnPermissions", COLUMN_KEY, ROUTE_PATH, "requireJdAccess")) {
assertTrue(source.contains(seam), "分组鉴权闸缺接缝 " + seam + "(与商品页同款)");
}
// 普通(非超管)授权用户可读写分组:菜单双匹配那道闸在两个控制器上逐字同源。
// 读列表按菜单权限放行,写(新建/改名/删除)2026-11-16 起收窄到平台超管(用户口径
// 「京东数据库只有超管有编辑删除权限」;AC-9「普通授权用户可读写分组」已被该口径推翻)。
for (String verb : List.of("@PostMapping", "@PutMapping", "@DeleteMapping")) {
assertTrue(source.contains(verb), "分组 CRUD 必须有 " + verb + "(AC-9)");
assertTrue(source.contains(verb), "分组 CRUD 必须有 " + verb);
}
assertEquals(3, count(source, "requirePlatformSuperAdminWrite(request)"),
"分组列表外的三个写端点都必须走超管写闸");
assertEquals(2, count(source, "requireJdAccess(request)"),
"分组列表与写闸内部各走一处菜单权限正门");
assertTrue(source.contains("仅平台超级管理员可以修改京东数据库分类"),
"非超管写分类的 403 文案必须点名平台超管");
}
// ===================== 写权限分档(2026-11-16) =====================
/** 写端点越权闸的结构判据:五条写路由逐条走 requirePlatformSuperAdminWrite,读三条仍走菜单正门。 */
@Test
void 商品页读写权限分档_写端点逐条走超管闸() throws IOException {
String source = stripComments(Files.readString(CONTROLLER));
assertEquals(5, count(source, "requirePlatformSuperAdminWrite(request)"),
"编辑/上传图片/单行删除/批量归类/批量删除五条写路由必须逐条走超管写闸");
assertEquals(4, count(source, "requireJdAccess(request)"),
"列表/类目/详情三条读路由与写闸内部共四处菜单权限正门");
assertTrue(source.contains("仅平台超级管理员可以编辑或删除京东数据库数据"),
"非超管写商品的 403 文案必须点名平台超管");
assertTrue(source.contains("operator.superAdmin()"),
"写闸必须在菜单口径之上再判 superAdmin(只放行站点超管,公司超管不在内)");
}
@Test
void 非超管有菜单权限时读放行_写一律403且不触服务() {
JdProductQueryService queryService = mock(JdProductQueryService.class);
JdProductDeleteService deleteService = mock(JdProductDeleteService.class);
JdProductUpdateService updateService = mock(JdProductUpdateService.class);
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
PermissionMenuService permissionMenuService = mock(PermissionMenuService.class);
AdminJdProductController controller = new AdminJdProductController(
queryService, deleteService, updateService, authSupport, permissionMenuService);
AdminUserEntity operator = new AdminUserEntity();
operator.setId(9L);
operator.setUsername("company-admin");
HttpServletRequest request = mock(HttpServletRequest.class);
when(authSupport.requireUser(request)).thenReturn(operator);
// 非超管(管理员 / 公司超管同形):拿到 admin_jd_database 菜单权限后读可进、写仍拒。
when(authSupport.currentRole(operator)).thenReturn("admin");
PermissionMenuItemVo grant = new PermissionMenuItemVo();
grant.setColumnKey(COLUMN_KEY);
grant.setRoutePath(ROUTE_PATH);
when(permissionMenuService.getUserColumnPermissions(9L, "admin")).thenReturn(List.of(grant));
// 读:菜单权限命中即放行(公共库一人一份全量)。
JdProductPageVo pageVo = new JdProductPageVo();
pageVo.setItems(List.of());
when(queryService.page(1L, 20L, null, null, null, null, null, null)).thenReturn(pageVo);
assertEquals(Boolean.TRUE, controller.page(1L, 20L, null, null, null, null, null, null, request).isSuccess(),
"非超管有菜单权限时读必须放行(读写分档只收窄写)");
// 写:五条写入口一律 403,且业务服务一次都没被调到(不能「先写再拒」)。
JdProductUpdateRequest updateBody = new JdProductUpdateRequest();
updateBody.setTitle("标题");
BusinessException updateEx = assertThrows(BusinessException.class,
() -> controller.update(11L, updateBody, request));
assertTrue(updateEx.getMessage().contains("仅平台超级管理员"), "编辑被拒文案点名平台超管");
BusinessException deleteEx = assertThrows(BusinessException.class,
() -> controller.delete(11L, request));
assertTrue(deleteEx.getMessage().contains("仅平台超级管理员"));
JdProductBatchDeleteRequest batchBody = new JdProductBatchDeleteRequest();
batchBody.setIds(List.of(11L, 12L));
BusinessException batchEx = assertThrows(BusinessException.class,
() -> controller.batchDelete(batchBody, request));
assertTrue(batchEx.getMessage().contains("仅平台超级管理员"));
JdProductBatchAssignGroupRequest assignBody = new JdProductBatchAssignGroupRequest();
assignBody.setIds(List.of(11L));
assignBody.setGroupId(3L);
BusinessException assignEx = assertThrows(BusinessException.class,
() -> controller.batchAssignGroup(assignBody, request));
assertTrue(assignEx.getMessage().contains("仅平台超级管理员"),
"批量归类会置人工编辑锁=写动作,必须同闸");
BusinessException uploadEx = assertThrows(BusinessException.class,
() -> controller.uploadImage(11L, mock(MultipartFile.class), "MAIN", null, null, request));
assertTrue(uploadEx.getMessage().contains("仅平台超级管理员"),
"上传/替换图片改桶内对象=写动作,必须同闸");
verify(updateService, never()).update(any(), any());
verify(updateService, never()).uploadImage(any(), any(), any(), any(), any());
verify(updateService, never()).assignGroup(any(), any());
verify(deleteService, never()).delete(any());
}
@Test
void 非超管有菜单权限时分组写一律403_读列表仍放行() {
JdProductGroupService groupService = mock(JdProductGroupService.class);
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
PermissionMenuService permissionMenuService = mock(PermissionMenuService.class);
AdminJdProductGroupController controller = new AdminJdProductGroupController(
groupService, authSupport, permissionMenuService);
AdminUserEntity operator = new AdminUserEntity();
operator.setId(9L);
HttpServletRequest request = mock(HttpServletRequest.class);
when(authSupport.requireUser(request)).thenReturn(operator);
when(authSupport.currentRole(operator)).thenReturn("admin");
PermissionMenuItemVo grant = new PermissionMenuItemVo();
grant.setColumnKey(COLUMN_KEY);
when(permissionMenuService.getUserColumnPermissions(9L, "admin")).thenReturn(List.of(grant));
when(groupService.list()).thenReturn(List.of());
assertEquals(Boolean.TRUE, controller.list(request).isSuccess(),
"分类列表是读端点,菜单权限命中即放行(筛选下拉要能用)");
JdProductGroupSaveRequest saveBody = new JdProductGroupSaveRequest();
saveBody.setName("新分类");
saveBody.setSortOrder(0);
BusinessException createEx = assertThrows(BusinessException.class,
() -> controller.create(saveBody, request));
assertTrue(createEx.getMessage().contains("仅平台超级管理员"));
BusinessException renameEx = assertThrows(BusinessException.class,
() -> controller.rename(7L, saveBody, request));
assertTrue(renameEx.getMessage().contains("仅平台超级管理员"));
BusinessException deleteEx = assertThrows(BusinessException.class,
() -> controller.delete(7L, request));
assertTrue(deleteEx.getMessage().contains("仅平台超级管理员"));
verify(groupService, never()).create(any(), any());
verify(groupService, never()).rename(any(), any(), any());
verify(groupService, never()).delete(any());
}
// ===================== 行为样本 =====================
@@ -661,4 +794,13 @@ class AdminJdProductControllerTest {
}
return out.toString();
}
/** 判据里的出现次数(逐字匹配,非正则)。 */
private static int count(String text, String needle) {
int n = 0;
for (int i = text.indexOf(needle); i >= 0; i = text.indexOf(needle, i + needle.length())) {
n++;
}
return n;
}
}