narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Check for illegal arguments to the toASCII func

Browse source
This commit is contained in:
Sam Whited 2014-11-09 09:05:02 -05:00
parent 7cfcf10f48
commit 53c7905631
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -157,7 +157,13 @@ public class XmppConnection implements Runnable {
while (socketError && values.size() > i) { while (socketError && values.size() > i) {
Bundle namePort = (Bundle) values.get(i); Bundle namePort = (Bundle) values.get(i);
try { try {
String srvRecordServer = IDN.toASCII(namePort.getString("name")); String srvRecordServer;
try {
srvRecordServer=IDN.toASCII(namePort.getString("name"));
} catch (final IllegalArgumentException e) {
// TODO: Handle me?`
srvRecordServer = "";
}
int srvRecordPort = namePort.getInt("port"); int srvRecordPort = namePort.getInt("port");
String srvIpServer = namePort.getString("ipv4"); String srvIpServer = namePort.getString("ipv4");
InetSocketAddress addr; InetSocketAddress addr;

12
src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java
View file

@ -108,9 +108,17 @@ public final class Jid {
// Remove trailling "." before storing the domain part. // Remove trailling "." before storing the domain part.
if (dp.endsWith(".")) { if (dp.endsWith(".")) {
domainpart = IDN.toASCII(dp.substring(0, dp.length() - 1), IDN.USE_STD3_ASCII_RULES); try {
domainpart = IDN.toASCII(dp.substring(0, dp.length() - 1), IDN.USE_STD3_ASCII_RULES);
} catch (final IllegalArgumentException e) {
throw new InvalidJidException(e);
}
} else { } else {
domainpart = IDN.toASCII(dp, IDN.USE_STD3_ASCII_RULES); try {
domainpart = IDN.toASCII(dp, IDN.USE_STD3_ASCII_RULES);
} catch (final IllegalArgumentException e) {
throw new InvalidJidException(e);
}
} }
// TODO: Find a proper domain validation library; validate individual parts, separators, etc. // TODO: Find a proper domain validation library; validate individual parts, separators, etc.