This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git
The following commit(s) were added to refs/heads/master by this push:
new ca7dd7e SLING-10554: The check for valid requests should not fail on
a resolution path that is null (#16)
ca7dd7e is described below
commit ca7dd7e3ad37209ef0a1e7eca4435ee4c67018b7
Author: Karl Pauls <[email protected]>
AuthorDate: Fri Jun 25 13:28:33 2021 +0200
SLING-10554: The check for valid requests should not fail on a resolution
path that is null (#16)
---
src/main/java/org/apache/sling/engine/impl/request/RequestData.java | 2 +-
.../java/org/apache/sling/engine/impl/request/RequestDataTest.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
b/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
index 24e6ff6..70874ed 100644
--- a/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
+++ b/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
@@ -595,7 +595,7 @@ public class RequestData {
return false;
}
}
- return !PREVENT_TRAVERSAL.matcher(resourcePath).matches();
+ return resourcePath == null ||
!PREVENT_TRAVERSAL.matcher(resourcePath).matches();
}
// ---------- Content inclusion stacking
-----------------------------------
diff --git
a/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
b/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
index 2a27812..c3a6ce5 100644
--- a/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
@@ -166,6 +166,11 @@ public class RequestDataTest {
}
@Test
+ public void testNullResolutionPath() {
+ assertValidRequest(true, null);
+ }
+
+ @Test
public void testDotsAnd5B() {
assertValidRequest(false, "/a/..[[./b");
assertValidRequest(false, "/a/[............../b");