feat(auth): C2 数据权限最小真实现替换桩(保真层原样移植)

把 framework 的数据行级权限实现原样移植进保真层 platform-legacy-core
(包名 com.dsasp 不动),删除 platform-auth 的不过滤桩,由真实现接管
@Service("dataPrivilegeService"):

- DataPrivilegeServiceImpl(226 行):getWhereClause 按 ctx.ROLES 匹配
  SYS_FILTERRULE 规则拼 " AND (...)" 行级过滤;无角色命中抛 PrivilegeException。
- DataFilterHelper(110 行):FILTERRULE(Conditional[])JSON 互转,用 Jackson 1.x
  (org.codehaus.jackson),保真纪律不改写为 Jackson 2;父 pom + legacy-core pom
  引入 jackson-mapper-asl:1.9.13。
- MethodSecurityInterceptor 注解(被 Impl 引用,原样拷入)。
- 删除 StubDataPrivilegeService(与新 Bean 重名冲突);platform-auth/README.md
  说明 dataPrivilegeService 已由保真层接管、P2 在此做组织/权限整体真实现。
- 单测 9 用例(DataFilterHelper JSON 互转 + getWhereClause 拼接,假 POJOInfo)。

全模块 mvn clean install 通过,ArchUnit 仍绿。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-06-11 00:10:49 +08:00
parent 48430e4853
commit fc867dc110
9 changed files with 877 additions and 33 deletions

View File

@@ -0,0 +1,18 @@
package com.dsasp.server.common.privilege.bean;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface MethodSecurityInterceptor {
String name();
String tableName();
boolean isControl();
}

View File

@@ -0,0 +1,110 @@
package com.dsasp.server.privilege.bean;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.node.ArrayNode;
import com.dsasp.server.common.dataDic.bean.GeneralPOJO;
import com.dsasp.server.common.exception.ValidationException;
import com.dsasp.server.common.privilege.bean.Conditional;
import com.dsasp.server.common.privilege.bean.DataFilterRule;
import com.dsasp.server.common.util.StringUtil;
public class DataFilterHelper {
/**
*
* @param po
* entity rule
* @param info
* entity info
* @return
*/
public static DataFilterRule converToDataFilterRule(GeneralPOJO po) {
if (po != null && "SYS_FILTERRULE".equals(po.get_TableName())) {
DataFilterRule rule = new DataFilterRule();
rule.setId(po.get_ID());
List<String> roles = (List<String>) po.get_Value("ROLES");
//无效设置,忽略
if(roles == null || roles.size() == 0){
return null;
}
rule.setRoles(roles);
rule.setConditionalList(convertJsonToConditional((String) po
.get_Value("FILTERRULE")));
return rule;
}
return null;
}
public static List<Conditional> convertJsonToConditional(String json) {
ObjectMapper objectMapper = new ObjectMapper();
List<Conditional> list = new ArrayList<Conditional>();
try {
if (!StringUtil.isEmpty(json) && !"null".equals(json)) {
JsonNode rules = objectMapper.readTree(json);
ArrayNode nodes = (ArrayNode) rules;
if (nodes != null && nodes.size() > 0) {
for (JsonNode node : nodes) {
Conditional c = objectMapper.readValue(node,
Conditional.class);
list.add(c);
}
}
}
} catch (Exception ex) {
throw new ValidationException("规则解析异常");
}
return list;
}
public static Map<String, Object> convertDataRuleToMap(DataFilterRule rule,
String entityId) {
Map<String, Object> map = new HashMap<String, Object>();
map.put("SYS_FILTERRULE_ID", rule.getId());
map.put("ENTITYID", entityId);
map.put("ROLES", rule.getRoles());
map.put("FILTERRULE",
convertConditionalToJson(rule.getConditionalList()));
return map;
}
private static String convertConditionalToJson(List<Conditional> list) {
ObjectMapper objectMapper = new ObjectMapper();
StringWriter w = new StringWriter();
try {
objectMapper.writeValue(w, list);
return w.getBuffer().toString();
} catch (Exception ex) {
throw new ValidationException("条件转换json格式异常");
}
}
// public static void main(String[] args) {
// ObjectMapper objectMapper = new ObjectMapper();
// Conditional c = new Conditional();
// c.setBackConditional("3");
// c.setOp("OR");
// c.setPreConditional("field");
// c.setSign("=");
// c.setType("NUMBER");
// try {
// StringBuffer a = new StringBuffer();
// StringWriter w = new StringWriter();
// objectMapper.writeValue(w, c);
// objectMapper.writeValue(System.out, c);
//
// Conditional cond = objectMapper.readValue(w.getBuffer().toString(),
// Conditional.class);
// System.out.println(cond);
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
}

View File

@@ -0,0 +1,226 @@
package com.dsasp.server.privilege.service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.dsasp.server.common.core.service.SpringBeanOsgiServices;
import com.dsasp.server.common.dataDic.bean.AbstractPOJOInfo;
import com.dsasp.server.common.dataDic.bean.GeneralPOJO;
import com.dsasp.server.common.dataDic.bean.POJOInfo;
import com.dsasp.server.common.dataDic.bean.SysConfig;
import com.dsasp.server.common.dataDic.service.POJOCRUDService;
import com.dsasp.server.common.exception.PrivilegeException;
import com.dsasp.server.common.exception.ValidationException;
import com.dsasp.server.common.privilege.bean.Conditional;
import com.dsasp.server.common.privilege.bean.DataFilterRule;
import com.dsasp.server.common.privilege.bean.MethodSecurityInterceptor;
import com.dsasp.server.common.privilege.service.DataPrivilegeService;
import com.dsasp.server.common.user.service.LoggedInUser;
import com.dsasp.server.common.util.StringUtil;
import com.dsasp.server.common.util.UserSession;
import com.dsasp.server.privilege.bean.DataFilterHelper;
@Service(value = "dataPrivilegeService")
@Transactional
public class DataPrivilegeServiceImpl implements DataPrivilegeService {
@Override
public String getWhereClause(Properties ctx, String tableName) {
if (!tableName.startsWith("SYS_FILTERRULE")) {
POJOInfo info = AbstractPOJOInfo.getPOInfo(tableName);
List<DataFilterRule> list = info.getDataFilterRules();
if (list != null && list.size() > 0) {
StringBuffer filterBuffer = new StringBuffer();
String tableDisplayName = info.getTableDisplayName();
filterBuffer.append(" AND ( ");
boolean first = true;
for (DataFilterRule rule : list) {
if (isContainsRole((List<String>) ctx.get("ROLES"),
rule.getRoles(), tableDisplayName)) {
if(first){
first = false;
}else{
filterBuffer.append(" OR ");
}
List<Conditional> condition = rule.getConditionalList();
getFilterSql(filterBuffer, condition, info, ctx);
}
}
filterBuffer.append(" )");
if (first) {
throw new PrivilegeException("没有" + tableDisplayName
+ "数据访问权限");
} else {
return filterBuffer.toString();
}
}
}
return null;
}
private void getFilterSql(StringBuffer filterBuffer, List<Conditional> list, POJOInfo info, Properties ctx){
if(list == null || list.size() == 0){
filterBuffer.append(" ( 1=1 ) ");
return ;
}
filterBuffer.append(" (");
for(Conditional cond : list){
if(StringUtil.isEmpty(cond.getPreConditional())
|| StringUtil.isEmpty(cond.getSign())
|| StringUtil.isEmpty(cond.getType())
|| StringUtil.isEmpty(cond.getBackConditional())){
filterBuffer.append(" 1=1 ").append(GeneralPOJO.AND);
continue;
}
filterBuffer.append(" P.").append(cond.getPreConditional()).append(" ");
String currentUser = StringUtil.TO_STRING((String)ctx.get(LoggedInUser.CURRENTUSER), 0);
String currentDepart = StringUtil.TO_STRING((String)ctx.get(LoggedInUser.CURRENTDEPART), 0);
String currentOrg = StringUtil.TO_STRING((String)ctx.get(LoggedInUser.CURRENTORG), 0);
if(Conditional.CURRENTUSER.equals(cond.getType())){
filterBuffer.append(cond.getSign()).append(currentUser);
}else if(Conditional.CURRENTUSERDEPART.equals(cond.getType())){
filterBuffer.append(cond.getSign()).append(currentDepart);
}else if(Conditional.CURRENTUSERORG.equals(cond.getType())){
filterBuffer.append(cond.getSign()).append(currentOrg);
}else if(Conditional.SPECIALDEPART.equals(cond.getType()) || Conditional.SPECAILORG.equals(cond.getType())){
filterBuffer.append(Conditional.SIGN_CONTAIN).append("(").append(StringUtil.convertSplitStrToSql(cond.getBackConditional())).append(") ");
}else{
String ownProjectWhere = " (" + SysConfig.getConfigValue("com.dsasp.server.privilege.OwnProjectWhere") + ") ";
ownProjectWhere = ownProjectWhere.replaceAll("\\{" + Conditional.CURRENTUSER + "\\}", currentUser);
if(Conditional.OWNNERPROJECT.equals(cond.getType())){
filterBuffer.append(Conditional.SIGN_CONTAIN).append(ownProjectWhere);
} else {
filterBuffer
.append(cond.getSign())
.append(cond
.getBackConditional()
.replaceAll(
"\\{" + Conditional.CURRENTUSER + "\\}",
currentUser)
.replaceAll(
"\\{" + Conditional.CURRENTUSERDEPART
+ "\\}", currentDepart)
.replaceAll(
"\\{" + Conditional.CURRENTUSERORG
+ "\\}", currentOrg).replaceAll("\\{" + Conditional.OWNNERPROJECT + "\\}", ownProjectWhere));
}
}
if(!StringUtil.isEmpty(cond.getOp())){
filterBuffer.append(" ").append(cond.getOp());
}
}
String str = filterBuffer.toString();
if(str.endsWith(GeneralPOJO.AND)){
filterBuffer.delete(str.length() - 4, str.length());
}else if(str.endsWith(GeneralPOJO.OR)){
filterBuffer.delete(str.length() - 3, str.length());
}
filterBuffer.append(")");
}
private boolean isContainsRole(List<String> currentUserRoles, List<String> ruleRoles, String tableDisplayName){
if(ruleRoles != null){
for(String role : ruleRoles){
if(currentUserRoles.contains(role)){
return true;
}
}
}else{
throw new PrivilegeException(tableDisplayName + "权限配置错误");
}
return false;
}
/**
* update the entity all rules
* @param entityId
* @param list
* @param ctx
*/
@Override
@MethodSecurityInterceptor(name="数据过滤保存", tableName="SYS_FILTERRULE", isControl = true)
public void saveOrUpdateDataPrivilege(String entityId,
List<DataFilterRule> list, Properties ctx) {
POJOCRUDService service = (POJOCRUDService) SpringBeanOsgiServices
.getInstance().getBeanByName("pojoCRUDService");
List<DataFilterRule> oldList = getEntityDataFilterRule(entityId);
if (list != null && list.size() > 0) {
for (DataFilterRule rule : list) {
boolean isExist = removeContain(oldList, rule);
Map<String, Object> map = DataFilterHelper
.convertDataRuleToMap(rule, entityId);
List<String> roles = rule.getRoles();
if(roles == null || roles.size() == 0){
throw new ValidationException("角色不能为空");
}
if (isExist) {
service.update(map, "SYS_FILTERRULE", ctx);
} else {
service.save(map, "SYS_FILTERRULE", ctx);
}
}
}
if (oldList != null && oldList.size() > 0) {
for (DataFilterRule rule : oldList) {
service.delete(rule.getId(), "SYS_FILTERRULE", ctx);
}
}
AbstractPOJOInfo.setChangePOInfo(entityId);
}
/**
* does old list contain the rule , if contains is true and remove it from old list , or is false
* @param oldList
* @param rule
* @return
*/
private boolean removeContain(List<DataFilterRule> oldList,
DataFilterRule rule) {
if (oldList != null && oldList.size() > 0 && rule != null
&& !StringUtil.isEmpty(rule.getId())) {
for (DataFilterRule oldRule : oldList) {
if (rule.getId().equals(oldRule.getId())) {
oldList.remove(oldRule);
return true;
}
}
}
return false;
}
/**
* get entity all the rule
* @param entityId
* @return
*/
@Override
public List<DataFilterRule> getEntityDataFilterRule(String entityId){
List<DataFilterRule> rules = new ArrayList<DataFilterRule>();
POJOCRUDService service = (POJOCRUDService)SpringBeanOsgiServices.getInstance().getBeanByName("pojoCRUDService");
Map<String, Object> map = new HashMap<String, Object>();
map.put("ENTITYID", entityId);
List<GeneralPOJO> list = (List<GeneralPOJO>)service.listSelect(map, "SYS_FILTERRULE", UserSession.getAdmin()).get(POJOCRUDService.LIST_RESULT);
if(list != null && list.size() > 0){
GeneralPOJO entity = service.loadPOJO(entityId, "SYS_ENTITY", null, false);
for (GeneralPOJO po : list) {
po = service
.loadPOJO(po.get_ID(), "SYS_FILTERRULE", UserSession.get(), true);
DataFilterRule rule = DataFilterHelper.converToDataFilterRule(po);
if(rule != null){
rules.add(rule);
}
}
}
return rules;
}
}