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

Fix DNS lookup

Browse Source
This commit is contained in:
Maxime Dor
2017-09-13 02:28:22 +02:00
parent 222f7f104a
commit d7258cd3c6
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,10 +46,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.xbill.DNS.Lookup; import org.xbill.DNS.*;
import org.xbill.DNS.SRVRecord;
import org.xbill.DNS.TextParseException;
import org.xbill.DNS.Type;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
@@ -130,10 +127,19 @@ public class InvitationManager {
log.info("Lookup name: {}", lookupDns); log.info("Lookup name: {}", lookupDns);
try { try {
SRVRecord[] records = (SRVRecord[]) new Lookup(lookupDns, Type.SRV).run(); List<SRVRecord> srvRecords = new ArrayList<>();
if (records != null) { Record[] rawRecords = new Lookup(lookupDns, Type.SRV).run();
Arrays.sort(records, Comparator.comparingInt(SRVRecord::getPriority)); if (rawRecords != null && rawRecords.length > 0) {
for (SRVRecord record : records) { for (Record record : rawRecords) {
if (Type.SRV == record.getType()) {
srvRecords.add((SRVRecord) record);
} else {
log.info("Got non-SRV record: {}", record.toString());
}
}
srvRecords.sort(Comparator.comparingInt(SRVRecord::getPriority));
for (SRVRecord record : srvRecords) {
log.info("Found SRV record: {}", record.toString()); log.info("Found SRV record: {}", record.toString());
return "https://" + record.getTarget().toString(true) + ":" + record.getPort(); return "https://" + record.getTarget().toString(true) + ":" + record.getPort();
} }