This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 744609a Refactor. Add new method isToken(String) to reduce duplication
744609a is described below
commit 744609a865169b41f9c64b450e38f091fbda5f86
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Jan 7 19:46:15 2022 +0000
Refactor. Add new method isToken(String) to reduce duplication
---
.../catalina/core/ApplicationPushBuilder.java | 7 ++---
.../apache/tomcat/util/http/parser/HttpParser.java | 17 +++++++++++
.../tomcat/util/http/parser/TestHttpParser.java | 34 ++++++++++++++++++++++
webapps/docs/changelog.xml | 3 ++
4 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationPushBuilder.java
b/java/org/apache/catalina/core/ApplicationPushBuilder.java
index 6eae33f..57e62bc 100644
--- a/java/org/apache/catalina/core/ApplicationPushBuilder.java
+++ b/java/org/apache/catalina/core/ApplicationPushBuilder.java
@@ -203,11 +203,8 @@ public class ApplicationPushBuilder {
sm.getString("applicationPushBuilder.methodInvalid",
upperMethod));
}
// Check a token was supplied
- for (char c : upperMethod.toCharArray()) {
- if (!HttpParser.isToken(c)) {
- throw new IllegalArgumentException(
- sm.getString("applicationPushBuilder.methodNotToken",
upperMethod));
- }
+ if (!HttpParser.isToken(upperMethod)) {
+ throw new
IllegalArgumentException(sm.getString("applicationPushBuilder.methodNotToken",
upperMethod));
}
this.method = method;
return this;
diff --git a/java/org/apache/tomcat/util/http/parser/HttpParser.java
b/java/org/apache/tomcat/util/http/parser/HttpParser.java
index 7258955..37dcc55 100644
--- a/java/org/apache/tomcat/util/http/parser/HttpParser.java
+++ b/java/org/apache/tomcat/util/http/parser/HttpParser.java
@@ -257,6 +257,23 @@ public class HttpParser {
}
+ public static boolean isToken(String s) {
+ // token = 1 * tchar (RFC 7230)
+ if (s == null) {
+ return false;
+ }
+ if (s.isEmpty()) {
+ return false;
+ }
+ for (char c : s.toCharArray()) {
+ if (!isToken(c)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+
public static boolean isHex(int c) {
// Fast for correct values, slower for some incorrect ones
try {
diff --git a/test/org/apache/tomcat/util/http/parser/TestHttpParser.java
b/test/org/apache/tomcat/util/http/parser/TestHttpParser.java
index 9227e7d..d157014 100644
--- a/test/org/apache/tomcat/util/http/parser/TestHttpParser.java
+++ b/test/org/apache/tomcat/util/http/parser/TestHttpParser.java
@@ -25,4 +25,38 @@ public class TestHttpParser {
public void testTokenDel() {
Assert.assertFalse("DEL is not a token", HttpParser.isToken(127));
}
+ @Test
+ public void testTokenStringNull() {
+ Assert.assertFalse(HttpParser.isToken(null));
+ }
+
+
+ @Test
+ public void testTokenStringEmpty() {
+ Assert.assertFalse(HttpParser.isToken(""));
+ }
+
+
+ @Test
+ public void testTokenStringLws01() {
+ Assert.assertFalse(HttpParser.isToken(" "));
+ }
+
+
+ @Test
+ public void testTokenStringLws02() {
+ Assert.assertFalse(HttpParser.isToken(" aaa"));
+ }
+
+
+ @Test
+ public void testTokenStringLws03() {
+ Assert.assertFalse(HttpParser.isToken("\taaa"));
+ }
+
+
+ @Test
+ public void testTokenStringValid() {
+ Assert.assertTrue(HttpParser.isToken("token"));
+ }
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bc9a896..6f199f7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -201,6 +201,9 @@
<bug>65767</bug>: Add support for certificates that use keys encrypted
using PBES2. Based on a pull request provided by xiezhaokun. (markt)
</add>
+ <scode>
+ Refactor testing whether a String is a valid HTTP token. (markt)
+ </scode>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
