Skip to content

fix: adjust regex to prevent ReDos vulnerability #677

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
radrt merged 2 commits into from
Feb 27, 2026
Merged

fix: adjust regex to prevent ReDos vulnerability #677

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
630d523
fix: fix regex vulnerability
radrt Feb 9, 2026
3b43fa2
Merge branch 'main' into fix-regex
radrt Feb 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
16 changes: 8 additions & 8 deletions src/main/java/io/neonbee/entity/AbstractEntityVerticle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public abstract class AbstractEntityVerticle<T> extends DataVerticle<T> {
*/
@VisibleForTesting
static final Pattern URI_PATH_PATTERN =
Pattern.compile("^/*((?:(.*)\\.)?(.*?))/(([A-Za-z_]\\w+).*?)(?:(?<=\\))/(.*))?$");
Pattern.compile("^/*((?:(.+/?)\\.)?([^/]+))/(([A-Za-z_]\\w+)[^/]*)(?:/(.*))?$");

private static final LoggingFacade LOGGER = LoggingFacade.create();

Expand Down Expand Up @@ -224,13 +224,13 @@ public static String getName(Class<? extends AbstractEntityVerticle> clazz) {
*/
@Override
public void start(Promise<Void> promise) {
vertx.eventBus().consumer(EVENT_BUS_MODELS_LOADED_ADDRESS, message -> {
announceEntityVerticle(vertx).onFailure(throwable -> {
if (LOGGER.isErrorEnabled()) {
LOGGER.error("Updating announcements of entity verticle {} failed", getQualifiedName(), throwable);
}
});
});
vertx.eventBus().consumer(EVENT_BUS_MODELS_LOADED_ADDRESS,
message -> announceEntityVerticle(vertx).onFailure(throwable -> {
if (LOGGER.isErrorEnabled()) {
LOGGER.error("Updating announcements of entity verticle {} failed", getQualifiedName(),
throwable);
}
}));
announceEntityVerticle(vertx).compose(nothing -> Future.<Void>future(super::start))
.onSuccess(nothing -> {
if (LOGGER.isInfoEnabled()) {
Expand Down
32 changes: 14 additions & 18 deletions src/test/java/io/neonbee/entity/EntityVerticleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,14 @@ void registerEntityTypes(VertxTestContext testContext) {
Checkpoint checkpoint = testContext.checkpoint(2);
registry.get(sharedEntityMapName(new FullQualifiedName("ERP.Customers")))
.onComplete(testContext.succeeding(result -> {
testContext.verify(() -> {
assertThat((JsonArray) result).containsExactly(entityVerticleImpl1.getQualifiedName(),
entityVerticleImpl2.getQualifiedName());
});
testContext.verify(() -> assertThat(result).containsExactly(entityVerticleImpl1.getQualifiedName(),
entityVerticleImpl2.getQualifiedName()));
checkpoint.flag();
}));
registry.get(sharedEntityMapName(new FullQualifiedName("Sales.Orders")))
.onComplete(testContext.succeeding(result -> {
testContext.verify(() -> {
assertThat((JsonArray) result).containsExactly(entityVerticleImpl1.getQualifiedName());
});
testContext
.verify(() -> assertThat(result).containsExactly(entityVerticleImpl1.getQualifiedName()));
checkpoint.flag();
}));
}
Expand All @@ -116,13 +113,6 @@ void queryVerticlesForEntityType(Vertx vertx, VertxTestContext testContext) {
void testEntityURIPathRegex() {
Matcher matcher;

assertThat((matcher = URI_PATH_PATTERN.matcher("my.very/own.Service/Entity")).find()).isTrue();
assertThat(matcher.group()).isEqualTo("my.very/own.Service/Entity");
assertThat(matcher.group(SERVICE_NAMESPACE_GROUP)).isEqualTo("my.very/own.Service");
assertThat(matcher.group(CDS_NAMESPACE_GROUP)).isEqualTo("my.very/own");
assertThat(matcher.group(CDS_SERVICE_NAME_GROUP)).isEqualTo("Service");
assertThat(matcher.group(ENTITY_SET_NAME_GROUP)).isEqualTo("Entity");

assertThat((matcher = URI_PATH_PATTERN.matcher("my.Service/Entity")).find()).isTrue();
assertThat(matcher.group()).isEqualTo("my.Service/Entity");
assertThat(matcher.group(SERVICE_NAMESPACE_GROUP)).isEqualTo("my.Service");
Expand All @@ -148,6 +138,13 @@ void testEntityURIPathRegex() {

assertThat((matcher = URI_PATH_PATTERN.matcher("Service/Entity/$count")).find()).isTrue();
assertThat(matcher.group(ENTITY_SET_NAME_GROUP)).isEqualTo("Entity");

assertThat((matcher = URI_PATH_PATTERN.matcher("my.very/own.Service/Entity")).find()).isTrue();
assertThat(matcher.group()).isEqualTo("my.very/own.Service/Entity");
assertThat(matcher.group(SERVICE_NAMESPACE_GROUP)).isEqualTo("my.very/own.Service");
assertThat(matcher.group(CDS_NAMESPACE_GROUP)).isEqualTo("my.very/own");
assertThat(matcher.group(CDS_SERVICE_NAME_GROUP)).isEqualTo("Service");
assertThat(matcher.group(ENTITY_SET_NAME_GROUP)).isEqualTo("Entity");
}

@Test
Expand Down Expand Up @@ -229,9 +226,8 @@ public Future<Set<FullQualifiedName>> entityTypeNames() {
}
};

deployVerticle(dummyEntityVerticle).onComplete(testContext.succeeding(nextHandler -> {
testVertx.eventBus().publish(EntityModelManager.EVENT_BUS_MODELS_LOADED_ADDRESS, null);
}));
deployVerticle(dummyEntityVerticle).onComplete(testContext.succeeding(
nextHandler -> testVertx.eventBus().publish(EntityModelManager.EVENT_BUS_MODELS_LOADED_ADDRESS, null)));
}

@Test
Expand All @@ -245,7 +241,7 @@ void testqueryWithSpecialCharacters(Vertx vertx, VertxTestContext testContext) {
entityVerticleImpl1.parseUriInfo(vertx, dataQuery).onSuccess(uriInfo -> {
assertThat(uriInfo).isNotNull();
testContext.completeNow();
}).onFailure(t -> testContext.failNow(t));
}).onFailure(testContext::failNow);
}
}

Expand Down
Loading