Skip to content
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.

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

fix non-unique-parameter check for post request #228

Merged
merged 2 commits into from
Aug 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Changelog
=========

## 1.7.0-SNAPSHOT (current master)

### Bug Fixes

* fix bug which prevented error messages from being returned for non-unique parameters in POST requests. ([#228])

[#228]: https://github.com/GIScience/ohsome-api/pull/228


## 1.6.0

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<url>https://api.ohsome.org</url>
<description>A public Web-RESTful-API for "ohsome" OpenStreetMap history data.</description>
<packaging>jar</packaging>
<version>1.6.0-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>

<scm>
<connection>scm:git:git@github.com:GIScience/ohsome-api.git</connection>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
import java.io.IOException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -726,24 +724,10 @@ private void checkParameters(HttpServletRequest servletRequest) {
throw new BadRequestException(
StringSimilarity.findSimilarParameters(unexpectedParam, possibleParameters));
}
if (servletRequest.getQueryString() != null) {
String queryString = servletRequest.getQueryString();
String[] queryStringArray = queryString.split("&");
List<String> paramsValuesList = Arrays.asList(queryStringArray);
List<String> paramsList = new ArrayList<>();
String param;
for (int i = 0; i < paramsValuesList.size(); i++) {
if (!paramsValuesList.get(i).contains("=")) {
paramsValuesList.set(i, paramsValuesList.get(i).concat("="));
}
param = paramsValuesList.get(i).substring(0, paramsValuesList.get(i).indexOf("="));
paramsList.add(param);
}
for (String parameter : paramsList) {
if (Collections.frequency(paramsList, parameter) > 1) {
throw new BadRequestException("Every parameter has to be unique. "
+ "You can't give more than one '" + parameter + "' parameter.");
}
for (var parameter : servletRequest.getParameterMap().entrySet()) {
if (parameter.getValue().length != 1) {
throw new BadRequestException("Every parameter has to be unique. "
+ "You can't give more than one '" + parameter + "' parameter.");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1328,4 +1328,15 @@ public void getRequestEndsByQuestionMarkTest() {
restTemplate.getForEntity(server + port + "/users/count?", JsonNode.class);
assertEquals(null, response.getBody().get("error"));
}

@Test
public void getRequestNonUniqueParam() {
TestRestTemplate restTemplate = new TestRestTemplate();
ResponseEntity<JsonNode> response =
restTemplate.getForEntity(
server + port + "/users/count?bboxes=8.67452,49.40961,8.70392,49.41823&"
+ "time=2014-01-01/2015-01-01&filter=type:node&filter=type:way",
JsonNode.class);
assertEquals(400, response.getStatusCode().value());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1225,4 +1225,17 @@ public void countDensityOfContributionsToShopsInOldtownHeidelbergTest() {
assertEquals(85.45, response.getBody().get("result").get(0).get("value").asDouble(),
deltaPercentage);
}

@Test
public void postRequestNonUniqueParam() {
TestRestTemplate restTemplate = new TestRestTemplate();
MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
map.add("bboxes", "8.69282,49.40766,8.71673,49.4133");
map.add("time", "2018-01-01,2019-01-01");
map.add("filter", "type:node");
map.add("filter", "type:way");
ResponseEntity<JsonNode> response = restTemplate
.postForEntity(server + port + "/contributions/count/density", map, JsonNode.class);
assertEquals(400, response.getStatusCode().value());
}
}