Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-26 02:57:52 +01:00
Code Issues Projects Releases Wiki Activity

URL parameters now work

Browse Source
This commit is contained in:
Rsl1122 2019-05-06 13:54:14 +03:00
parent 799c26ba99
commit ebb4314ab9
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plan/common/src/main/java/com/djrapitops/plan/system/webserver/Request.java
View File

@ -21,6 +21,7 @@ import com.djrapitops.plan.system.webserver.auth.Authentication;
import com.sun.net.httpserver.HttpExchange;
import java.io.InputStream;
import java.net.URI;
import java.util.Optional;
/**
@ -32,7 +33,9 @@ import java.util.Optional;
*/
public class Request {
private final String requestMethod;
private final String targetString;
private URI requestURI;
private final HttpExchange exchange;
private final String remoteAddress;
private final Locale locale;
@ -40,7 +43,7 @@ public class Request {
public Request(HttpExchange exchange, Locale locale) {
this.requestMethod = exchange.getRequestMethod();
this.targetString = exchange.getRequestURI().getPath();
requestURI = exchange.getRequestURI();
remoteAddress = exchange.getRemoteAddress().getAddress().getHostAddress();
@ -62,11 +65,11 @@ public class Request {
}
public String getTargetString() {
return targetString;
return requestURI.getPath() + '?' + requestURI.getQuery();
}
public RequestTarget getTarget() {
return new RequestTarget(targetString);
return new RequestTarget(requestURI);
}
public InputStream getRequestBody() {
@ -75,7 +78,7 @@ public class Request {
@Override
public String toString() {
return "Request:" + requestMethod + " " + targetString;
return "Request:" + requestMethod + " " + requestURI.getPath();
}
public String getRemoteAddress() {

9
Plan/common/src/main/java/com/djrapitops/plan/system/webserver/RequestTarget.java
View File

@ -16,6 +16,7 @@
*/
package com.djrapitops.plan.system.webserver;
import java.net.URI;
import java.util.*;
import java.util.stream.Collectors;
@ -30,13 +31,11 @@ public class RequestTarget {
private final List<String> resource;
private final Map<String, String> parameters;
public RequestTarget(String targetString) {
String[] resourceAndParameters = targetString.split("\\?", 2);
resourceString = resourceAndParameters.length >= 1 ? resourceAndParameters[0] : "/";
public RequestTarget(URI targetURI) {
resourceString = targetURI.getPath();
resource = Arrays.stream(resourceString.split("/")).filter(part -> !part.isEmpty()).collect(Collectors.toList());
String parameterString = resourceAndParameters.length >= 2 ? resourceAndParameters[1] : null;
String parameterString = targetURI.getQuery();
parameters = parseParameters(parameterString);
}