Skip to content

Issue #12828 support relative uris for Response.encodeURI #12833

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
janbartel merged 1 commit into from
Feb 28, 2025
Merged

Issue #12828 support relative uris for Response.encodeURI #12833

Show file tree
Hide file tree
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
36 changes: 27 additions & 9 deletions jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,9 +714,6 @@ public String encodeURI(Request request, String uri, boolean cookiesInUse)

String id = session.getExtendedId();

if (httpURI == null)
httpURI = HttpURI.from(uri);

// Already encoded
int prefix = uri.indexOf(sessionURLPrefix);
if (prefix != -1)
Expand All @@ -735,16 +732,37 @@ public String encodeURI(Request request, String uri, boolean cookiesInUse)
int suffix = uri.indexOf('?');
if (suffix < 0)
suffix = uri.indexOf('#');

if (suffix < 0)
{
return uri +
((HttpScheme.HTTPS.is(httpURI.getScheme()) || HttpScheme.HTTP.is(httpURI.getScheme())) && httpURI.getPath() == null ? "/" : "") + //if no path, insert the root path
sessionURLPrefix + id;
if (URIUtil.isRelative(uri))
{
return uri + sessionURLPrefix + id;
}
else
{
if (httpURI == null)
httpURI = HttpURI.from(uri);

return uri +
((HttpScheme.HTTPS.is(httpURI.getScheme()) || HttpScheme.HTTP.is(httpURI.getScheme())) && httpURI.getPath() == null ? "/" : "") + //if no path, insert the root path
sessionURLPrefix + id;
}
}

return uri.substring(0, suffix) +
((HttpScheme.HTTPS.is(httpURI.getScheme()) || HttpScheme.HTTP.is(httpURI.getScheme())) && httpURI.getPath() == null ? "/" : "") + //if no path so insert the root path
sessionURLPrefix + id + uri.substring(suffix);
if (URIUtil.isRelative(uri))
{
return uri.substring(0, suffix) + sessionURLPrefix + id + uri.substring(suffix);
}
else
{
if (httpURI == null)
httpURI = HttpURI.from(uri);

return uri.substring(0, suffix) +
((HttpScheme.HTTPS.is(httpURI.getScheme()) || HttpScheme.HTTP.is(httpURI.getScheme())) && httpURI.getPath() == null ? "/" : "") + //if no path so insert the root path
sessionURLPrefix + id + uri.substring(suffix);
}
}

@Override
Expand Down
19 changes: 17 additions & 2 deletions jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/SessionHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,13 @@ public boolean handle(Request request, Response response, Callback callback)
out.append("Attribute ").append(name).append(" = ").append(session.getAttribute(name)).append('\n');
out.append("URI [")
.append(session.encodeURI(request, "/some/path", request.getHeaders().contains(HttpHeader.COOKIE)))
.append("]");
.append("]\n");
out.append("RELATIVE URI [")
.append(session.encodeURI(request, "../", request.getHeaders().contains(HttpHeader.COOKIE)))
.append("]\n");
out.append("ABSOLUTE URI [")
.append(session.encodeURI(request, "http://localhost:80/foo/bar/", request.getHeaders().contains(HttpHeader.COOKIE)))
.append("]\n");
}
else
{
Expand Down Expand Up @@ -488,6 +494,8 @@ public void testCookieAndURI() throws Exception
String content = response.getContent();
assertThat(content, startsWith("Session="));
assertThat(content, containsString("URI [/some/path;session_id=%s]".formatted(id))); // Cookies not known to be in use
assertThat(content, containsString("RELATIVE URI [../;session_id=%s]".formatted(id))); // Cookies not known to be in use
assertThat(content, containsString("ABSOLUTE URI [http://localhost:80/foo/bar/;session_id=%s]".formatted(id))); // Cookies not known to be in use

// Get with cookie
endPoint.addInput("""
Expand All @@ -503,6 +511,8 @@ public void testCookieAndURI() throws Exception
content = response.getContent();
assertThat(content, containsString("Session=" + id.substring(0, id.indexOf(".node0"))));
assertThat(content, containsString("URI [/some/path]")); // Cookies known to be in use
assertThat(content, containsString("RELATIVE URI [../]"));
assertThat(content, containsString("ABSOLUTE URI [http://localhost:80/foo/bar/"));

// Get with parameter
endPoint.addInput("""
Expand All @@ -517,6 +527,8 @@ public void testCookieAndURI() throws Exception
content = response.getContent();
assertThat(content, containsString("Session=" + id.substring(0, id.indexOf(".node0"))));
assertThat(content, containsString("URI [/some/path;session_id=%s]".formatted(id))); // Cookies not in use
assertThat(content, containsString("RELATIVE URI [../;session_id=%s]".formatted(id)));
assertThat(content, containsString("ABSOLUTE URI [http://localhost:80/foo/bar/;session_id=%s]".formatted(id)));

// Get with both, but param wrong
endPoint.addInput("""
Expand All @@ -532,6 +544,8 @@ public void testCookieAndURI() throws Exception
content = response.getContent();
assertThat(content, containsString("Session=" + id.substring(0, id.indexOf(".node0"))));
assertThat(content, containsString("URI [/some/path]")); // Cookies known to be in use
assertThat(content, containsString("RELATIVE URI [../]"));
assertThat(content, containsString("ABSOLUTE URI [http://localhost:80/foo/bar/]"));

// Get with both, but cookie wrong
endPoint.addInput("""
Expand All @@ -547,6 +561,8 @@ public void testCookieAndURI() throws Exception
content = response.getContent();
assertThat(content, containsString("Session=" + id.substring(0, id.indexOf(".node0"))));
assertThat(content, containsString("URI [/some/path]")); // Cookies known to be in use
assertThat(content, containsString("RELATIVE URI [../]"));
assertThat(content, containsString("ABSOLUTE URI [http://localhost:80/foo/bar/]"));
}
}

Expand Down Expand Up @@ -789,5 +805,4 @@ public void testFlushOnResponseCommit() throws Exception
assertThat(content, containsString("Session=" + id.substring(0, id.indexOf(".node0"))));
assertThat(content, containsString("attribute = value"));
}

}