You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@hc.apache.org by GitBox <gi...@apache.org> on 2020/07/29 17:40:00 UTC
[GitHub] [httpcomponents-core] michael-o commented on a change in pull request #205: RFC3986 conformance
michael-o commented on a change in pull request #205:
URL: https://github.com/apache/httpcomponents-core/pull/205#discussion_r462280202
##########
File path: httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java
##########
@@ -132,46 +126,12 @@
}
}
if (!name.isEmpty()) {
- list.add(new BasicNameValuePair(
- decodeFormFields(name, charset),
- decodeFormFields(value, charset)));
- }
- }
- return list;
- }
-
- static List<String> splitSegments(final CharSequence s, final BitSet separators) {
- final Tokenizer.Cursor cursor = new Tokenizer.Cursor(0, s.length());
- // Skip leading separator
- if (cursor.atEnd()) {
- return Collections.emptyList();
- }
- if (separators.get(s.charAt(cursor.getPos()))) {
- cursor.updatePos(cursor.getPos() + 1);
- }
- final List<String> list = new ArrayList<>();
- final StringBuilder buf = new StringBuilder();
- for (;;) {
- if (cursor.atEnd()) {
- list.add(buf.toString());
- break;
- }
- final char current = s.charAt(cursor.getPos());
- if (separators.get(current)) {
- list.add(buf.toString());
- buf.setLength(0);
- } else {
- buf.append(current);
+ list.add(new BasicNameValuePair(PercentCodec.decode(name, charset), PercentCodec.decode(value, charset)));
Review comment:
Confusing, the previous code refers to forms, but the new one does not use `WWWCodec`. Is that expected?
##########
File path: httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java
##########
@@ -444,14 +542,14 @@ public void testPathNoLeadingSlash() throws Exception {
.setScheme("ftp")
.setPath("blah")
.build();
- Assert.assertThat(uri, CoreMatchers.equalTo(URI.create("ftp:/blah")));
+ MatcherAssert.assertThat(uri, CoreMatchers.equalTo(URI.create("ftp:/blah")));
Review comment:
Wait a minute, why is there a slash missing? This looks wrong according to the RFC.
##########
File path: httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java
##########
@@ -280,7 +202,18 @@ public static String format(
final Charset charset) {
Args.notNull(parameters, "Parameters");
final StringBuilder buf = new StringBuilder();
- formatNameValuePairs(buf, parameters, parameterSeparator, charset);
+ int i = 0;
+ for (final NameValuePair parameter : parameters) {
+ if (i > 0) {
+ buf.append(parameterSeparator);
+ }
+ PercentCodec.encode(buf, parameter.getName(), charset, URLENCODER);
Review comment:
Same here.
##########
File path: httpcore5/src/main/java/org/apache/hc/core5/net/WWWFormCodec.java
##########
@@ -0,0 +1,83 @@
+/*
+ * ====================================================================
+ * 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.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.net;
+
+import java.nio.charset.Charset;
+import java.util.List;
+
+import org.apache.hc.core5.http.NameValuePair;
+
+/**
+ * {@code application/x-www-form-urlencoded} codec.
+ *
+ * @since 5.1
+ */
+public class WWWFormCodec {
Review comment:
Why are you using the `PercentCodec` here transitively although both are slightly different?
##########
File path: httpcore5/src/test/java/org/apache/hc/core5/net/TestWWWFormCodec.java
##########
@@ -0,0 +1,124 @@
+/*
+ * ====================================================================
+ * 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.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.net;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.NameValuePairListMatcher;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
+import org.junit.Test;
+
+public class TestWWWFormCodec {
Review comment:
Am I blind or do I miss a space to plus test?
##########
File path: httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java
##########
@@ -355,8 +440,8 @@ public void assertSetParameters(final Charset charset) throws Exception {
}
public void assertBuild(final Charset charset, final URI uri) throws Exception {
- final String encodedData1 = URLEncodedUtils.encodeFormFields("\"1\u00aa position\"", charset);
- final String encodedData2 = URLEncodedUtils.encodeFormFields("Jos\u00e9 Abra\u00e3o", charset);
+ final String encodedData1 = PercentCodec.encode("\"1\u00aa position\"", charset);
Review comment:
Swapping form to URI encoding looks wrong, isn't it?
##########
File path: httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java
##########
@@ -28,21 +28,143 @@
import java.net.InetAddress;
import java.net.URI;
+import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.NameValuePairListMatcher;
import org.apache.hc.core5.http.message.BasicNameValuePair;
import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
import org.junit.Assert;
import org.junit.Test;
public class TestURIBuilder {
+ private static final String CH_HELLO = "\u0047\u0072\u00FC\u0065\u007A\u0069\u005F\u007A\u00E4\u006D\u00E4";
+ private static final String RU_HELLO = "\u0412\u0441\u0435\u043C\u005F\u043F\u0440\u0438\u0432\u0435\u0442";
+
+ static List<String> parsePath(final CharSequence s) {
+ return URIBuilder.parsePath(s, null);
+ }
+
+ @Test
+ public void testParseSegments() throws Exception {
+ MatcherAssert.assertThat(parsePath("/this/that"), CoreMatchers.equalTo(Arrays.asList("this", "that")));
+ MatcherAssert.assertThat(parsePath("this/that"), CoreMatchers.equalTo(Arrays.asList("this", "that")));
+ MatcherAssert.assertThat(parsePath("this//that"), CoreMatchers.equalTo(Arrays.asList("this", "", "that")));
+ MatcherAssert.assertThat(parsePath("this//that/"), CoreMatchers.equalTo(Arrays.asList("this", "", "that", "")));
+ MatcherAssert.assertThat(parsePath("this//that/%2fthis%20and%20that"),
+ CoreMatchers.equalTo(Arrays.asList("this", "", "that", "/this and that")));
+ MatcherAssert.assertThat(parsePath("this///that//"),
+ CoreMatchers.equalTo(Arrays.asList("this", "", "", "that", "", "")));
+ MatcherAssert.assertThat(parsePath("/"), CoreMatchers.equalTo(Collections.singletonList("")));
+ MatcherAssert.assertThat(parsePath(""), CoreMatchers.equalTo(Collections.<String>emptyList()));
+ }
+
+ static String formatPath(final String... pathSegments) {
+ final StringBuilder buf = new StringBuilder();
+ URIBuilder.formatPath(buf, Arrays.asList(pathSegments), null);
+ return buf.toString();
+ }
+
+ @Test
+ public void testFormatSegments() throws Exception {
+ MatcherAssert.assertThat(formatPath("this", "that"), CoreMatchers.equalTo("/this/that"));
+ MatcherAssert.assertThat(formatPath("this", "", "that"), CoreMatchers.equalTo("/this//that"));
+ MatcherAssert.assertThat(formatPath("this", "", "that", "/this and that"),
+ CoreMatchers.equalTo("/this//that/%2Fthis%20and%20that"));
+ MatcherAssert.assertThat(formatPath("this", "", "", "that", "", ""),
+ CoreMatchers.equalTo("/this///that//"));
+ MatcherAssert.assertThat(formatPath(""), CoreMatchers.equalTo("/"));
+ MatcherAssert.assertThat(formatPath(), CoreMatchers.equalTo(""));
+ }
+
+ static List<NameValuePair> parseQuery(final CharSequence s) {
+ return URIBuilder.parseQuery(s, null);
+ }
+
+ @Test
+ public void testParseQuery() throws Exception {
+ MatcherAssert.assertThat(parseQuery(""), NameValuePairListMatcher.isEmpty());
+ MatcherAssert.assertThat(parseQuery("Name0"),
+ NameValuePairListMatcher.equalsTo(new BasicNameValuePair("Name0", null)));
+ MatcherAssert.assertThat(parseQuery("Name1=Value1"),
+ NameValuePairListMatcher.equalsTo(new BasicNameValuePair("Name1", "Value1")));
+ MatcherAssert.assertThat(parseQuery("Name2="),
+ NameValuePairListMatcher.equalsTo(new BasicNameValuePair("Name2", "")));
+ MatcherAssert.assertThat(parseQuery(" Name3 "),
+ NameValuePairListMatcher.equalsTo(new BasicNameValuePair("Name3", null)));
+ MatcherAssert.assertThat(parseQuery("Name4=Value%204%21"),
+ NameValuePairListMatcher.equalsTo(new BasicNameValuePair("Name4", "Value 4!")));
+ MatcherAssert.assertThat(parseQuery("Name4=Value%2B4%21"),
+ NameValuePairListMatcher.equalsTo(new BasicNameValuePair("Name4", "Value+4!")));
+ MatcherAssert.assertThat(parseQuery("Name4=Value%204%21%20%214"),
+ NameValuePairListMatcher.equalsTo(new BasicNameValuePair("Name4", "Value 4! !4")));
+ MatcherAssert.assertThat(parseQuery("Name5=aaa&Name6=bbb"),
+ NameValuePairListMatcher.equalsTo(
+ new BasicNameValuePair("Name5", "aaa"),
+ new BasicNameValuePair("Name6", "bbb")));
+ MatcherAssert.assertThat(parseQuery("Name7=aaa&Name7=b%2Cb&Name7=ccc"),
+ NameValuePairListMatcher.equalsTo(
+ new BasicNameValuePair("Name7", "aaa"),
+ new BasicNameValuePair("Name7", "b,b"),
+ new BasicNameValuePair("Name7", "ccc")));
+ MatcherAssert.assertThat(parseQuery("Name8=xx%2C%20%20yy%20%20%2Czz"),
+ NameValuePairListMatcher.equalsTo(new BasicNameValuePair("Name8", "xx, yy ,zz")));
+ MatcherAssert.assertThat(parseQuery("price=10%20%E2%82%AC"),
+ NameValuePairListMatcher.equalsTo(new BasicNameValuePair("price", "10 \u20AC")));
+ MatcherAssert.assertThat(parseQuery("a=b\"c&d=e"),
+ NameValuePairListMatcher.equalsTo(
+ new BasicNameValuePair("a", "b\"c"),
+ new BasicNameValuePair("d", "e")));
+ MatcherAssert.assertThat(parseQuery("russian=" + URLEncoder.encode(RU_HELLO, "UTF-8") +
Review comment:
Please note that `URLEncoder` applies `application/x-www-form-urlencoded`. It does not comply with RFC 3986.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
For additional commands, e-mail: dev-help@hc.apache.org