Skip to content

Do not route the internal (v3Internal) API through the external router #16154

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

Open
evilgensec wants to merge 2 commits into
base: develop
Choose a base branch
from
+14 −1
Open

Do not route the internal (v3Internal) API through the external router #16154

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
2db4270
Do not route the internal (v3Internal) API through the external router
evilgensec May 30, 2026
9a28e18
Update cdap-gateway/src/main/java/io/cdap/cdap/gateway/router/RouterP…
evilgensec May 30, 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
8 changes: 8 additions & 0 deletions cdap-gateway/src/main/java/io/cdap/cdap/gateway/router/RouterPathLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ public RouteDestination getRoutingService(String requestPath, HttpRequest httpRe
.stream(Splitter.on('/').omitEmptyStrings().split(requestPath).spliterator(), false)
.toArray(String[]::new);

if (uriParts.length == 0) {
return APP_FABRIC_HTTP;
}
if (uriParts[0].equals(Constants.Gateway.INTERNAL_API_VERSION_3_TOKEN)) {
// The internal API is for service-to-service calls over internal service
// discovery and must never be reachable through the external router.
return DONT_ROUTE;
}
Comment thread
evilgensec marked this conversation as resolved.
if (uriParts[0].equals(Constants.Gateway.API_VERSION_3_TOKEN)) {
return getV3RoutingService(uriParts, requestMethod);
}
Expand Down
7 changes: 6 additions & 1 deletion cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/RouterPathLookupTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,13 @@ public void testAppLifecycleAndWorkflowPaths() {

@Test
public void testProgramLifecycleInternalAndAppLifecycleInternalPaths() {
// The internal (v3Internal) API is for service-to-service calls over internal
// discovery and must not be routed from the external router.
assertRouting("v3Internal/namespaces//apps//versions//workflows/DataPipelineWorkflow/runs/",
RouterPathLookup.APP_FABRIC_HTTP);
RouterPathLookup.DONT_ROUTE);
assertRouting("v3Internal/namespaces/default/apps/app/states/key", RouterPathLookup.DONT_ROUTE);
assertRouting("v3Internal/namespaces/default/apps/app/preferences", RouterPathLookup.DONT_ROUTE);
assertRouting("v3Internal/location/some/abs/path", RouterPathLookup.DONT_ROUTE);
}

@Test
Expand Down