Skip to content

feat: rex matched single words #137

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
Aaron3S merged 1 commit into from
Oct 16, 2025
Merged

feat: rex matched single words #137

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
27 changes: 19 additions & 8 deletions ...ramework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ private void handleDataMasking(SQLQueryResult result) {
var maskRules = new HashMap<Integer, Common.DataMaskingRule>();
for (var i = 0; i < result.getFields().size(); i++) {
for (Common.DataMaskingRule rule : rules) {
if (matchFiled(result.getFields().get(i), rule.getFieldsPattern())) {
if (this.matchField(result.getFields().get(i), rule.getFieldsPattern())) {
maskIndexes.add(i);
maskRules.put(i, rule);
}
Expand All @@ -236,21 +236,32 @@ private void handleDataMasking(SQLQueryResult result) {
}
}

private boolean matchFiled(Field field, String pattern) {
var names = List.of(field.getColumnName(), field.getLabel());
var ps = pattern.split(",");
private boolean matchField(Field field, String pattern) {
List<String> names = List.of(field.getColumnName(), field.getLabel());
String[] ps = pattern.split(",");

for (String name : names) {
for (String p : ps) {
p = p.trim();
if (p.isEmpty()) continue;

try {
int flags = Pattern.UNICODE_CASE | Pattern.CASE_INSENSITIVE;
var pa = Pattern.compile(p, flags);
if (pa.matcher(name).find()) {
// 先整体转义，避免用户写的正则符号被误解释
String regex = Pattern.quote(p);
// 把被转义的 \* 恢复为 .*
regex = regex.replace("\\*", ".*");
// 加上锚点，实现整串匹配
regex = "^" + regex + "$";

int flags = Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE;
Pattern pa = Pattern.compile(regex, flags);

if (pa.matcher(name).matches()) { // 注意：用 matches() 而不是 find()
return true;
}
} catch (PatternSyntaxException e) {
return false;
// 忽略坏模式，继续下一个
continue;
}
}
}
Expand Down