aboutsummaryrefslogtreecommitdiff
path: root/central
diff options
context:
space:
mode:
authorTrumeet <17158086+Trumeet@users.noreply.github.com>2021-01-20 17:15:20 -0800
committerTrumeet <17158086+Trumeet@users.noreply.github.com>2021-01-20 17:15:20 -0800
commit8a1035befb9d3304eca3ac1270ded696daf5a9b6 (patch)
treed924bde00a4c5fcd9fb063a9bb7dccdabbb98a1e /central
parentf626ccd662bf483e9b03dcdc6c87d7e6eb438e66 (diff)
downloaddn42peering-8a1035befb9d3304eca3ac1270ded696daf5a9b6.tar
dn42peering-8a1035befb9d3304eca3ac1270ded696daf5a9b6.tar.gz
dn42peering-8a1035befb9d3304eca3ac1270ded696daf5a9b6.tar.bz2
dn42peering-8a1035befb9d3304eca3ac1270ded696daf5a9b6.zip
fix(central): no Content-Type in response
Diffstat (limited to 'central')
-rw-r--r--central/src/main/java/moe/yuuta/dn42peering/asn/ASNHandler.java13
-rw-r--r--central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java41
-rw-r--r--central/src/main/java/moe/yuuta/dn42peering/portal/HTTPPortalVerticle.java6
3 files changed, 45 insertions, 15 deletions
diff --git a/central/src/main/java/moe/yuuta/dn42peering/asn/ASNHandler.java b/central/src/main/java/moe/yuuta/dn42peering/asn/ASNHandler.java
index b498fe1..7abc27e 100644
--- a/central/src/main/java/moe/yuuta/dn42peering/asn/ASNHandler.java
+++ b/central/src/main/java/moe/yuuta/dn42peering/asn/ASNHandler.java
@@ -2,6 +2,7 @@ package moe.yuuta.dn42peering.asn;
import io.vertx.core.*;
import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpHeaders;
import io.vertx.core.impl.logging.Logger;
import io.vertx.core.impl.logging.LoggerFactory;
import io.vertx.core.json.JsonObject;
@@ -57,7 +58,9 @@ public class ASNHandler implements ISubRouter {
.handler(ctx -> {
renderIndex(engine, null, null, res -> {
if(res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
ctx.fail(res.cause());
logger.error("Cannot render /asn.", res.cause());
@@ -147,7 +150,9 @@ public class ASNHandler implements ISubRouter {
final List<MailResult> sendRes = ar.result().list();
renderSuccess(engine, sendRes, res -> {
if(res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
ctx.fail(res.cause());
logger.error("Cannot render /asn (success).", res.cause());
@@ -162,7 +167,9 @@ public class ASNHandler implements ISubRouter {
upperASN,
res -> {
if(res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
ctx.fail(res.cause());
logger.error("Cannot render /asn (with errors).", res.cause());
diff --git a/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java b/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java
index 74f3943..b6820b9 100644
--- a/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java
+++ b/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java
@@ -8,6 +8,7 @@ import io.vertx.core.Future;
import io.vertx.core.Handler;
import io.vertx.core.Vertx;
import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpHeaders;
import io.vertx.core.impl.logging.Logger;
import io.vertx.core.impl.logging.LoggerFactory;
import io.vertx.core.json.JsonObject;
@@ -89,7 +90,9 @@ public class ManageHandler implements ISubRouter {
.<Buffer>compose(peers -> Future.future(f -> renderIndex(engine, asn, peers, f)))
.onComplete(res -> {
if (res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
ctx.fail(res.cause());
}
@@ -102,7 +105,9 @@ public class ManageHandler implements ISubRouter {
final String asn = ctx.user().principal().getString("username");
renderForm(engine, nodeService, true, asn, null, null, res -> {
if (res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
res.cause().printStackTrace();
ctx.fail(res.cause());
@@ -210,7 +215,9 @@ public class ManageHandler implements ISubRouter {
Arrays.asList(((FormException) err).errors),
res -> {
if (res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
ctx.fail(res.cause());
}
@@ -243,7 +250,9 @@ public class ManageHandler implements ISubRouter {
asn, peer, null, f)))
.onComplete(res -> {
if (res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
res.cause().printStackTrace();
ctx.fail(res.cause());
@@ -383,7 +392,9 @@ public class ManageHandler implements ISubRouter {
Arrays.asList(((FormException) err).errors),
res -> {
if (res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
ctx.fail(res.cause());
}
@@ -433,7 +444,9 @@ public class ManageHandler implements ISubRouter {
final String asn = ctx.user().principal().getString("username");
renderChangepw(engine, asn, null, res -> {
if (res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
res.cause().printStackTrace();
ctx.fail(res.cause());
@@ -483,7 +496,9 @@ public class ManageHandler implements ISubRouter {
Arrays.asList(((FormException) err).errors),
res -> {
if (res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
res.cause().printStackTrace();
ctx.fail(res.cause());
@@ -502,7 +517,9 @@ public class ManageHandler implements ISubRouter {
final String asn = ctx.user().principal().getString("username");
renderDA(engine, asn, null, res -> {
if (res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
res.cause().printStackTrace();
ctx.fail(res.cause());
@@ -540,7 +557,9 @@ public class ManageHandler implements ISubRouter {
Arrays.asList(((FormException) err).errors),
res -> {
if (res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
res.cause().printStackTrace();
ctx.fail(res.cause());
@@ -573,7 +592,9 @@ public class ManageHandler implements ISubRouter {
.compose(peer -> renderShowConfig(nodeService, engine, peer))
.onComplete(res -> {
if (res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
res.cause().printStackTrace();
ctx.fail(res.cause());
diff --git a/central/src/main/java/moe/yuuta/dn42peering/portal/HTTPPortalVerticle.java b/central/src/main/java/moe/yuuta/dn42peering/portal/HTTPPortalVerticle.java
index 9ce34ba..e124c35 100644
--- a/central/src/main/java/moe/yuuta/dn42peering/portal/HTTPPortalVerticle.java
+++ b/central/src/main/java/moe/yuuta/dn42peering/portal/HTTPPortalVerticle.java
@@ -2,6 +2,7 @@ package moe.yuuta.dn42peering.portal;
import io.vertx.core.AbstractVerticle;
import io.vertx.core.Promise;
+import io.vertx.core.http.HttpHeaders;
import io.vertx.core.impl.logging.Logger;
import io.vertx.core.impl.logging.LoggerFactory;
import io.vertx.core.json.JsonObject;
@@ -20,13 +21,14 @@ public class HTTPPortalVerticle extends AbstractVerticle {
final Router router = Router.router(vertx);
router.get("/")
- .produces("text/html")
.handler(ctx -> {
final JsonObject data = new JsonObject()
.put("name", config().getJsonObject("http").getValue("name"));
engine.render(data, "index.ftlh", res -> {
if(res.succeeded()) {
- ctx.response().end(res.result());
+ ctx.response()
+ .putHeader(HttpHeaders.CONTENT_TYPE, "text/html")
+ .end(res.result());
} else {
ctx.fail(res.cause());
logger.error("Cannot render index.", res.cause());
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 07:36:44 +0000