Attachment #36134 for bug #62685

View | Details | Raw Unified | Return to bug 62685
Collapse All | Expand All

Lines 885-891 Link Here

(-)java/org/apache/tomcat/util/http/parser/HttpParser.java (-1 / +1 lines)
885	NEW( true, false, false, false, " at the start of"),	885	NEW( true, false, false, false, " at the start of"),
886	ALPHA( true, true, true, true, " after a letter in"),	886	ALPHA( true, true, true, true, " after a letter in"),
887	NUMERIC( true, true, true, true, " after a number in"),	887	NUMERIC( true, true, true, true, " after a number in"),
888	PERIOD( true, false, false, false, " after a period in"),	888	PERIOD( true, false, false, true, " after a period in"),
889	HYPHEN( true, true, false, false, " after a hypen in"),	889	HYPHEN( true, true, false, false, " after a hypen in"),
890	COLON( false, false, false, false, " after a colon in"),	890	COLON( false, false, false, false, " after a colon in"),
891	END( false, false, false, false, " at the end of");	891	END( false, false, false, false, " at the end of");




        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..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, "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-", 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-: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} );

Return to bug 62685

Lines 56-62 Link Here

(-)test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java (-3 / +6 lines)
56	result.add(new Object[] { TestType.IPv4, "0.0.0.0:8080", Integer.valueOf(7), null} );	56	result.add(new Object[] { TestType.IPv4, "0.0.0.0:8080", Integer.valueOf(7), null} );
57	// IPv4 - invalid	57	// IPv4 - invalid
58	result.add(new Object[] { TestType.IPv4, ".0.0.0", Integer.valueOf(-1), IAE} );	58	result.add(new Object[] { TestType.IPv4, ".0.0.0", Integer.valueOf(-1), IAE} );
59	result.add(new Object[] { TestType.IPv4, "0.0.0.", Integer.valueOf(-1), IAE} );
60	result.add(new Object[] { TestType.IPv4, "0..0.0", Integer.valueOf(-1), IAE} );	59	result.add(new Object[] { TestType.IPv4, "0..0.0", Integer.valueOf(-1), IAE} );
61	result.add(new Object[] { TestType.IPv4, "0]", Integer.valueOf(-1), IAE} );	60	result.add(new Object[] { TestType.IPv4, "0]", Integer.valueOf(-1), IAE} );
62	// Domain Name - valid	61	// Domain Name - valid
Lines 125-138 Link Here
125	result.add(new Object[] { TestType.IPv4, "myapp-t.my-domain.com:8080", Integer.valueOf(21), null} );	124	result.add(new Object[] { TestType.IPv4, "myapp-t.my-domain.com:8080", Integer.valueOf(21), null} );
126	result.add(new Object[] { TestType.IPv4, "myapp-t.my-domain.c-om", Integer.valueOf(-1), null} );	125	result.add(new Object[] { TestType.IPv4, "myapp-t.my-domain.c-om", Integer.valueOf(-1), null} );
127	result.add(new Object[] { TestType.IPv4, "myapp-t.my-domain.c-om:8080", Integer.valueOf(22), null} );	126	result.add(new Object[] { TestType.IPv4, "myapp-t.my-domain.c-om:8080", Integer.valueOf(22), null} );
		127	// Domain Name with trailing dot - valid
		128	result.add(new Object[] { TestType.IPv4, "0.0.0.", Integer.valueOf(-1), null} );
		129	result.add(new Object[] { TestType.IPv4, "myapp-t.mydomain.com.", Integer.valueOf(-1), null} );
		130	result.add(new Object[] { TestType.IPv4, "myapp-t.mydomain.com.:8080", Integer.valueOf(21), null} );
		131	result.add(new Object[] { TestType.IPv4, "foo.bar.", Integer.valueOf(-1), null} );
		132	result.add(new Object[] { TestType.IPv4, "foo.bar.:8080", Integer.valueOf(8), null} );
128	// Domain Name - invalid	133	// Domain Name - invalid
129	result.add(new Object[] { TestType.IPv4, ".", Integer.valueOf(-1), IAE} );	134	result.add(new Object[] { TestType.IPv4, ".", Integer.valueOf(-1), IAE} );
130	result.add(new Object[] { TestType.IPv4, ".:8080", Integer.valueOf(-1), IAE} );	135	result.add(new Object[] { TestType.IPv4, ".:8080", Integer.valueOf(-1), IAE} );
131	result.add(new Object[] { TestType.IPv4, ".foo.bar", Integer.valueOf(-1), IAE} );	136	result.add(new Object[] { TestType.IPv4, ".foo.bar", Integer.valueOf(-1), IAE} );
132	result.add(new Object[] { TestType.IPv4, "-foo.bar", Integer.valueOf(-1), IAE} );	137	result.add(new Object[] { TestType.IPv4, "-foo.bar", Integer.valueOf(-1), IAE} );
133	result.add(new Object[] { TestType.IPv4, "foo.bar.", Integer.valueOf(-1), IAE} );
134	result.add(new Object[] { TestType.IPv4, "foo.bar-", Integer.valueOf(-1), IAE} );	138	result.add(new Object[] { TestType.IPv4, "foo.bar-", Integer.valueOf(-1), IAE} );
135	result.add(new Object[] { TestType.IPv4, "foo.bar.:8080", Integer.valueOf(-1), IAE} );
136	result.add(new Object[] { TestType.IPv4, "foo.bar-:8080", Integer.valueOf(-1), IAE} );	139	result.add(new Object[] { TestType.IPv4, "foo.bar-:8080", Integer.valueOf(-1), IAE} );
137	result.add(new Object[] { TestType.IPv4, "^foo.bar", Integer.valueOf(-1), IAE} );	140	result.add(new Object[] { TestType.IPv4, "^foo.bar", Integer.valueOf(-1), IAE} );
138	result.add(new Object[] { TestType.IPv4, "foo-.bar", Integer.valueOf(-1), IAE} );	141	result.add(new Object[] { TestType.IPv4, "foo-.bar", Integer.valueOf(-1), IAE} );