tomas.kracmar/ma1sd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Respond with application/json for the register submitToken.

Browse Source
This commit is contained in:
Anatoliy Sablin
2021-02-04 21:10:25 +03:00
parent ea8e386939
commit ed9dcc4061
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/io/kamax/mxisd/http/undertow/handler/BasicHttpHandler.java
View File

@@ -33,6 +33,7 @@ import io.kamax.mxisd.util.RestClientUtils;
import io.undertow.server.HttpHandler; import io.undertow.server.HttpHandler;
import io.undertow.server.HttpServerExchange; import io.undertow.server.HttpServerExchange;
import io.undertow.server.handlers.form.FormData; import io.undertow.server.handlers.form.FormData;
import io.undertow.util.Headers;
import io.undertow.util.HttpString; import io.undertow.util.HttpString;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -203,26 +204,34 @@ public abstract class BasicHttpHandler implements HttpHandler {
} }
protected void proxyPost(HttpServerExchange exchange, JsonObject body, CloseableHttpClient client, ClientDnsOverwrite dns) { protected void proxyPost(HttpServerExchange exchange, JsonObject body, CloseableHttpClient client, ClientDnsOverwrite dns) {
proxyPost(exchange, body, client, dns, false);
}
protected void proxyPost(HttpServerExchange exchange, JsonObject body, CloseableHttpClient client, ClientDnsOverwrite dns,
boolean defaultJsonResponse) {
String target = dns.transform(URI.create(exchange.getRequestURL())).toString(); String target = dns.transform(URI.create(exchange.getRequestURL())).toString();
log.info("Requesting remote: {}", target); log.info("Requesting remote: {}", target);
HttpPost req = RestClientUtils.post(target, GsonUtil.get(), body); HttpPost req = RestClientUtils.post(target, GsonUtil.get(), body);
exchange.getRequestHeaders().forEach(header -> { exchange.getRequestHeaders().forEach(header -> header.forEach(v -> {
header.forEach(v -> { String name = header.getHeaderName().toString();
String name = header.getHeaderName().toString(); if (!StringUtils.startsWithIgnoreCase(name, "content-")) {
if (!StringUtils.startsWithIgnoreCase(name, "content-")) { req.addHeader(name, v);
req.addHeader(name, v); }
} }));
});
});
boolean missingJsonResponse = true;
try (CloseableHttpResponse res = client.execute(req)) { try (CloseableHttpResponse res = client.execute(req)) {
exchange.setStatusCode(res.getStatusLine().getStatusCode()); exchange.setStatusCode(res.getStatusLine().getStatusCode());
for (Header h : res.getAllHeaders()) { for (Header h : res.getAllHeaders()) {
for (HeaderElement el : h.getElements()) { for (HeaderElement el : h.getElements()) {
missingJsonResponse = !Headers.CONTENT_TYPE_STRING.equalsIgnoreCase(h.getName());
exchange.getResponseHeaders().add(HttpString.tryFromString(h.getName()), el.getValue()); exchange.getResponseHeaders().add(HttpString.tryFromString(h.getName()), el.getValue());
} }
} }
if (defaultJsonResponse && missingJsonResponse) {
exchange.getRequestHeaders().add(Headers.CONTENT_TYPE, "application/json");
}
res.getEntity().writeTo(exchange.getOutputStream()); res.getEntity().writeTo(exchange.getOutputStream());
exchange.endExchange(); exchange.endExchange();
} catch (IOException e) { } catch (IOException e) {

2
src/main/java/io/kamax/mxisd/http/undertow/handler/register/v1/Register3pidRequestTokenHandler.java
View File

@@ -71,7 +71,7 @@ public class Register3pidRequestTokenHandler extends BasicHttpHandler {
throw new NotAllowedException("Your " + medium + " address cannot be used for registration"); throw new NotAllowedException("Your " + medium + " address cannot be used for registration");
} }
proxyPost(exchange, body, client, dns); proxyPost(exchange, body, client, dns, true);
} }
} }