Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[#1212] Fix non-Latin characters decode in UrlEncodedParser #1213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xael-fry merged 1 commit into from
Aug 23, 2018
Merged

[#1212] Fix non-Latin characters decode in UrlEncodedParser #1213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions framework/src/play/data/parsing/UrlEncodedParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
Expand All @@ -15,7 +16,6 @@
import play.mvc.results.Status;
import play.utils.Utils;

import org.apache.commons.codec.net.URLCodec;

/**
* Parse url-encoded requests.
Expand Down Expand Up @@ -119,17 +119,17 @@ public Map<String, String[]> parse(InputStream is) {

// We're ready to decode the params
Map<String, String[]> decodedParams = new LinkedHashMap<>(params.size());
URLCodec codec = new URLCodec();
for (Map.Entry<String, String[]> e : params.entrySet()) {
String key = e.getKey();
try {
key = codec.decode(e.getKey(), charset);
key = URLDecoder.decode(e.getKey(), charset);
} catch (Throwable z) {
// Nothing we can do about, ignore
}
for (String value : e.getValue()) {
try {
Utils.Maps.mergeValueInMap(decodedParams, key, (value == null ? null : codec.decode(value, charset)));
String decodedValue = value == null ? null : URLDecoder.decode(value, charset);
Utils.Maps.mergeValueInMap(decodedParams, key, decodedValue);
} catch (Throwable z) {
// Nothing we can do about, lets fill in with the non decoded value
Utils.Maps.mergeValueInMap(decodedParams, key, value);
Expand Down
49 changes: 49 additions & 0 deletions framework/test-src/play/data/parsing/UrlEncodedParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package play.data.parsing;

import org.junit.Test;
import play.mvc.Http;
import play.test.FunctionalTest;

import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;

import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;

/**
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
public class UrlEncodedParserTest {

@Test
public void parseTest() {

Map<String, String[]> params = new HashMap<>();

params.put("english", new String[] {"Hello"});
params.put("russian", new String[] {"Привет"});
params.put("chinese", new String[] {"嗨"});

String queryString = params.entrySet()
.stream()
.map(entry -> entry.getKey() + "=" + entry.getValue()[0])
.collect(Collectors.joining("&"));

params.put("body", new String[] {queryString});

Http.Request req = FunctionalTest.newRequest();
Http.Request.current.set(req);

Map<String, String[]> parse = UrlEncodedParser.parse(queryString);

assertThat(parse.size(), is(params.size()));
assertThat(transform(parse), is(transform(params)));
}


private Map<String, String> transform(Map<String, String[]> map) {
// arrays in map values fail during asserting
return map.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue()[0]));
}
}