Skip to content

Reject appended plaintext listener parameters #1517

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
M0nd0R wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −6
Open

Reject appended plaintext listener parameters #1517

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
18 changes: 18 additions & 0 deletions wicket-core-tests/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,24 @@ void bookmarkablePageForceEncryptionOfRequestListener()
assertNull(mapper.mapRequest(getRequest(plainUrl)));
}

/**
* Tests that plaintext IRequestListener parameters cannot be appended to an otherwise
* encrypted bookmarkable page URL.
*/
@Test
void bookmarkablePageForceEncryptionOfAppendedRequestListener()
{
PageAndComponentProvider provider = new PageAndComponentProvider(Page2.class, "link");
IRequestHandler requestHandler = new BookmarkableListenerRequestHandler(provider);
Url plainListenerUrl = mapper.getDelegateMapper().mapHandler(requestHandler);
Url encryptedUrl = mapper.mapHandler(
new RenderPageRequestHandler(new PageProvider(Page2.class, new PageParameters())));

encryptedUrl.getQueryParameters().addAll(plainListenerUrl.getQueryParameters());

assertNull(mapper.mapRequest(getRequest(encryptedUrl)));
}

/**
* Tests that URLs for page instances are encrypted (/wicket/page?5)
*/
Expand Down
20 changes: 14 additions & 6 deletions wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,12 +531,20 @@ protected Url decryptEntireUrl(final Request request, final Url encryptedUrl)
{
// modified or additional segment
url.getSegments().add(encryptedUrl.getSegments().get(segNo));
}

url.getQueryParameters().addAll(originalUrl.getQueryParameters());
// WICKET-4923 additional parameters
url.getQueryParameters().addAll(encryptedUrl.getQueryParameters());

}

for (Url.QueryParameter queryParameter : encryptedUrl.getQueryParameters())
{
if (MapperUtils.parsePageComponentInfoParameter(queryParameter) != null)
{
return null;
}
}

url.getQueryParameters().addAll(originalUrl.getQueryParameters());
// WICKET-4923 additional parameters
url.getQueryParameters().addAll(encryptedUrl.getQueryParameters());

return url;
}

Expand Down