cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

Merge branch 'MSC2140'

Browse Source 
# Conflicts:
#	src/main/java/io/kamax/mxisd/session/SessionManager.java
This commit is contained in:
Anatoly Sablin
2019-11-07 22:27:39 +03:00
parent 94441d0446 0786a6520f
commit 494c9e3941
74 changed files with 2454 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/io/kamax/mxisd/session/SessionManager.java
View File

@@ -57,6 +57,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
@@ -240,12 +242,26 @@ public class SessionManager {
}
}
private String getDomain(String publicUrl) {
URL url;
try {
url = new URL(publicUrl);
} catch (MalformedURLException e) {
log.error("Malformed public url, use as is");
return publicUrl;
}
int port = url.getPort();
return url.getHost() + (port != -1 ? ":" + url.getPort() : "");
}
private void checkAuthorization(String auth, JsonObject reqData) {
if (!auth.startsWith("X-Matrix ")) {
throw new NotAllowedException("Wrong authorization header");
}
if (StringUtils.isBlank(cfg.getServer().getPublicUrl())) {
String domain = getDomain(cfg.getServer().getPublicUrl());
if (StringUtils.isBlank(domain)) {
throw new NotAllowedException("Unable to verify request, missing `server.publicUrl` property");
}
@@ -287,7 +303,7 @@ public class SessionManager {
jsonObject.addProperty("method", "POST");
jsonObject.addProperty("uri", "/_matrix/identity/api/v1/3pid/unbind");
jsonObject.addProperty("origin", origin);
jsonObject.addProperty("destination_is", URI.create(cfg.getServer().getPublicUrl()).getHost());
jsonObject.addProperty("destination_is", domain);
jsonObject.add("content", reqData);
String canonical = MatrixJson.encodeCanonical(jsonObject);