mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-21 05:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed WebAPI variable parsing by replacing split symbol: & -> ;&

Browse Source
This commit is contained in:
Rsl1122 2017-09-20 10:26:37 +03:00
parent ad23d1e60d
commit c7b2523fec
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIResponseHandler.java
View File

@ -17,11 +17,9 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors;
/** /**
* Handles choosing of the correct API response to an API request. * Handles choosing of the correct API response to an API request.
@ -71,7 +69,7 @@ public class APIResponseHandler {
return PageCache.loadPage(error, () -> new BadRequestResponse(error)); return PageCache.loadPage(error, () -> new BadRequestResponse(error));
} }
Map<String, String> variables = readVariables(requestBody); Map<String, String> variables = WebAPI.readVariables(requestBody);
String sender = variables.get("sender"); String sender = variables.get("sender");
Log.debug("Received WebAPI Request" + target + " from " + sender); Log.debug("Received WebAPI Request" + target + " from " + sender);
if (!checkKey(sender)) { if (!checkKey(sender)) {
@ -128,13 +126,4 @@ public class APIResponseHandler {
return false; return false;
} }
} }
private Map<String, String> readVariables(String requestBody) {
String[] variables = requestBody.split("&");
return Arrays.stream(variables)
.map(variable -> variable.split("=", 2))
.filter(splitVariables -> splitVariables.length == 2)
.collect(Collectors.toMap(splitVariables -> splitVariables[0], splitVariables -> splitVariables[1], (a, b) -> b));
}
} }

35
Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPI.java
View File

@ -26,9 +26,11 @@ import java.net.SocketTimeoutException;
import java.net.URL; import java.net.URL;
import java.security.KeyManagementException; import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors;
/** /**
* @author Rsl1122 * @author Rsl1122
@ -93,17 +95,11 @@ public abstract class WebAPI {
connection.setRequestProperty("charset", "ISO-8859-1"); connection.setRequestProperty("charset", "ISO-8859-1");
StringBuilder parameters = new StringBuilder(); String parameters = parseVariables();
String serverUUID = MiscUtils.getIPlan().getServerUuid().toString();
parameters.append("sender=").append(serverUUID).append("&");
for (Map.Entry<String, String> entry : variables.entrySet()) {
parameters.append("&").append(entry.getKey()).append("=").append(entry.getValue());
}
String params = parameters.toString();
connection.setRequestProperty("Content-Length", Integer.toString(params.length())); connection.setRequestProperty("Content-Length", Integer.toString(parameters.length()));
byte[] toSend = params.getBytes(); byte[] toSend = parameters.getBytes();
int length = toSend.length; int length = toSend.length;
// connection.setRequestProperty("Content-Length", Integer.toString(length)); // connection.setRequestProperty("Content-Length", Integer.toString(length));
@ -149,7 +145,7 @@ public abstract class WebAPI {
return sc.getSocketFactory(); return sc.getSocketFactory();
} }
static TrustManager[] trustAllCerts = new TrustManager[]{ private static TrustManager[] trustAllCerts = new TrustManager[]{
new X509TrustManager() { new X509TrustManager() {
public java.security.cert.X509Certificate[] getAcceptedIssuers() { public java.security.cert.X509Certificate[] getAcceptedIssuers() {
return null; return null;
@ -176,4 +172,23 @@ public abstract class WebAPI {
protected Response badRequest(String error) { protected Response badRequest(String error) {
return PageCache.loadPage(error, () -> new BadRequestResponse(error)); return PageCache.loadPage(error, () -> new BadRequestResponse(error));
} }
private String parseVariables() {
StringBuilder parameters = new StringBuilder();
String serverUUID = MiscUtils.getIPlan().getServerUuid().toString();
parameters.append("sender=").append(serverUUID);
for (Map.Entry<String, String> entry : variables.entrySet()) {
parameters.append(";&").append(entry.getKey()).append("=").append(entry.getValue());
}
return parameters.toString();
}
public static Map<String, String> readVariables(String requestBody) {
String[] variables = requestBody.split(";&");
return Arrays.stream(variables)
.map(variable -> variable.split("=", 2))
.filter(splitVariables -> splitVariables.length == 2)
.collect(Collectors.toMap(splitVariables -> splitVariables[0], splitVariables -> splitVariables[1], (a, b) -> b));
}
} }