Added HTTP HEAD handling & better error handling
sendResponseHeaders failed silently which broke even the error message
This commit is contained in:
parent
3377290dfa
commit
72e35d25d5
1 changed files with 12 additions and 2 deletions
|
@ -29,9 +29,19 @@ public class IOHelper {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void SendResponse(int code, String content, HttpExchange exchange) throws IOException {
|
public static void SendResponse(int code, String content, HttpExchange exchange) throws IOException {
|
||||||
|
if (exchange.getRequestMethod().equalsIgnoreCase("HEAD")) {
|
||||||
|
exchange.sendResponseHeaders(code, 0);
|
||||||
|
exchange.getResponseBody().close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
try (BufferedOutputStream out = new BufferedOutputStream(exchange.getResponseBody())) {
|
try (BufferedOutputStream out = new BufferedOutputStream(exchange.getResponseBody())) {
|
||||||
try (ByteArrayInputStream bis = new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8))) {
|
try (ByteArrayInputStream bis = new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8))) {
|
||||||
|
try {
|
||||||
exchange.sendResponseHeaders(code, bis.available());
|
exchange.sendResponseHeaders(code, bis.available());
|
||||||
|
} catch (IOException e) {
|
||||||
|
if (!e.getMessage().equals("headers already sent"))
|
||||||
|
throw e; // If an error occurs after sending the response headers send the error page even if the headers are for the original
|
||||||
|
} // This code will send *some page* (most likely an error page) with the original headers instead of failing to do anything
|
||||||
byte[] buffer = new byte[512];
|
byte[] buffer = new byte[512];
|
||||||
int count;
|
int count;
|
||||||
while ((count = bis.read(buffer)) != -1) {
|
while ((count = bis.read(buffer)) != -1) {
|
||||||
|
@ -139,7 +149,7 @@ public class IOHelper {
|
||||||
return null;
|
return null;
|
||||||
WebUser user = ChromaGamerBase.getUser(cookies.get("user_id").getValue(), WebUser.class);
|
WebUser user = ChromaGamerBase.getUser(cookies.get("user_id").getValue(), WebUser.class);
|
||||||
if (user != null && cookies.get("session_id") != null
|
if (user != null && cookies.get("session_id") != null
|
||||||
&& cookies.get("session_id").getValue().equals(user.sessionID().get())) {
|
&& cookies.get("session_id").getValue().equals(user.sessionID().get().toString())) {
|
||||||
if (cookies.getExpireTimeParsed().minusYears(1).isBefore(ZonedDateTime.now(ZoneId.of("GMT"))))
|
if (cookies.getExpireTimeParsed().minusYears(1).isBefore(ZonedDateTime.now(ZoneId.of("GMT"))))
|
||||||
LoginUser(exchange, user);
|
LoginUser(exchange, user);
|
||||||
return user;
|
return user;
|
||||||
|
|
Loading…
Reference in a new issue