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

Fix RFC 6122 implementation

Browse source 
JID resourceparts should be able to contain "@" and "/" characters
This commit is contained in:
Sam Whited 2014-12-02 09:16:09 -05:00
parent 59402da60d
commit 3fc834c067
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,8 +68,9 @@ public final class Jid {
if (jid.isEmpty() || jid.length() > 3071) { if (jid.isEmpty() || jid.length() > 3071) {
throw new InvalidJidException(InvalidJidException.INVALID_LENGTH); throw new InvalidJidException(InvalidJidException.INVALID_LENGTH);
} }
if (atCount > 1 || slashCount > 1 ||
jid.startsWith("@") || jid.endsWith("@") || // Go ahead and check if the localpart or resourcepart is empty.
if (jid.startsWith("@") || jid.endsWith("@") ||
jid.startsWith("/") || jid.endsWith("/")) { jid.startsWith("/") || jid.endsWith("/")) {
throw new InvalidJidException(InvalidJidException.INVALID_CHARACTER); throw new InvalidJidException(InvalidJidException.INVALID_CHARACTER);
} }
@ -77,7 +78,7 @@ public final class Jid {
String finaljid; String finaljid;
final int domainpartStart; final int domainpartStart;
if (atCount == 1) { if (atCount >= 1) {
final int atLoc = jid.indexOf("@"); final int atLoc = jid.indexOf("@");
final String lp = jid.substring(0, atLoc); final String lp = jid.substring(0, atLoc);
try { try {
@ -97,7 +98,7 @@ public final class Jid {
} }
final String dp; final String dp;
if (slashCount == 1) { if (slashCount >= 1) {
final int slashLoc = jid.indexOf("/"); final int slashLoc = jid.indexOf("/");
final String rp = jid.substring(slashLoc + 1, jid.length()); final String rp = jid.substring(slashLoc + 1, jid.length());
try { try {