sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

made domain verifier case insensitive. fixes #3495

This commit is contained in:
Daniel Gultsch 2019-07-20 17:51:37 +02:00
parent c87e43eb92
commit a4665d4657
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/eu/siacs/conversations/crypto/XmppDomainVerifier.java
View File

@ -22,6 +22,7 @@ import java.security.cert.X509Certificate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Locale;
import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSession;
@ -80,14 +81,14 @@ public class XmppDomainVerifier implements DomainHostnameVerifier {
break; break;
} }
Log.d(LOGTAG, "comparing " + needle.substring(i) + " and " + entry.substring(1)); Log.d(LOGTAG, "comparing " + needle.substring(i) + " and " + entry.substring(1));
if (needle.substring(i).equals(entry.substring(1))) { if (needle.substring(i).equalsIgnoreCase(entry.substring(1))) {
Log.d(LOGTAG, "domain " + needle + " matched " + entry); Log.d(LOGTAG, "domain " + needle + " matched " + entry);
return true; return true;
} }
offset = i + 1; offset = i + 1;
} }
} else { } else {
if (entry.equals(needle)) { if (entry.equalsIgnoreCase(needle)) {
Log.d(LOGTAG, "domain " + needle + " matched " + entry); Log.d(LOGTAG, "domain " + needle + " matched " + entry);
return true; return true;
} }
@ -117,25 +118,25 @@ public class XmppDomainVerifier implements DomainHostnameVerifier {
List<String> domains = new ArrayList<>(); List<String> domains = new ArrayList<>();
if (alternativeNames != null) { if (alternativeNames != null) {
for (List<?> san : alternativeNames) { for (List<?> san : alternativeNames) {
Integer type = (Integer) san.get(0); final Integer type = (Integer) san.get(0);
if (type == 0) { if (type == 0) {
Pair<String, String> otherName = parseOtherName((byte[]) san.get(1)); final Pair<String, String> otherName = parseOtherName((byte[]) san.get(1));
if (otherName != null) { if (otherName != null && otherName.first != null && otherName.second != null) {
switch (otherName.first) { switch (otherName.first) {
case SRV_NAME: case SRV_NAME:
srvNames.add(otherName.second); srvNames.add(otherName.second.toLowerCase(Locale.US));
break; break;
case XMPP_ADDR: case XMPP_ADDR:
xmppAddrs.add(otherName.second); xmppAddrs.add(otherName.second.toLowerCase(Locale.US));
break; break;
default: default:
Log.d(LOGTAG, "oid: " + otherName.first + " value: " + otherName.second); Log.d(LOGTAG, "oid: " + otherName.first + " value: " + otherName.second);
} }
} }
} else if (type == 2) { } else if (type == 2) {
Object value = san.get(1); final Object value = san.get(1);
if (value instanceof String) { if (value instanceof String) {
domains.add((String) value); domains.add(((String) value).toLowerCase(Locale.US));
} }
} }
} }