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

Be consistent with DNS overwrite (always a URL)

Browse Source
This commit is contained in:
Maxime Dor
2017-09-29 05:38:58 +02:00
parent ed2d13decf
commit b6008a41f2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/io/kamax/mxisd/invitation/InvitationManager.java
View File

@@ -57,6 +57,8 @@ import javax.annotation.PreDestroy;
import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@@ -163,7 +165,11 @@ public class InvitationManager {
if (entryOpt.isPresent()) { if (entryOpt.isPresent()) {
String entry = entryOpt.get(); String entry = entryOpt.get();
log.info("Found DNS overwrite for {} to {}", domain, entry); log.info("Found DNS overwrite for {} to {}", domain, entry);
return "https://" + entry; try {
return new URL(entry).toString();
} catch (MalformedURLException e) {
log.warn("Skipping homeserver Federation DNS overwrite for {} - not a valid URL: {}", domain, entry);
}
} }
log.debug("Performing SRV lookup for {}", domain); log.debug("Performing SRV lookup for {}", domain);