Skip to content

Fix missing escape in RFC2396 validation #53

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
empwilli merged 2 commits into from
Oct 30, 2026
Merged

Fix missing escape in RFC2396 validation #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f320ca
Fix missing escape in semantic patching
empwilli Mar 24, 2026
76f7eac
Fix missing escape in RFC2396 validation
empwilli Mar 24, 2026
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
30 changes: 25 additions & 5 deletions dev_scripts/semantic-patching/src/main/java/aas_core_works/PatchVerification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ public static void main(String[] args) {
return;
}

VariableDeclarator expectedPatternDecl = null;
VariableDeclarator serverDecl = null;
VariableDeclarator uriReferenceDecl = null;
ReturnStmt expectedReturnStmt = null;

for (Statement statement : constructMethod.getBody().get().getStatements()) {
Expand All @@ -96,7 +97,10 @@ public static void main(String[] args) {

if (expression.toString().equals(
"String uriReference = \"^(\" + absoluteuri + \"|\" + relativeuri + \")?(#\" + fragment + \")?$\"")) {
expectedPatternDecl = varDeclExpr.getVariable(0);
uriReferenceDecl = varDeclExpr.getVariable(0);
} else if (expression.toString().equals(
"String server = \"((\" + userinfo + \"@)?\" + hostport + \")?\"")) {
serverDecl = varDeclExpr.getVariable(0);
}
}
} else if (statement.isReturnStmt()) {
Expand All @@ -108,7 +112,18 @@ public static void main(String[] args) {
}
}

if (expectedPatternDecl == null) {
if (serverDecl == null) {
System.err.println(
"The constructMatchesRfc2396 lacks the "
+ "String server = \"((\" + userinfo + \"@)?\" + hostport + \")?\""
+ "statement in "
+ sourcePath
);
System.exit(1);
return;
}

if (uriReferenceDecl == null) {
System.err.println(
"The constructMatchesRfc2396 lacks the "
+ "'String uriReference = \"^(\" + absoluteuri + \"|\" + relativeuri + \")?(#\" + fragment + \")?$\"' "
Expand All @@ -128,8 +143,13 @@ public static void main(String[] args) {
return;
}

expectedPatternDecl.setInitializer(
"\"(\" + absoluteuri + \"|\" + relativeuri + \")?(#\" + fragment + \")?\""
// NOTE (empwilli): we take care to also escape # and @ characters; these
// carry special meaning in Automaton.
serverDecl.setInitializer(
"\"((\" + userinfo + \"\\\\@)?\" + hostport + \")?\""
);
uriReferenceDecl.setInitializer(
"\"(\" + absoluteuri + \"|\" + relativeuri + \")?(\\\\#\" + fragment + \")?\""
);

expectedReturnStmt.setExpression(
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/aas_core/aas3_0/verification/Verification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ private static Automaton constructMatchesRfc2396() {
String host = "(" + hostname + "|" + ipv4address + ")";
String port = "[0-9]*";
String hostport = host + "(:" + port + ")?";
String server = "((" + userinfo + "@)?" + hostport + ")?";
String server = "((" + userinfo + "\\@)?" + hostport + ")?";
String regName = "(" + unreserved + "|" + escaped + "|[$,;:@&=+])+";
String authority = "(" + server + "|" + regName + ")";
String netPath = "//" + authority + "(" + absPath + ")?";
Expand All @@ -196,7 +196,7 @@ private static Automaton constructMatchesRfc2396() {
String relSegment = "(" + unreserved + "|" + escaped + "|[;@&=+$,])+";
String relPath = relSegment + "(" + absPath + ")?";
String relativeuri = "(" + netPath + "|" + absPath + "|" + relPath + ")(\\?" + query + ")?";
String uriReference = "(" + absoluteuri + "|" + relativeuri + ")?(#" + fragment + ")?";
String uriReference = "(" + absoluteuri + "|" + relativeuri + ")?(\\#" + fragment + ")?";
return new RegExp(uriReference).toAutomaton();
}

Expand Down
Loading