Skip to content
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: 8 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,18 @@
<url>https://github.com/JavaWebStack/http-server/tree/master</url>
</scm>

<repositories>
<repository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.javawebstack</groupId>
<artifactId>validator</artifactId>
<version>1.0.1</version>
<version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
Expand Down
30 changes: 22 additions & 8 deletions src/main/java/org/javawebstack/httpserver/Exchange.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
Expand All @@ -35,7 +36,7 @@ public static Exchange current() {
public Exchange(HTTPServer server, IHTTPSocket socket) {
this.server = server;
this.socket = socket;
this.method = "websocket".equalsIgnoreCase(socket.getRequestHeader("upgrade")) ? HTTPMethod.WEBSOCKET : socket.getRequestMethod();
this.method = getRequestMethodFromSocket(socket);
this.queryParameters = AbstractElement.fromFormData(socket.getRequestQuery()).object();
}

Expand All @@ -52,13 +53,7 @@ public <T> T body(Class<T> clazz) {
if (body.length() == 0)
body = "{}";

String contentType = getContentType().toLowerCase();

if (contentType.contains(";")) {
contentType = contentType.split(";")[0].trim();
}

MimeType type = MimeType.byMimeType(contentType);
MimeType type = getMimeType();
if (type == null)
type = MimeType.JSON;
AbstractElement request = null;
Expand Down Expand Up @@ -292,4 +287,23 @@ protected static AbstractElement getPathElement(AbstractElement source, String p
return getPathElement(getPathElement(source, spl[0]), path.substring(spl[0].length() + 1));
}

private HTTPMethod getRequestMethodFromSocket(IHTTPSocket socket) {
if ("websocket".equalsIgnoreCase(socket.getRequestHeader("upgrade")))
return HTTPMethod.WEBSOCKET;
if (server.isFormMethods() && (socket.getRequestMethod() == HTTPMethod.GET || socket.getRequestMethod() == HTTPMethod.POST) && getMimeType() == MimeType.X_WWW_FORM_URLENCODED) {
String rawMethodOverride = getBodyPathElement("_method").string();
if (rawMethodOverride != null)
return HTTPMethod.valueOf(rawMethodOverride);
}
return socket.getRequestMethod();
}

public MimeType getMimeType() {
String contentType = getContentType().toLowerCase();
if (contentType.contains(";")) {
contentType = contentType.split(";")[0].trim();
}

return MimeType.byMimeType(contentType);
}
}
9 changes: 9 additions & 0 deletions src/main/java/org/javawebstack/httpserver/HTTPServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public class HTTPServer implements RouteParamTransformerProvider {
private final Map<String, RequestHandler> beforeMiddleware = new HashMap<>();
private final Map<String, AfterRequestHandler> afterMiddleware = new HashMap<>();
private Function<Class<?>, Object> controllerInitiator = this::defaultControllerInitiator;
private boolean formMethods = true;

public HTTPServer() {
this(new UndertowHTTPSocketServer());
Expand Down Expand Up @@ -415,4 +416,12 @@ public ExceptionHandler getExceptionHandler() {
return exceptionHandler;
}

public boolean isFormMethods() {
return formMethods;
}

public HTTPServer disableFormMethods() {
formMethods = false;
return this;
}
}