zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 00:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix --content-type and --data inputs in curl command

Browse source 
content-type needs to be parsed (no automatic parsing from String)

data was splitting on commas, meaning --data="key=value1,value2" was sent to the server as "key=value1&value2"

NOTE - you'd expect there to already be a "do nothing splitter", right? But there isn't :/

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=223346887
This commit is contained in:
guyben 2018-11-29 08:04:09 -08:00 • committed by jianglai
parent 5d2bb892f3
commit 849ea0e0f3
2 changed files with 67 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
java/google/registry/tools/CurlCommand.java
View file

@ -14,11 +14,15 @@
package google.registry.tools;
import static com.google.common.base.Preconditions.checkArgument;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.beust.jcommander.IStringConverter;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.beust.jcommander.converters.IParameterSplitter;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.net.MediaType;
@ -50,6 +54,7 @@ class CurlCommand implements CommandWithConnection {
@Parameter(
names = {"-t", "--content-type"},
converter = MediaTypeConverter.class,
description =
"Media type of the request body (for a POST request. Must be combined with --body)")
private MediaType mimeType = MediaType.PLAIN_TEXT_UTF_8;
@ -58,6 +63,7 @@ class CurlCommand implements CommandWithConnection {
// GET...)
@Parameter(
names = {"-d", "--data"},
splitter = NoSplittingSplitter.class,
description =
"Body for a post request. If specified, a POST request is sent. If "
+ "absent, a GET request is sent.")
@ -95,4 +101,20 @@ class CurlCommand implements CommandWithConnection {
Joiner.on("&").join(data).getBytes(UTF_8));
System.out.println(response);
}
public static class MediaTypeConverter implements IStringConverter<MediaType> {
@Override
public MediaType convert(String mediaType) {
List<String> parts = Splitter.on('/').splitToList(mediaType);
checkArgument(parts.size() == 2, "invalid MediaType '%s'", mediaType);
return MediaType.create(parts.get(0), parts.get(1)).withCharset(UTF_8);
}
}
public static class NoSplittingSplitter implements IParameterSplitter {
@Override
public List<String> split(String value) {
return ImmutableList.of(value);
}
}
}