init
This commit is contained in:
358
test/org/apache/tomcat/util/http/parser/TestAcceptLanguage.java
Normal file
358
test/org/apache/tomcat/util/http/parser/TestAcceptLanguage.java
Normal file
@@ -0,0 +1,358 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.apache.tomcat.util.http.parser;
|
||||
|
||||
import java.io.StringReader;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
public class TestAcceptLanguage {
|
||||
|
||||
private static final Locale L_EN = Locale.forLanguageTag("en");
|
||||
private static final Locale L_EN_GB = Locale.forLanguageTag("en-gb");
|
||||
private static final Locale L_FR = Locale.forLanguageTag("fr");
|
||||
private static final double Q1_000 = 1;
|
||||
private static final double Q0_500 = 0.5;
|
||||
private static final double Q0_050 = 0.05;
|
||||
|
||||
@Test
|
||||
public void testSingle01() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle02() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle03() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle04() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb; "));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle05() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=1"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle06() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb; q=1"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle07() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb; q= 1"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle08() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb; q = 1"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle09() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb; q = 1 "));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle10() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb; q =\t1"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle11() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb; q =1\t"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle12() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb; q =\t1\t"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle13() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=0.5"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle14() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=0.50"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle15() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=0.500"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle16() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=0.5009"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSingle17() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;,"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Test
|
||||
public void testMalformed01() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;x=1,en-gb;q=0.5"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed02() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=a,en-gb;q=0.5"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed03() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=0.5a,en-gb;q=0.5"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed04() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=0.05a,en-gb;q=0.5"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed05() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=0.005a,en-gb;q=0.5"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed06() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=0.00005a,en-gb;q=0.5"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed07() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en,,"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed08() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader(",en,"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed09() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader(",,en"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed10() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en;q"));
|
||||
|
||||
Assert.assertEquals(0, actual.size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed11() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=1a0"));
|
||||
|
||||
Assert.assertEquals(0, actual.size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed12() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=1.a0"));
|
||||
|
||||
Assert.assertEquals(0, actual.size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed13() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=1.0a0"));
|
||||
|
||||
Assert.assertEquals(0, actual.size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed14() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=1.1"));
|
||||
|
||||
Assert.assertEquals(0, actual.size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMalformed15() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en-gb;q=1a0,en-gb;q=0.5"));
|
||||
|
||||
Assert.assertEquals(1, actual.size());
|
||||
Assert.assertEquals(L_EN_GB, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(0).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testMultiple01() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en,fr"));
|
||||
|
||||
Assert.assertEquals(2, actual.size());
|
||||
Assert.assertEquals(L_EN, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(0).getQuality(), 0.0001);
|
||||
Assert.assertEquals(L_FR, actual.get(1).getLocale());
|
||||
Assert.assertEquals(Q1_000, actual.get(1).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMultiple02() throws Exception {
|
||||
List<AcceptLanguage> actual = AcceptLanguage.parse(new StringReader("en; q= 0.05,fr;q=0.5"));
|
||||
|
||||
Assert.assertEquals(2, actual.size());
|
||||
Assert.assertEquals(L_EN, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_050, actual.get(0).getQuality(), 0.0001);
|
||||
Assert.assertEquals(L_FR, actual.get(1).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(1).getQuality(), 0.0001);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void bug56848() throws Exception {
|
||||
List<AcceptLanguage> actual =
|
||||
AcceptLanguage.parse(new StringReader("zh-hant-CN;q=0.5,zh-hans-TW;q=0.05"));
|
||||
|
||||
Assert.assertEquals(2, actual.size());
|
||||
|
||||
Locale.Builder b = new Locale.Builder();
|
||||
b.setLanguage("zh").setRegion("CN").setScript("hant");
|
||||
Locale l1 = b.build();
|
||||
|
||||
b.clear().setLanguage("zh").setRegion("TW").setScript("hans");
|
||||
Locale l2 = b.build();
|
||||
|
||||
Assert.assertEquals(l1, actual.get(0).getLocale());
|
||||
Assert.assertEquals(Q0_500, actual.get(0).getQuality(), 0.0001);
|
||||
Assert.assertEquals(l2, actual.get(1).getLocale());
|
||||
Assert.assertEquals(Q0_050, actual.get(1).getQuality(), 0.0001);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,463 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.apache.tomcat.util.http.parser;
|
||||
|
||||
import java.io.StringReader;
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
public class TestAuthorizationDigest {
|
||||
|
||||
@Test
|
||||
public void testBug54060a() throws Exception {
|
||||
String header = "Digest username=\"mthornton\", " +
|
||||
"realm=\"optrak.com\", " +
|
||||
"nonce=\"1351427243671:c1d6360150712149bae931a3ed7cb498\", " +
|
||||
"uri=\"/files/junk.txt\", " +
|
||||
"response=\"c5c2410bfc46753e83a8f007888b0d2e\", " +
|
||||
"opaque=\"DB85C1A73933A7EB586D10E4BF2924EF\", " +
|
||||
"qop=auth, " +
|
||||
"nc=00000001, " +
|
||||
"cnonce=\"9926cb3c334ede11\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("mthornton", result.get("username"));
|
||||
Assert.assertEquals("optrak.com", result.get("realm"));
|
||||
Assert.assertEquals("1351427243671:c1d6360150712149bae931a3ed7cb498",
|
||||
result.get("nonce"));
|
||||
Assert.assertEquals("/files/junk.txt", result.get("uri"));
|
||||
Assert.assertEquals("c5c2410bfc46753e83a8f007888b0d2e",
|
||||
result.get("response"));
|
||||
Assert.assertEquals("DB85C1A73933A7EB586D10E4BF2924EF",
|
||||
result.get("opaque"));
|
||||
Assert.assertEquals("auth", result.get("qop"));
|
||||
Assert.assertEquals("00000001", result.get("nc"));
|
||||
Assert.assertEquals("9926cb3c334ede11", result.get("cnonce"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testBug54060b() throws Exception {
|
||||
String header = "Digest username=\"mthornton\", " +
|
||||
"realm=\"optrak.com\", " +
|
||||
"nonce=\"1351427480964:a01c16fed5168d72a2b5267395a2022e\", " +
|
||||
"uri=\"/files\", " +
|
||||
"algorithm=MD5, " +
|
||||
"response=\"f310c44b87efc0bc0a7aab7096fd36b6\", " +
|
||||
"opaque=\"DB85C1A73933A7EB586D10E4BF2924EF\", " +
|
||||
"cnonce=\"MHg3ZjA3ZGMwMTUwMTA6NzI2OToxMzUxNDI3NDgw\", " +
|
||||
"nc=00000001, " +
|
||||
"qop=auth";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("mthornton", result.get("username"));
|
||||
Assert.assertEquals("optrak.com", result.get("realm"));
|
||||
Assert.assertEquals("1351427480964:a01c16fed5168d72a2b5267395a2022e",
|
||||
result.get("nonce"));
|
||||
Assert.assertEquals("/files", result.get("uri"));
|
||||
Assert.assertEquals("MD5", result.get("algorithm"));
|
||||
Assert.assertEquals("f310c44b87efc0bc0a7aab7096fd36b6",
|
||||
result.get("response"));
|
||||
Assert.assertEquals("DB85C1A73933A7EB586D10E4BF2924EF",
|
||||
result.get("opaque"));
|
||||
Assert.assertEquals("MHg3ZjA3ZGMwMTUwMTA6NzI2OToxMzUxNDI3NDgw",
|
||||
result.get("cnonce"));
|
||||
Assert.assertEquals("00000001", result.get("nc"));
|
||||
Assert.assertEquals("auth", result.get("qop"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testBug54060c() throws Exception {
|
||||
String header = "Digest username=\"mthornton\", qop=auth";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("mthornton", result.get("username"));
|
||||
Assert.assertEquals("auth", result.get("qop"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testBug54060d() throws Exception {
|
||||
String header = "Digest username=\"mthornton\"," +
|
||||
"qop=auth," +
|
||||
"cnonce=\"9926cb3c334ede11\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("mthornton", result.get("username"));
|
||||
Assert.assertEquals("auth", result.get("qop"));
|
||||
Assert.assertEquals("9926cb3c334ede11", result.get("cnonce"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testEndWithLhex() throws Exception {
|
||||
String header = "Digest nc=00000001";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("00000001", result.get("nc"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testEndWithLhexReverse() throws Exception {
|
||||
String header = "Digest nc=10000000";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("10000000", result.get("nc"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testQuotedLhex() throws Exception {
|
||||
String header = "Digest nc=\"09abcdef\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("09abcdef", result.get("nc"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testQuotedLhexReverse() throws Exception {
|
||||
String header = "Digest nc=\"fedcba90\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("fedcba90", result.get("nc"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLhex() throws Exception {
|
||||
String header = "Digest nc=09abcdef";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("09abcdef", result.get("nc"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLhexReverse() throws Exception {
|
||||
String header = "Digest nc=fedcba90";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("fedcba90", result.get("nc"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testQuotedLhexUppercase() throws Exception {
|
||||
String header = "Digest nc=\"00ABCDEF\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("00abcdef", result.get("nc"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testQuotedLhexUppercaseReverse() throws Exception {
|
||||
String header = "Digest nc=\"FEDCBA00\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("fedcba00", result.get("nc"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLhexUppercase() throws Exception {
|
||||
String header = "Digest nc=00ABCDEF";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("00abcdef", result.get("nc"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLhexUppercaseReverse() throws Exception {
|
||||
String header = "Digest nc=FEDCBA00";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertEquals("fedcba00", result.get("nc"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUnclosedQuotedLhex() throws Exception {
|
||||
String header = "Digest nc=\"00000001";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testEmptyLhex() throws Exception {
|
||||
String header = "Digest nc=";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testQuotedEmptyLhex() throws Exception {
|
||||
String header = "Digest nc=\"\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUnclosedQuotedString1() throws Exception {
|
||||
String header = "Digest username=\"test";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUnclosedQuotedString2() throws Exception {
|
||||
String header = "Digest username=\"test\\";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNonTokenDirective() throws Exception {
|
||||
String header = "Digest user{name=\"test\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testTokenQop() throws Exception {
|
||||
String header = "Digest qop=auth";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertEquals("auth", result.get("qop"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testQuotedTokenQop() throws Exception {
|
||||
String header = "Digest qop=\"auth\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertEquals("auth", result.get("qop"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testEmptyQuotedTokenQop() throws Exception {
|
||||
String header = "Digest qop=\"\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNonTokenQop01() throws Exception {
|
||||
String header = "Digest qop=au{th";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNonTokenQop02() throws Exception {
|
||||
String header = "Digest qop=auth{";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testQuotedNonTokenQop() throws Exception {
|
||||
String header = "Digest qop=\"au{th\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testQuotedNonTokenQop2() throws Exception {
|
||||
String header = "Digest qop=\"{auth\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUnclosedQuotedTokenQop() throws Exception {
|
||||
String header = "Digest qop=\"auth";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWrongCharacterInToken() throws Exception {
|
||||
String header = "Digest \u044f";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWrongCharacterInToken2() throws Exception {
|
||||
String header = "Digest qop=\u044f";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWrongCharacterInQuotedToken() throws Exception {
|
||||
String header = "Digest qop=\"\u044f\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWrongCharacterInHex01() throws Exception {
|
||||
String header = "Digest nc=\u044f";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWrongCharacterInHex02() throws Exception {
|
||||
String header = "Digest nc=aaa\u044f";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWrongCharacterInHex03() throws Exception {
|
||||
String header = "Digest nc=\u044faaa";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWrongCharacterInQuotedHex() throws Exception {
|
||||
String header = "Digest nc=\"\u044f\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testParseAuthParamA() throws Exception {
|
||||
// Test for HttpParser.readTokenOrQuotedString()
|
||||
// auth-param = token "=" ( token | quoted-string )
|
||||
String header = "Digest a=b";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertEquals("b", result.get("a"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testParseAuthParamB() throws Exception {
|
||||
// Test for HttpParser.readTokenOrQuotedString()
|
||||
// auth-param = token "=" ( token | quoted-string )
|
||||
String header = "Digest a=\"b\"";
|
||||
|
||||
StringReader input = new StringReader(header);
|
||||
|
||||
Map<String,String> result = Authorization.parseAuthorizationDigest(input);
|
||||
Assert.assertEquals("b", result.get("a"));
|
||||
}
|
||||
}
|
||||
28
test/org/apache/tomcat/util/http/parser/TestHttpParser.java
Normal file
28
test/org/apache/tomcat/util/http/parser/TestHttpParser.java
Normal file
@@ -0,0 +1,28 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.apache.tomcat.util.http.parser;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
public class TestHttpParser {
|
||||
|
||||
@Test
|
||||
public void testTokenDel() {
|
||||
Assert.assertFalse("DEL is not a token", HttpParser.isToken(127));
|
||||
}
|
||||
}
|
||||
255
test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
Normal file
255
test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
Normal file
@@ -0,0 +1,255 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.apache.tomcat.util.http.parser;
|
||||
|
||||
import java.io.StringReader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.Parameterized;
|
||||
import org.junit.runners.Parameterized.Parameter;
|
||||
import org.junit.runners.Parameterized.Parameters;
|
||||
|
||||
@RunWith(Parameterized.class)
|
||||
public class TestHttpParserHost {
|
||||
|
||||
private static final Class<? extends Exception> IAE = IllegalArgumentException.class;
|
||||
|
||||
@Parameter(0)
|
||||
public TestType testType;
|
||||
|
||||
@Parameter(1)
|
||||
public String input;
|
||||
|
||||
@Parameter(2)
|
||||
public Integer expectedResult;
|
||||
|
||||
@Parameter(3)
|
||||
public Class<? extends Exception> expectedException;
|
||||
|
||||
|
||||
@Parameters(name="{index}: host {1}")
|
||||
public static Collection<Object[]> inputs() {
|
||||
List<Object[]> result = new ArrayList<>();
|
||||
// IPv4 - valid
|
||||
result.add(new Object[] { TestType.IPv4, "127.0.0.1", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "127.0.0.1:8080", Integer.valueOf(9), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0.0", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0.0:8080", Integer.valueOf(7), null} );
|
||||
// IPv4 - invalid
|
||||
result.add(new Object[] { TestType.IPv4, ".0.0.0", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, "0..0.0", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, "0]", Integer.valueOf(-1), IAE} );
|
||||
// Domain Name - valid
|
||||
result.add(new Object[] { TestType.IPv4, "0", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0:8080", Integer.valueOf(3), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0:8080", Integer.valueOf(5), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.00.0.0", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.00.0.0:8080", Integer.valueOf(8), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "256.0.0.0", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "256.0.0.0:8080", Integer.valueOf(9), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.256.0.0", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.256.0.0:8080", Integer.valueOf(9), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.256.0", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.256.0:8080", Integer.valueOf(9), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0.256", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0.256:8080", Integer.valueOf(9), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.a.0.0", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.a.0.0:8080", Integer.valueOf(7), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "localhost", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "localhost:8080", Integer.valueOf(9), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "tomcat.apache.org", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "tomcat.apache.org:8080", Integer.valueOf(17), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0.com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0.com:8080", Integer.valueOf(9), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0.0.com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0.0.com:8080", Integer.valueOf(11), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.0.0.com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.0.0.com:8080", Integer.valueOf(11), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "1foo.0.0.com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "1foo.0.0.com:8080", Integer.valueOf(12), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo1.0.0.com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo1.0.0.com:8080", Integer.valueOf(12), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "1foo1.0.0.com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "1foo1.0.0.com:8080", Integer.valueOf(13), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "1-foo.0.0.com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "1-foo.0.0.com:8080", Integer.valueOf(13), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "1--foo.0.0.com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "1--foo.0.0.com:8080", Integer.valueOf(14), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.0.0.1com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.0.0.1com:8080", Integer.valueOf(12), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.0.0.com1", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.0.0.com1:8080", Integer.valueOf(12), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.0.0.1com1", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.0.0.1com1:8080", Integer.valueOf(13), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.0.0.1-com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.0.0.1-com:8080", Integer.valueOf(13), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.0.0.1--com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.0.0.1--com:8080", Integer.valueOf(14), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "com:8080", Integer.valueOf(3), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0com:8080", Integer.valueOf(4), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0com:8080", Integer.valueOf(8), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0.0com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0.0com:8080", Integer.valueOf(10), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "123", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "123:8080", Integer.valueOf(3), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.bar.0com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.bar.0com:8080", Integer.valueOf(12), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "myapp-t.mydomain.com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "myapp-t.mydomain.com:8080", Integer.valueOf(20), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "myapp-t.my-domain.com", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "myapp-t.my-domain.com:8080", Integer.valueOf(21), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "myapp-t.my-domain.c-om", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "myapp-t.my-domain.c-om:8080", Integer.valueOf(22), null} );
|
||||
// Domain Name with trailing dot - valid
|
||||
result.add(new Object[] { TestType.IPv4, "0.0.0.", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "myapp-t.mydomain.com.", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "myapp-t.mydomain.com.:8080", Integer.valueOf(21), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.bar.", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.bar.:8080", Integer.valueOf(8), null} );
|
||||
// Domain Name - invalid
|
||||
result.add(new Object[] { TestType.IPv4, ".", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, ".:8080", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, ".foo.bar", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, "-foo.bar", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.bar-", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.bar-:8080", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, "^foo.bar", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo-.bar", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, "f*oo.bar", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo..bar", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.-bar", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.^bar", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv4, "foo.b*ar", Integer.valueOf(-1), IAE} );
|
||||
// IPv6 - valid
|
||||
result.add(new Object[] { TestType.IPv6, "[::1]", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[::1]:8080", Integer.valueOf(5), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1::1]", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1::1]:8080", Integer.valueOf(6), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[A::A]", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[A::A]:8080", Integer.valueOf(6), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[A:0::A]", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[A:0::A]:8080", Integer.valueOf(8), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1234:5678:90AB:CDEF:1234:5678:90AB:CDEF]",
|
||||
Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1234:5678:90AB:CDEF:1234:5678:90AB:CDEF]:8080",
|
||||
Integer.valueOf(41), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[::5678:90AB:CDEF:1234:5678:90AB:CDEF]:8080",
|
||||
Integer.valueOf(38), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1234:5678:90AB:CDEF:1234:5678:90AB::]:8080",
|
||||
Integer.valueOf(38), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[0:0:0:0:0:0:0:0]", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[0:0:0:0:0:0:0:0]:8080",
|
||||
Integer.valueOf(17), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[::127.0.0.1]", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[::127.0.0.1]:8080", Integer.valueOf(13), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1::127.0.0.1]", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1::127.0.0.1]:8080", Integer.valueOf(14), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[A::127.0.0.1]", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[A::127.0.0.1]:8080", Integer.valueOf(14), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[A:0::127.0.0.1]", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[A:0::127.0.0.1]:8080", Integer.valueOf(16), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1234:5678:90AB:CDEF:1234:5678:127.0.0.1]",
|
||||
Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1234:5678:90AB:CDEF:1234:5678:127.0.0.1]:8080",
|
||||
Integer.valueOf(41), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[::5678:90AB:CDEF:1234:5678:127.0.0.1]:8080",
|
||||
Integer.valueOf(38), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[0:0:0:0:0:0:127.0.0.1]", Integer.valueOf(-1), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[0:0:0:0:0:0:127.0.0.1]:8080",
|
||||
Integer.valueOf(23), null} );
|
||||
result.add(new Object[] { TestType.IPv6, "[::1.2.3.4]", Integer.valueOf(-1), null} );
|
||||
// IPv6 - invalid
|
||||
result.add(new Object[] { TestType.IPv6, "[1234:5678:90AB:CDEF:1234:127.0.0.1]",
|
||||
Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1234:5678:90AB:CDEF:1234:5678:127.0.0.1",
|
||||
Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[0::0::0]", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[0:0:G:0:0:0:0:0]", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[00000:0:0:0:0:0:0:0]", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1234:5678:90AB:CDEF:1234:5678:90AB:]",
|
||||
Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1234:5678:90AB:CDEF:1234:5678:90AB:CDEF",
|
||||
Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[::127.00.0.1]", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[0::0::127.0.0.1]", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[0:0:G:0:0:0:127.0.0.1]", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[00000:0:0:0:0:0:127.0.0.1]", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1::127..0.1]", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1::127..0.1]:8080", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1::127.a.0.1]", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1::127.a.0.1]:8080", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1::127.-.0.1]", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1::127.-.0.1]:8080", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[::1]'", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[:2222:3333:4444:5555:6666:7777:8888]",
|
||||
Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1111:::3333:4444:5555:6666:7777:8888]",
|
||||
Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "::1]", Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1111:2222:3333:4444:5555:6666:7777:8888:9999]",
|
||||
Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1111:2222:3333:4444:5555:6666:7777:1.2.3.4]",
|
||||
Integer.valueOf(-1), IAE} );
|
||||
result.add(new Object[] { TestType.IPv6, "[1111:2222:3333]",
|
||||
Integer.valueOf(-1), IAE} );
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testHost() {
|
||||
Class<? extends Exception> exceptionClass = null;
|
||||
int result = -1;
|
||||
try {
|
||||
StringReader sr = new StringReader(input);
|
||||
switch(testType) {
|
||||
case IPv4:
|
||||
result = HttpParser.readHostIPv4(sr, false);
|
||||
break;
|
||||
case IPv6:
|
||||
result = HttpParser.readHostIPv6(sr);
|
||||
break;
|
||||
|
||||
}
|
||||
} catch (Exception e) {
|
||||
exceptionClass = e.getClass();
|
||||
}
|
||||
Assert.assertEquals(input, expectedResult.intValue(), result);
|
||||
if (expectedException == null) {
|
||||
Assert.assertNull(input, exceptionClass);
|
||||
} else {
|
||||
Assert.assertNotNull(exceptionClass);
|
||||
Assert.assertTrue(input, expectedException.isAssignableFrom(exceptionClass));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static enum TestType {
|
||||
IPv4,
|
||||
IPv6
|
||||
}
|
||||
}
|
||||
309
test/org/apache/tomcat/util/http/parser/TestMediaType.java
Normal file
309
test/org/apache/tomcat/util/http/parser/TestMediaType.java
Normal file
@@ -0,0 +1,309 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.apache.tomcat.util.http.parser;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* Unit tests for {@link HttpParser} focusing on media-type as defined in
|
||||
* section 3.7 of RFC 2616.
|
||||
*/
|
||||
public class TestMediaType {
|
||||
|
||||
// Include whitespace to ensure Parser handles it correctly (it should be
|
||||
// skipped).
|
||||
private static final String TYPE = " foo ";
|
||||
private static final String SUBTYPE = " bar ";
|
||||
private static final String TYPES = TYPE + "/" + SUBTYPE;
|
||||
|
||||
private static final Parameter PARAM_TOKEN =
|
||||
new Parameter("a", "b");
|
||||
private static final Parameter PARAM_QUOTED =
|
||||
new Parameter("x", "\"y\"");
|
||||
private static final Parameter PARAM_EMPTY_QUOTED =
|
||||
new Parameter("z", "\"\"");
|
||||
private static final Parameter PARAM_COMPLEX_QUOTED =
|
||||
new Parameter("w", "\"foo'bar,a=b;x=y\"");
|
||||
|
||||
private static final String CHARSET = "UTF-8";
|
||||
private static final String WS_CHARSET = " \tUTF-8";
|
||||
private static final String CHARSET_WS = "UTF-8 \t";
|
||||
// Since this is quoted, it should retain the space at the end
|
||||
private static final String CHARSET_QUOTED = "\"" + CHARSET_WS + "\"";
|
||||
private static final Parameter PARAM_CHARSET =
|
||||
new Parameter("charset", CHARSET);
|
||||
private static final Parameter PARAM_WS_CHARSET =
|
||||
new Parameter("charset", WS_CHARSET);
|
||||
private static final Parameter PARAM_CHARSET_WS =
|
||||
new Parameter("charset", CHARSET_WS);
|
||||
private static final Parameter PARAM_CHARSET_QUOTED =
|
||||
new Parameter("charset", CHARSET_QUOTED);
|
||||
|
||||
|
||||
private static final String[] LWS_VALUES = new String[] {
|
||||
"", " ", "\t", "\r", "\n", "\r\n", " \r", " \n", " \r\n",
|
||||
"\r ", "\n ", "\r\n ", " \r ", " \n ", " \r\n " };
|
||||
|
||||
|
||||
@Test
|
||||
public void testSimple() throws IOException {
|
||||
doTest();
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testSimpleWithToken() throws IOException {
|
||||
doTest(PARAM_TOKEN);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testSimpleWithQuotedString() throws IOException {
|
||||
doTest(PARAM_QUOTED);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testSimpleWithEmptyQuotedString() throws IOException {
|
||||
doTest(PARAM_EMPTY_QUOTED);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testSimpleWithComplexQuotedString() throws IOException {
|
||||
doTest(PARAM_COMPLEX_QUOTED);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testSimpleWithCharset() throws IOException {
|
||||
doTest(PARAM_CHARSET);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testSimpleWithCharsetWhitespaceBefore() throws IOException {
|
||||
doTest(PARAM_WS_CHARSET);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testSimpleWithCharsetWhitespaceAfter() throws IOException {
|
||||
doTest(PARAM_CHARSET_WS);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testSimpleWithCharsetQuoted() throws IOException {
|
||||
doTest(PARAM_CHARSET_QUOTED);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testSimpleWithAll() throws IOException {
|
||||
doTest(PARAM_COMPLEX_QUOTED, PARAM_EMPTY_QUOTED, PARAM_QUOTED,
|
||||
PARAM_TOKEN, PARAM_CHARSET);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testCharset() throws IOException {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append(TYPES);
|
||||
sb.append(PARAM_CHARSET);
|
||||
sb.append(PARAM_TOKEN);
|
||||
|
||||
StringReader sr = new StringReader(sb.toString());
|
||||
MediaType m = MediaType.parseMediaType(sr);
|
||||
|
||||
Assert.assertEquals("foo/bar; charset=UTF-8; a=b", m.toString());
|
||||
Assert.assertEquals(CHARSET, m.getCharset());
|
||||
Assert.assertEquals("foo/bar; a=b", m.toStringNoCharset());
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testCharsetQuoted() throws IOException {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append(TYPES);
|
||||
sb.append(PARAM_CHARSET_QUOTED);
|
||||
|
||||
StringReader sr = new StringReader(sb.toString());
|
||||
MediaType m = MediaType.parseMediaType(sr);
|
||||
|
||||
Assert.assertEquals(CHARSET_WS, m.getCharset());
|
||||
Assert.assertEquals(TYPES.replaceAll(" ", ""),
|
||||
m.toStringNoCharset());
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testBug52811() throws IOException {
|
||||
String input = "multipart/related;boundary=1_4F50BD36_CDF8C28;" +
|
||||
"Start=\"<31671603.smil>\";" +
|
||||
"Type=\"application/smil;charset=UTF-8\"";
|
||||
|
||||
StringReader sr = new StringReader(input);
|
||||
MediaType m = MediaType.parseMediaType(sr);
|
||||
|
||||
// Check the types
|
||||
Assert.assertEquals("multipart", m.getType());
|
||||
Assert.assertEquals("related", m.getSubtype());
|
||||
|
||||
// Check the parameters
|
||||
Assert.assertTrue(m.getParameterCount() == 3);
|
||||
|
||||
Assert.assertEquals("1_4F50BD36_CDF8C28", m.getParameterValue("boundary"));
|
||||
Assert.assertEquals("\"<31671603.smil>\"", m.getParameterValue("Start"));
|
||||
Assert.assertEquals("\"application/smil;charset=UTF-8\"",
|
||||
m.getParameterValue("Type"));
|
||||
|
||||
String expected = "multipart/related; boundary=1_4F50BD36_CDF8C28; " +
|
||||
"start=\"<31671603.smil>\"; " +
|
||||
"type=\"application/smil;charset=UTF-8\"";
|
||||
Assert.assertEquals(expected, m.toString());
|
||||
Assert.assertEquals(expected, m.toStringNoCharset());
|
||||
Assert.assertNull(m.getCharset());
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testBug53353() throws IOException {
|
||||
String input = "text/html; UTF-8;charset=UTF-8";
|
||||
|
||||
StringReader sr = new StringReader(input);
|
||||
MediaType m = MediaType.parseMediaType(sr);
|
||||
|
||||
// Check the types
|
||||
Assert.assertEquals("text", m.getType());
|
||||
Assert.assertEquals("html", m.getSubtype());
|
||||
|
||||
// Check the parameters
|
||||
Assert.assertTrue(m.getParameterCount() == 2);
|
||||
|
||||
Assert.assertEquals("", m.getParameterValue("UTF-8"));
|
||||
Assert.assertEquals("UTF-8", m.getCharset());
|
||||
|
||||
// Note: Invalid input is filtered out
|
||||
Assert.assertEquals("text/html; charset=UTF-8", m.toString());
|
||||
Assert.assertEquals("UTF-8", m.getCharset());
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testBug55454() throws IOException {
|
||||
String input = "text/html;;charset=UTF-8";
|
||||
|
||||
StringReader sr = new StringReader(input);
|
||||
MediaType m = MediaType.parseMediaType(sr);
|
||||
|
||||
Assert.assertEquals("text", m.getType());
|
||||
Assert.assertEquals("html", m.getSubtype());
|
||||
|
||||
Assert.assertTrue(m.getParameterCount() == 1);
|
||||
|
||||
Assert.assertEquals("UTF-8", m.getParameterValue("charset"));
|
||||
Assert.assertEquals("UTF-8", m.getCharset());
|
||||
|
||||
Assert.assertEquals("text/html; charset=UTF-8", m.toString());
|
||||
}
|
||||
|
||||
|
||||
private void doTest(Parameter... parameters) throws IOException {
|
||||
for (String lws : LWS_VALUES) {
|
||||
doTest(lws, parameters);
|
||||
}
|
||||
}
|
||||
|
||||
private void doTest(String lws, Parameter... parameters)
|
||||
throws IOException {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append(TYPES);
|
||||
for (Parameter p : parameters) {
|
||||
sb.append(p.toString(lws));
|
||||
}
|
||||
|
||||
StringReader sr = new StringReader(sb.toString());
|
||||
MediaType m = MediaType.parseMediaType(sr);
|
||||
|
||||
// Check all expected parameters are present
|
||||
Assert.assertTrue(m.getParameterCount() == parameters.length);
|
||||
|
||||
// Check the types
|
||||
Assert.assertEquals(TYPE.trim(), m.getType());
|
||||
Assert.assertEquals(SUBTYPE.trim(), m.getSubtype());
|
||||
|
||||
// Check the parameters
|
||||
for (int i = 0; i < parameters.length; i++) {
|
||||
Assert.assertEquals(parameters[i].getValue().trim(),
|
||||
m.getParameterValue(parameters[i].getName().trim()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static class Parameter {
|
||||
private final String name;
|
||||
private final String value;
|
||||
|
||||
public Parameter(String name,String value) {
|
||||
this.name = name;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return toString("");
|
||||
}
|
||||
|
||||
public String toString(String lws) {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append(lws);
|
||||
sb.append(";");
|
||||
sb.append(lws);
|
||||
sb.append(name);
|
||||
sb.append(lws);
|
||||
sb.append("=");
|
||||
sb.append(lws);
|
||||
sb.append(value);
|
||||
sb.append(lws);
|
||||
return sb.toString();
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCase() throws Exception {
|
||||
StringReader sr = new StringReader("type/sub-type;a=1;B=2");
|
||||
MediaType m = MediaType.parseMediaType(sr);
|
||||
|
||||
Assert.assertEquals("1", m.getParameterValue("A"));
|
||||
Assert.assertEquals("1", m.getParameterValue("a"));
|
||||
Assert.assertEquals("2", m.getParameterValue("B"));
|
||||
Assert.assertEquals("2", m.getParameterValue("b"));
|
||||
}
|
||||
}
|
||||
202
test/org/apache/tomcat/util/http/parser/TestTokenList.java
Normal file
202
test/org/apache/tomcat/util/http/parser/TestTokenList.java
Normal file
@@ -0,0 +1,202 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.apache.tomcat.util.http.parser;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
public class TestTokenList {
|
||||
|
||||
@Test
|
||||
public void testAll() throws IOException {
|
||||
Set<String> expected = new HashSet<>();
|
||||
expected.add("*");
|
||||
doTestVary("*", expected, true);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testSingle() throws IOException {
|
||||
Set<String> expected = new HashSet<>();
|
||||
expected.add("host");
|
||||
doTestVary("Host", expected, true);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testMultiple() throws IOException {
|
||||
Set<String> expected = new HashSet<>();
|
||||
expected.add("bar");
|
||||
expected.add("foo");
|
||||
expected.add("host");
|
||||
doTestVary("Host, Foo, Bar", expected, true);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testEmptyString() throws IOException {
|
||||
Set<String> s = Collections.emptySet();
|
||||
doTestVary("", s, false);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testSingleInvalid() throws IOException {
|
||||
Set<String> s = Collections.emptySet();
|
||||
doTestVary("{{{", s, false);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testMultipleWithInvalidStart() throws IOException {
|
||||
Set<String> expected = new HashSet<>();
|
||||
expected.add("bar");
|
||||
expected.add("foo");
|
||||
expected.add("host");
|
||||
doTestVary("{{{, Host, Foo, Bar", expected, false);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testMultipleWithInvalidMiddle() throws IOException {
|
||||
Set<String> expected = new HashSet<>();
|
||||
expected.add("bar");
|
||||
expected.add("foo");
|
||||
expected.add("host");
|
||||
doTestVary("Host, {{{, Foo, Bar", expected, false);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testMultipleWithInvalidEnd() throws IOException {
|
||||
Set<String> expected = new HashSet<>();
|
||||
expected.add("bar");
|
||||
expected.add("foo");
|
||||
expected.add("host");
|
||||
doTestVary("Host, Foo, Bar, {{{", expected, false);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testMultipleWithInvalidStart2() throws IOException {
|
||||
Set<String> expected = new HashSet<>();
|
||||
expected.add("bar");
|
||||
expected.add("foo");
|
||||
expected.add("host");
|
||||
doTestVary("OK {{{, Host, Foo, Bar", expected, false);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testMultipleWithInvalidMiddle2() throws IOException {
|
||||
Set<String> expected = new HashSet<>();
|
||||
expected.add("bar");
|
||||
expected.add("foo");
|
||||
expected.add("host");
|
||||
doTestVary("Host, OK {{{, Foo, Bar", expected, false);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testMultipleWithInvalidEnd2() throws IOException {
|
||||
Set<String> expected = new HashSet<>();
|
||||
expected.add("bar");
|
||||
expected.add("foo");
|
||||
expected.add("host");
|
||||
doTestVary("Host, Foo, Bar, OK {{{", expected, false);
|
||||
}
|
||||
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
private void doTestVary(String input, Set<String> expectedTokens, boolean expectedResult) throws IOException {
|
||||
StringReader reader = new StringReader(input);
|
||||
Set<String> tokens = new HashSet<>();
|
||||
Vary.parseVary(reader, tokens);
|
||||
Assert.assertEquals(expectedTokens, tokens);
|
||||
|
||||
// Can't use reset(). Parser uses marks.
|
||||
reader = new StringReader(input);
|
||||
tokens.clear();
|
||||
boolean result = TokenList.parseTokenList(reader, tokens);
|
||||
Assert.assertEquals(expectedTokens, tokens);
|
||||
Assert.assertEquals(Boolean.valueOf(expectedResult), Boolean.valueOf(result));
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testMultipleHeadersValidWithoutNull() throws IOException {
|
||||
doTestMultipleHeadersValid(false);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testMultipleHeadersValidWithNull() throws IOException {
|
||||
doTestMultipleHeadersValid(true);
|
||||
}
|
||||
|
||||
|
||||
private void doTestMultipleHeadersValid(boolean withNull) throws IOException {
|
||||
Set<String> expectedTokens = new HashSet<>();
|
||||
expectedTokens.add("bar");
|
||||
expectedTokens.add("foo");
|
||||
expectedTokens.add("foo2");
|
||||
|
||||
Set<String> inputs = new HashSet<>();
|
||||
inputs.add("foo");
|
||||
if (withNull) {
|
||||
inputs.add(null);
|
||||
}
|
||||
inputs.add("bar, foo2");
|
||||
|
||||
Set<String> tokens = new HashSet<>();
|
||||
|
||||
|
||||
boolean result = TokenList.parseTokenList(Collections.enumeration(inputs), tokens);
|
||||
Assert.assertEquals(expectedTokens, tokens);
|
||||
Assert.assertTrue(result);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void doTestMultipleHeadersInvalid() throws IOException {
|
||||
Set<String> expectedTokens = new HashSet<>();
|
||||
expectedTokens.add("bar");
|
||||
expectedTokens.add("bar2");
|
||||
expectedTokens.add("foo");
|
||||
expectedTokens.add("foo2");
|
||||
expectedTokens.add("foo3");
|
||||
|
||||
Set<String> inputs = new HashSet<>();
|
||||
inputs.add("foo");
|
||||
inputs.add("bar2, }}}, foo3");
|
||||
inputs.add("bar, foo2");
|
||||
|
||||
Set<String> tokens = new HashSet<>();
|
||||
|
||||
|
||||
boolean result = TokenList.parseTokenList(Collections.enumeration(inputs), tokens);
|
||||
Assert.assertEquals(expectedTokens, tokens);
|
||||
Assert.assertFalse(result);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.apache.tomcat.util.http.parser;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.Parameterized;
|
||||
import org.junit.runners.Parameterized.Parameter;
|
||||
import org.junit.runners.Parameterized.Parameters;
|
||||
|
||||
import org.apache.tomcat.util.buf.MessageBytes;
|
||||
|
||||
@RunWith(Parameterized.class)
|
||||
public class TesterHostPerformance {
|
||||
|
||||
@Parameters
|
||||
public static Collection<Object[]> inputs() {
|
||||
List<Object[]> result = new ArrayList<>();
|
||||
result.add(new Object[] { "localhost" });
|
||||
result.add(new Object[] { "tomcat.apache.org" });
|
||||
result.add(new Object[] { "tomcat.apache.org." });
|
||||
result.add(new Object[] { "127.0.0.1" });
|
||||
result.add(new Object[] { "255.255.255.255" });
|
||||
result.add(new Object[] { "[::1]" });
|
||||
result.add(new Object[] { "[0123:4567:89AB:CDEF:0123:4567:89AB:CDEF]" });
|
||||
return result;
|
||||
}
|
||||
|
||||
@Parameter(0)
|
||||
public String hostname;
|
||||
|
||||
private static final int ITERATIONS = 100000000;
|
||||
|
||||
@Test
|
||||
public void testParseHost() throws Exception {
|
||||
long start = System.nanoTime();
|
||||
for (int i = 0; i < ITERATIONS; i++) {
|
||||
Host.parse(hostname);
|
||||
}
|
||||
long time = System.nanoTime() - start;
|
||||
|
||||
System.out.println("St " + hostname + ": " + ITERATIONS + " iterations in " + time + "ns");
|
||||
System.out.println("St " + hostname + ": " + ITERATIONS * 1000000000.0/time + " iterations per second");
|
||||
|
||||
MessageBytes mb = MessageBytes.newInstance();
|
||||
mb.setString(hostname);
|
||||
mb.toBytes();
|
||||
|
||||
start = System.nanoTime();
|
||||
for (int i = 0; i < ITERATIONS; i++) {
|
||||
Host.parse(mb);
|
||||
}
|
||||
time = System.nanoTime() - start;
|
||||
|
||||
System.out.println("MB " + hostname + ": " + ITERATIONS + " iterations in " + time + "ns");
|
||||
System.out.println("MB " + hostname + ": " + ITERATIONS * 1000000000.0/time + " iterations per second");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user