This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 4d7c896fd2 Add precondition support to DELETE requests
4d7c896fd2 is described below
commit 4d7c896fd2213b73ad1324d16f6c3fd4b47ddc4c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 13 08:42:34 2024 +0000
Add precondition support to DELETE requests
---
.../apache/catalina/servlets/DefaultServlet.java | 5 ++-
...efaultServletRfc9110Section13Parameterized.java | 50 +++++++++++++---------
2 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 0d42bbb1bb..a34d583ae9 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -726,6 +726,10 @@ public class DefaultServlet extends HttpServlet {
WebResource resource = resources.getResource(path);
+ if (!checkIfHeaders(req, resp, resource)) {
+ return;
+ }
+
if (resource.exists()) {
if (resource.delete()) {
resp.setStatus(HttpServletResponse.SC_NO_CONTENT);
@@ -735,7 +739,6 @@ public class DefaultServlet extends HttpServlet {
} else {
resp.sendError(HttpServletResponse.SC_NOT_FOUND);
}
-
}
diff --git
a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
index b8682eb287..4b79e5ec7b 100644
---
a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
+++
b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
@@ -257,6 +257,35 @@ public class
TestDefaultServletRfc9110Section13Parameterized extends TomcatBaseT
null, null, null, Boolean.FALSE, SC_400 });
parameterSets.add(new Object[] { useStrongEtag, Task.PUT_NEW_TXT,
EtagPrecondition.INVALID_ALL_PLUS_OTHER,
null, null, null, null, null, Boolean.FALSE, SC_400 });
+
+ // DELETE TESTS
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_EXIST_TXT, null, null, null, null, null, null,
+ Boolean.FALSE, SC_204 });
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_EXIST_TXT, EtagPrecondition.ALL, null, null, null, null, null,
+ Boolean.FALSE, SC_204 });
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_EXIST_TXT, EtagPrecondition.EXACTLY, null, null, null, null, null,
+ Boolean.FALSE, useStrongEtag.booleanValue() ? SC_204 :
SC_412 });
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_EXIST_TXT, EtagPrecondition.IN, null, null, null, null, null,
+ Boolean.FALSE, useStrongEtag.booleanValue() ? SC_204 :
SC_412 });
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_EXIST_TXT, EtagPrecondition.NOT_IN, null, null, null, null, null,
+ Boolean.FALSE, SC_412 });
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_EXIST_TXT, EtagPrecondition.INVALID, null, null, null, null, null,
+ Boolean.FALSE, SC_400 });
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_EXIST_TXT, EtagPrecondition.INVALID_ALL_PLUS_OTHER, null, null,
null, null, null,
+ Boolean.FALSE, SC_400 });
+
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_NOT_EXIST_TXT, null, null, null, null, null, null,
+ Boolean.FALSE, SC_404 });
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_NOT_EXIST_TXT, EtagPrecondition.ALL, null, null, null, null, null,
+ Boolean.FALSE, SC_412 });
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_NOT_EXIST_TXT, EtagPrecondition.IN, null, null, null, null, null,
+ Boolean.FALSE, SC_412 });
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_NOT_EXIST_TXT, EtagPrecondition.NOT_IN, null, null, null, null,
null,
+ Boolean.FALSE, SC_412 });
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_NOT_EXIST_TXT, EtagPrecondition.INVALID, null, null, null, null,
null,
+ Boolean.FALSE, SC_400 });
+ parameterSets.add(new Object[] { useStrongEtag,
Task.DELETE_NOT_EXIST_TXT, EtagPrecondition.INVALID_ALL_PLUS_OTHER, null, null,
null, null, null,
+ Boolean.FALSE, SC_400 });
}
return parameterSets;
@@ -269,6 +298,7 @@ public class
TestDefaultServletRfc9110Section13Parameterized extends TomcatBaseT
private static Integer SC_206 =
Integer.valueOf(HttpServletResponse.SC_PARTIAL_CONTENT);
private static Integer SC_304 =
Integer.valueOf(HttpServletResponse.SC_NOT_MODIFIED);
private static Integer SC_400 =
Integer.valueOf(HttpServletResponse.SC_BAD_REQUEST);
+ private static Integer SC_404 =
Integer.valueOf(HttpServletResponse.SC_NOT_FOUND);
private static Integer SC_412 =
Integer.valueOf(HttpServletResponse.SC_PRECONDITION_FAILED);
@@ -295,10 +325,6 @@ public class
TestDefaultServletRfc9110Section13Parameterized extends TomcatBaseT
PUT_NEW_TXT(HTTP_METHOD.PUT, "/put_new.txt"),
DELETE_EXIST_TXT(HTTP_METHOD.DELETE, "/delete_exist.txt"),
- DELETE_EXIST1_TXT(HTTP_METHOD.DELETE, "/delete_exist1.txt"),
- DELETE_EXIST2_TXT(HTTP_METHOD.DELETE, "/delete_exist2.txt"),
- DELETE_EXIST3_TXT(HTTP_METHOD.DELETE, "/delete_exist3.txt"),
- DELETE_EXIST4_TXT(HTTP_METHOD.DELETE, "/delete_exist4.txt"),
DELETE_NOT_EXIST_TXT(HTTP_METHOD.DELETE, "/delete_404.txt");
HTTP_METHOD m;
@@ -480,22 +506,6 @@ public class
TestDefaultServletRfc9110Section13Parameterized extends TomcatBaseT
Files.write((new File(tempDocBase.getAbsolutePath(),
"delete_exist.txt")).toPath(), "delete_exist_v0".getBytes(),
StandardOpenOption.CREATE);
(new File(tempDocBase.getAbsolutePath(),
"delete_exist.txt")).setLastModified(lastModified);
-
- Files.write((new File(tempDocBase.getAbsolutePath(),
"delete_exist1.txt")).toPath(), "delete_exist1_v0".getBytes(),
- StandardOpenOption.CREATE);
- (new File(tempDocBase.getAbsolutePath(),
"delete_exist1.txt")).setLastModified(lastModified);
-
- Files.write((new File(tempDocBase.getAbsolutePath(),
"delete_exist2.txt")).toPath(), "delete_exist2_v0".getBytes(),
- StandardOpenOption.CREATE);
- (new File(tempDocBase.getAbsolutePath(),
"delete_exist2.txt")).setLastModified(lastModified);
-
- Files.write((new File(tempDocBase.getAbsolutePath(),
"delete_exist3.txt")).toPath(), "delete_exist3_v0".getBytes(),
- StandardOpenOption.CREATE);
- (new File(tempDocBase.getAbsolutePath(),
"delete_exist3.txt")).setLastModified(lastModified);
-
- Files.write((new File(tempDocBase.getAbsolutePath(),
"delete_exist4.txt")).toPath(), "delete_exist4_v0".getBytes(),
- StandardOpenOption.CREATE);
- (new File(tempDocBase.getAbsolutePath(),
"delete_exist4.txt")).setLastModified(lastModified);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
