security(P0②): buildCtx JWT 身份权威,关 asUser/roles 冒充提权(IDOR)

EntityController 与孪生 PickerController 的 buildCtx 调换优先级:JWT 已绑定的认证身份恒优先,客户端 asUser/roles 仅在无 JWT 身份时(非生产旁路)生效。杜绝已认证用户传 asUser=他人/roles=ADMIN 冒充提权读越权数据。PickerController 实例由独立安全评审揪出(原架构评审 under-scope)。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-25 11:41:21 +08:00
parent 24160db684
commit 1f2365fa26
4 changed files with 117 additions and 19 deletions

View File

@@ -218,7 +218,21 @@ public class EntityController {
* </ol> * </ol>
*/ */
private Properties buildCtx(String asUser, String roles, String asDepart, String asOrg) { private Properties buildCtx(String asUser, String roles, String asDepart, String asOrg) {
// 1) 显式 asUser 测试通道优先(保持 C2 既有行为不变) // P0 修复(2026-06-24 架构评审):JWT 已绑定的认证身份【权威】,一律优先于客户端传入的
// asUser/roles —— 杜绝「已认证用户传 asUser=他人 / roles=ADMIN 冒充提权」(IDOR + 越权)。
//
// 1) JWT 过滤器已绑定的请求级身份(任何非空 CURRENTUSER,含 ADMIN)→ 直接复用,忽略 asUser/roles。
// 含 ADMIN:认证为 ADMIN 即用 ADMIN 自身视角(引擎对 ADMIN 不做行级过滤),asUser 同样不生效。
Properties bound = UserSession.get();
if (bound != null) {
String cu = bound.getProperty(LoggedInUser.CURRENTUSER);
if (cu != null && !cu.isBlank()) {
return bound;
}
}
// 2) 无 JWT 身份时的 asUser/roles 测试通道。【仅非生产 permitAll 旁路可达】:严格链要求认证,
// 带令牌必经上面第 1 步;故在 prod / 默认严格链下,匿名请求根本进不来,本分支结构上不可达。
// 供对拍框架免令牌按指定用户/角色重放(驱动 POJOCRUDServiceImpl 行级过滤)。
if (asUser != null && !asUser.isBlank()) { if (asUser != null && !asUser.isBlank()) {
Properties ctx = new Properties(); Properties ctx = new Properties();
ctx.setProperty(LoggedInUser.CURRENTUSER, asUser); ctx.setProperty(LoggedInUser.CURRENTUSER, asUser);
@@ -241,14 +255,6 @@ public class EntityController {
ctx.put(LoggedInUser.ROLES, roleList); ctx.put(LoggedInUser.ROLES, roleList);
return ctx; return ctx;
} }
// 2) JWT 过滤器已绑定的请求级上下文(非 ADMIN 真实用户)→ 复用,驱动行级过滤
Properties bound = UserSession.get();
if (bound != null) {
String cu = bound.getProperty(LoggedInUser.CURRENTUSER);
if (cu != null && !cu.isBlank() && !LoggedInUser.ADMIN.trim().equals(cu.trim())) {
return bound;
}
}
// 3) 默认 ADMIN 视角(无令牌、无 asUser) // 3) 默认 ADMIN 视角(无令牌、无 asUser)
return UserSession.getAdmin(); return UserSession.getAdmin();
} }

View File

@@ -859,14 +859,27 @@ public class PickerController {
} }
/** /**
* 行级权限上下文构造,与 {@link EntityController#buildCtx} 同口径(三级优先): * 行级权限上下文构造,与 {@link EntityController#buildCtx} 同口径(JWT 身份权威):
* <ol> * <ol>
* <li>显式 {@code asUser}(对拍测试通道)→ 非 ADMIN 视角,触发行级过滤;</li> * <li>JWT 过滤器已绑定的请求级身份(任何非空 CURRENTUSER,含 ADMIN)→ 直接复用,忽略 asUser/roles;</li>
* <li>JWT 过滤器已绑定的请求级上下文(真实用户,非 ADMIN)→ 复用;</li> * <li>无 JWT 身份时的 asUser/roles 测试通道(仅非生产 permitAll 旁路可达,供对拍免令牌重放);</li>
* <li>都没有 → ADMIN 视角(不过滤)。</li> * <li>都没有 → ADMIN 视角(不过滤)。</li>
* </ol> * </ol>
*
* <p>P0 修复(2026-06-24 架构评审 followup,安全评审揪出的 EntityController 孪生实例):
* JWT 已绑定的认证身份【权威】,一律优先于客户端传入的 asUser/roles——杜绝「已认证用户传
* asUser=他人 / roles=ADMIN 经 picker list/resolve 冒充提权读取越权数据」(IDOR + 越权)。
*/ */
private Properties buildCtx(String asUser, String roles, String asDepart, String asOrg) { private Properties buildCtx(String asUser, String roles, String asDepart, String asOrg) {
// 1) JWT 绑定身份恒优先(含 ADMIN),忽略客户端 asUser/roles
Properties bound = UserSession.get();
if (bound != null) {
String cu = bound.getProperty(LoggedInUser.CURRENTUSER);
if (cu != null && !cu.isBlank()) {
return bound;
}
}
// 2) 无 JWT 身份时的 asUser/roles 测试通道(仅非生产旁路可达;prod 严格链要求认证,结构上不可达)
if (asUser != null && !asUser.isBlank()) { if (asUser != null && !asUser.isBlank()) {
Properties ctx = new Properties(); Properties ctx = new Properties();
ctx.setProperty(LoggedInUser.CURRENTUSER, asUser); ctx.setProperty(LoggedInUser.CURRENTUSER, asUser);
@@ -887,13 +900,7 @@ public class PickerController {
ctx.put(LoggedInUser.ROLES, roleList); ctx.put(LoggedInUser.ROLES, roleList);
return ctx; return ctx;
} }
Properties bound = UserSession.get(); // 3) 默认 ADMIN 视角
if (bound != null) {
String cu = bound.getProperty(LoggedInUser.CURRENTUSER);
if (cu != null && !cu.isBlank() && !LoggedInUser.ADMIN.trim().equals(cu.trim())) {
return bound;
}
}
return UserSession.getAdmin(); return UserSession.getAdmin();
} }

View File

@@ -24,6 +24,8 @@ import org.springframework.jdbc.core.JdbcTemplate;
import com.dsasp.server.common.dataDic.bean.GeneralPOJO; import com.dsasp.server.common.dataDic.bean.GeneralPOJO;
import com.dsasp.server.common.dataDic.service.POJOCRUDService; import com.dsasp.server.common.dataDic.service.POJOCRUDService;
import com.dsasp.server.common.user.service.LoggedInUser;
import com.dsasp.server.common.util.UserSession;
import com.eip4.platform.metadata.security.IdentifierWhitelist; import com.eip4.platform.metadata.security.IdentifierWhitelist;
import com.eip4.platform.metadata.security.IdentifierWhitelistExceptionHandler; import com.eip4.platform.metadata.security.IdentifierWhitelistExceptionHandler;
import com.eip4.platform.metadata.security.IllegalIdentifierException; import com.eip4.platform.metadata.security.IllegalIdentifierException;
@@ -165,6 +167,56 @@ class EntityControllerWhitelistTest {
assertFalse(String.valueOf(resp.getBody().get("msg")).contains("'")); assertFalse(String.valueOf(resp.getBody().get("msg")).contains("'"));
} }
@Test
@SuppressWarnings("unchecked")
void P0_JWT身份权威_忽略客户端asUser冒充提权() {
IdentifierWhitelist wl = mock(IdentifierWhitelist.class);
POJOCRUDService engine = mock(POJOCRUDService.class);
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(new HashMap<>());
EntityController c = new EntityController(engine, wl,
mock(JdbcTemplate.class), mock(PickerController.class));
// 模拟 JwtAuthFilter 已绑定真实非 ADMIN 用户 userA 到引擎上下文
Properties jwtBound = new Properties();
jwtBound.setProperty(LoggedInUser.CURRENTUSER, "userA");
UserSession.set(jwtBound);
try {
// 攻击:已认证 userA 传 asUser=ADMIN&roles=ADMIN 试图冒充提权
c.list(TABLE, 1, 10, "ADMIN", "ADMIN", null, null, null, null, new HashMap<>());
ArgumentCaptor<Properties> ctxCap = ArgumentCaptor.forClass(Properties.class);
verify(engine).listSelect(any(), eq(TABLE), ctxCap.capture());
Properties used = ctxCap.getValue();
assertEquals("userA", used.getProperty(LoggedInUser.CURRENTUSER),
"必须以 JWT 身份 userA 为准,绝不采用客户端 asUser=ADMIN");
assertFalse(used.containsKey(LoggedInUser.ROLES),
"客户端 roles=ADMIN 必须被忽略,不得注入 ADMIN 角色");
} finally {
UserSession.remove();
}
}
@Test
@SuppressWarnings("unchecked")
void 无JWT身份时asUser测试通道仍生效_对拍依赖() {
IdentifierWhitelist wl = mock(IdentifierWhitelist.class);
POJOCRUDService engine = mock(POJOCRUDService.class);
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(new HashMap<>());
EntityController c = new EntityController(engine, wl,
mock(JdbcTemplate.class), mock(PickerController.class));
// 无 JWT 绑定(对拍免令牌路径):asUser/roles 通道生效
UserSession.remove();
c.list(TABLE, 1, 10, "userB", "ROLE_X", null, null, null, null, new HashMap<>());
ArgumentCaptor<Properties> ctxCap = ArgumentCaptor.forClass(Properties.class);
verify(engine).listSelect(any(), eq(TABLE), ctxCap.capture());
Properties used = ctxCap.getValue();
assertEquals("userB", used.getProperty(LoggedInUser.CURRENTUSER),
"无 JWT 身份时 asUser 测试通道生效(对拍框架依赖)");
assertEquals(List.of("ROLE_X"), used.get(LoggedInUser.ROLES));
}
/** 单字段 GeneralPOJO 桩:主键 + 一个引用列 MENUROOT=值。 */ /** 单字段 GeneralPOJO 桩:主键 + 一个引用列 MENUROOT=值。 */
private static GeneralPOJO refRow(String id, String menuRoot) { private static GeneralPOJO refRow(String id, String menuRoot) {
GeneralPOJO p = mock(GeneralPOJO.class); GeneralPOJO p = mock(GeneralPOJO.class);

View File

@@ -32,6 +32,7 @@ import com.dsasp.server.common.dataDic.bean.SYS_Entity;
import com.dsasp.server.common.dataDic.service.DataDicService; import com.dsasp.server.common.dataDic.service.DataDicService;
import com.dsasp.server.common.dataDic.service.POJOCRUDService; import com.dsasp.server.common.dataDic.service.POJOCRUDService;
import com.dsasp.server.common.user.service.LoggedInUser; import com.dsasp.server.common.user.service.LoggedInUser;
import com.dsasp.server.common.util.UserSession;
import com.dsasp.server.common.exception.PrivilegeException; import com.dsasp.server.common.exception.PrivilegeException;
import com.eip4.platform.metadata.flow.UserColumnResolver; import com.eip4.platform.metadata.flow.UserColumnResolver;
import com.eip4.platform.metadata.security.IdentifierWhitelist; import com.eip4.platform.metadata.security.IdentifierWhitelist;
@@ -319,6 +320,38 @@ class PickerControllerTest {
assertTrue(roles.contains("role-a") && roles.contains("role-b")); assertTrue(roles.contains("role-a") && roles.contains("role-b"));
} }
@Test
@DisplayName("6b. P0:JWT 身份权威 → 忽略客户端 asUser/roles 冒充提权(EntityController 孪生修复)")
void jwtIdentityOverridesClientAsUser() {
POJOCRUDService engine = mock(POJOCRUDService.class);
DataDicService dic = mock(DataDicService.class);
IdentifierWhitelist wl = mock(IdentifierWhitelist.class);
when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE);
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(engineResult());
seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(),
new UserColumnResolver(emptyTemplateJdbc()));
// 模拟 JwtAuthFilter 已绑定真实用户 userA 到引擎上下文
Properties jwtBound = new Properties();
jwtBound.setProperty(LoggedInUser.CURRENTUSER, "userA");
UserSession.set(jwtBound);
try {
// 攻击:已认证 userA 经 picker 传 asUser=victim&roles=ADMIN 试图冒充提权
c.list(REF_ID, null, 1, 20, null, null, null, "victim", "ADMIN", null, null, null);
ArgumentCaptor<Properties> ctxCap = ArgumentCaptor.forClass(Properties.class);
verify(engine).listSelect(any(), eq(TABLE), ctxCap.capture());
Properties ctx = ctxCap.getValue();
assertEquals("userA", ctx.getProperty(LoggedInUser.CURRENTUSER),
"必须以 JWT 身份 userA 为准,绝不采用客户端 asUser=victim");
assertFalse(ctx.containsKey(LoggedInUser.ROLES),
"客户端 roles=ADMIN 必须被忽略,不得注入 ADMIN 角色");
} finally {
UserSession.remove(); // 防 ThreadLocal 泄漏污染同线程其余用例
}
}
@Test @Test
@DisplayName("7. 引用实体无主键 → 拒绝作选择窗数据源(400)") @DisplayName("7. 引用实体无主键 → 拒绝作选择窗数据源(400)")
void rejectsEntityWithoutKey() { void rejectsEntityWithoutKey() {