scriptoriumadmin/skillhub
1
0
Fork 0
mirror of https://github.com/iflytek/skillhub.git synced 2026-09-10 22:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(validation): preserve wrapper expression boundaries

Browse source 
Signed-off-by: XiaoSeS <87064762+XiaoSeS@users.noreply.github.com>
This commit is contained in:
XiaoSeS 2026-09-08 12:25:29 +08:00
parent 52969c997c
commit a6aa073627
2 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/validation/BasicPrePublishValidator.java
View file

@ -131,10 +131,10 @@ public class BasicPrePublishValidator implements PrePublishValidator {
return new GenericValueScan(null, line.length());
}
int quotedStart = findQuotedLiteralStart(line, start);
char first = line.charAt(quotedStart);
QuotedLiteralStart quotedStart = findQuotedLiteralStart(line, start);
char first = line.charAt(quotedStart.index());
if (first == '\'' || first == '"') {
return scanQuotedLiteral(line, quotedStart, first);
return scanQuotedLiteral(line, quotedStart.index(), first, quotedStart.wrapperDepth());
}
int end = start;
@ -149,20 +149,23 @@ public class BasicPrePublishValidator implements PrePublishValidator {
return new GenericValueScan(literal, end);
}
private int findQuotedLiteralStart(String line, int start) {
private QuotedLiteralStart findQuotedLiteralStart(String line, int start) {
int index = start;
int wrapperDepth = 0;
while (index < line.length() && line.charAt(index) == '(') {
wrapperDepth++;
index++;
while (index < line.length() && Character.isWhitespace(line.charAt(index))) {
index++;
}
}
return index < line.length() && (line.charAt(index) == '\'' || line.charAt(index) == '"')
? index
: start;
? new QuotedLiteralStart(index, wrapperDepth)
: new QuotedLiteralStart(start, 0);
}
private GenericValueScan scanQuotedLiteral(String line, int start, char quote) {
private GenericValueScan scanQuotedLiteral(
String line, int start, char quote, int wrapperDepth) {
boolean escaped = false;
for (int i = start + 1; i < line.length(); i++) {
char current = line.charAt(i);
@ -176,7 +179,7 @@ public class BasicPrePublishValidator implements PrePublishValidator {
}
if (current == quote) {
String value = line.substring(start + 1, i);
String literal = hasLiteralTerminator(line, i + 1)
String literal = hasLiteralTerminator(line, i + 1, wrapperDepth)
&& value.length() >= MIN_GENERIC_SECRET_LENGTH
? value
: null;
@ -186,8 +189,14 @@ public class BasicPrePublishValidator implements PrePublishValidator {
return new GenericValueScan(null, line.length());
}
private boolean hasLiteralTerminator(String line, int startIndex) {
private boolean hasLiteralTerminator(String line, int startIndex, int wrapperDepth) {
int index = skipWhitespace(line, startIndex);
for (int i = 0; i < wrapperDepth; i++) {
if (index == line.length() || line.charAt(index) != ')') {
return false;
}
index = skipWhitespace(line, index + 1);
}
if (isLiteralTerminatorAt(line, index)) {
return true;
}
@ -238,5 +247,7 @@ public class BasicPrePublishValidator implements PrePublishValidator {
private record GenericValueScan(String literal, int nextSearchIndex) {}
private record QuotedLiteralStart(int index, int wrapperDepth) {}
private record SecretRule(Pattern pattern, int valueGroup, String label) {}
}

4
server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/validation/BasicPrePublishValidatorTest.java
View file

@ -114,8 +114,10 @@ class BasicPrePublishValidatorTest {
access_token = token_v2
access_token = configuredToken123
refresh_token = foo123bar456
token = ("static-prefix-") + configuredToken
access_token = ("static_prefix_") + configured_token
""".getBytes(StandardCharsets.UTF_8),
371,
476,
"text/x-python"
);