Merge pull request #740 from SamWhited/jidrpfix
Fix RFC 6122 implementation
This commit is contained in:
Daniel Gultsch
commit
138345c5bf
|
|
@ -12,25 +12,25 @@ import gnu.inet.encoding.StringprepException;
|
|||
*/
|
||||
public final class Jid {
|
||||
|
||||
private final String localpart;
|
||||
private final String domainpart;
|
||||
private final String resourcepart;
|
||||
private final String localpart;
|
||||
private final String domainpart;
|
||||
private final String resourcepart;
|
||||
|
||||
// It's much more efficient to store the ful JID as well as the parts instead of figuring them
|
||||
// all out every time (since some characters are displayed but aren't used for comparisons).
|
||||
private final String displayjid;
|
||||
// It's much more efficient to store the ful JID as well as the parts instead of figuring them
|
||||
// all out every time (since some characters are displayed but aren't used for comparisons).
|
||||
private final String displayjid;
|
||||
|
||||
public String getLocalpart() {
|
||||
return localpart;
|
||||
}
|
||||
public String getLocalpart() {
|
||||
return localpart;
|
||||
}
|
||||
|
||||
public String getDomainpart() {
|
||||
return IDN.toUnicode(domainpart);
|
||||
}
|
||||
public String getDomainpart() {
|
||||
return IDN.toUnicode(domainpart);
|
||||
}
|
||||
|
||||
public String getResourcepart() {
|
||||
return resourcepart;
|
||||
}
|
||||
public String getResourcepart() {
|
||||
return resourcepart;
|
||||
}
|
||||
|
||||
public static Jid fromSessionID(SessionID id) throws InvalidJidException{
|
||||
if (id.getUserID().isEmpty()) {
|
||||
|
|
@ -40,152 +40,154 @@ public final class Jid {
|
|||
}
|
||||
}
|
||||
|
||||
public static Jid fromString(final String jid) throws InvalidJidException {
|
||||
return new Jid(jid);
|
||||
}
|
||||
public static Jid fromString(final String jid) throws InvalidJidException {
|
||||
return new Jid(jid);
|
||||
}
|
||||
|
||||
public static Jid fromParts(final String localpart,
|
||||
final String domainpart,
|
||||
final String resourcepart) throws InvalidJidException {
|
||||
String out;
|
||||
if (localpart == null || localpart.isEmpty()) {
|
||||
out = domainpart;
|
||||
} else {
|
||||
out = localpart + "@" + domainpart;
|
||||
}
|
||||
if (resourcepart != null && !resourcepart.isEmpty()) {
|
||||
out = out + "/" + resourcepart;
|
||||
}
|
||||
return new Jid(out);
|
||||
}
|
||||
public static Jid fromParts(final String localpart,
|
||||
final String domainpart,
|
||||
final String resourcepart) throws InvalidJidException {
|
||||
String out;
|
||||
if (localpart == null || localpart.isEmpty()) {
|
||||
out = domainpart;
|
||||
} else {
|
||||
out = localpart + "@" + domainpart;
|
||||
}
|
||||
if (resourcepart != null && !resourcepart.isEmpty()) {
|
||||
out = out + "/" + resourcepart;
|
||||
}
|
||||
return new Jid(out);
|
||||
}
|
||||
|
||||
private Jid(final String jid) throws InvalidJidException {
|
||||
// Hackish Android way to count the number of chars in a string... should work everywhere.
|
||||
final int atCount = jid.length() - jid.replace("@", "").length();
|
||||
final int slashCount = jid.length() - jid.replace("/", "").length();
|
||||
private Jid(final String jid) throws InvalidJidException {
|
||||
// Hackish Android way to count the number of chars in a string... should work everywhere.
|
||||
final int atCount = jid.length() - jid.replace("@", "").length();
|
||||
final int slashCount = jid.length() - jid.replace("/", "").length();
|
||||
|
||||
// Throw an error if there's anything obvious wrong with the JID...
|
||||
if (jid.isEmpty() || jid.length() > 3071) {
|
||||
throw new InvalidJidException(InvalidJidException.INVALID_LENGTH);
|
||||
}
|
||||
if (atCount > 1 || slashCount > 1 ||
|
||||
jid.startsWith("@") || jid.endsWith("@") ||
|
||||
jid.startsWith("/") || jid.endsWith("/")) {
|
||||
throw new InvalidJidException(InvalidJidException.INVALID_CHARACTER);
|
||||
}
|
||||
// Throw an error if there's anything obvious wrong with the JID...
|
||||
if (jid.isEmpty() || jid.length() > 3071) {
|
||||
throw new InvalidJidException(InvalidJidException.INVALID_LENGTH);
|
||||
}
|
||||
|
||||
String finaljid;
|
||||
// Go ahead and check if the localpart or resourcepart is empty.
|
||||
if (jid.startsWith("@") || (jid.endsWith("@") && slashCount == 0) || jid.startsWith("/") || (jid.endsWith("/") && slashCount < 2)) {
|
||||
throw new InvalidJidException(InvalidJidException.INVALID_CHARACTER);
|
||||
}
|
||||
|
||||
final int domainpartStart;
|
||||
if (atCount == 1) {
|
||||
final int atLoc = jid.indexOf("@");
|
||||
final String lp = jid.substring(0, atLoc);
|
||||
try {
|
||||
localpart = Stringprep.nodeprep(lp);
|
||||
} catch (final StringprepException e) {
|
||||
throw new InvalidJidException(InvalidJidException.STRINGPREP_FAIL, e);
|
||||
}
|
||||
if (localpart.isEmpty() || localpart.length() > 1023) {
|
||||
throw new InvalidJidException(InvalidJidException.INVALID_PART_LENGTH);
|
||||
}
|
||||
domainpartStart = atLoc + 1;
|
||||
finaljid = lp + "@";
|
||||
} else {
|
||||
localpart = "";
|
||||
finaljid = "";
|
||||
domainpartStart = 0;
|
||||
}
|
||||
String finaljid;
|
||||
|
||||
final String dp;
|
||||
if (slashCount == 1) {
|
||||
final int slashLoc = jid.indexOf("/");
|
||||
final String rp = jid.substring(slashLoc + 1, jid.length());
|
||||
try {
|
||||
resourcepart = Stringprep.resourceprep(rp);
|
||||
} catch (final StringprepException e) {
|
||||
throw new InvalidJidException(InvalidJidException.STRINGPREP_FAIL, e);
|
||||
}
|
||||
if (resourcepart.isEmpty() || resourcepart.length() > 1023) {
|
||||
throw new InvalidJidException(InvalidJidException.INVALID_PART_LENGTH);
|
||||
}
|
||||
dp = IDN.toUnicode(jid.substring(domainpartStart, slashLoc), IDN.USE_STD3_ASCII_RULES);
|
||||
finaljid = finaljid + dp + "/" + rp;
|
||||
} else {
|
||||
resourcepart = "";
|
||||
dp = IDN.toUnicode(jid.substring(domainpartStart, jid.length()),
|
||||
IDN.USE_STD3_ASCII_RULES);
|
||||
finaljid = finaljid + dp;
|
||||
}
|
||||
final int domainpartStart;
|
||||
final int atLoc = jid.indexOf("@");
|
||||
final int slashLoc = jid.indexOf("/");
|
||||
// If there is no "@" in the JID (eg. "example.net" or "example.net/resource")
|
||||
// or there are one or more "@" signs but they're all in the resourcepart (eg. "example.net/@/rp@"):
|
||||
if (atCount == 0 || (atCount > 0 && slashLoc != -1 && atLoc > slashLoc)) {
|
||||
localpart = "";
|
||||
finaljid = "";
|
||||
domainpartStart = 0;
|
||||
} else {
|
||||
final String lp = jid.substring(0, atLoc);
|
||||
try {
|
||||
localpart = Stringprep.nodeprep(lp);
|
||||
} catch (final StringprepException e) {
|
||||
throw new InvalidJidException(InvalidJidException.STRINGPREP_FAIL, e);
|
||||
}
|
||||
if (localpart.isEmpty() || localpart.length() > 1023) {
|
||||
throw new InvalidJidException(InvalidJidException.INVALID_PART_LENGTH);
|
||||
}
|
||||
domainpartStart = atLoc + 1;
|
||||
finaljid = lp + "@";
|
||||
}
|
||||
|
||||
// Remove trailing "." before storing the domain part.
|
||||
if (dp.endsWith(".")) {
|
||||
try {
|
||||
domainpart = IDN.toASCII(dp.substring(0, dp.length() - 1), IDN.USE_STD3_ASCII_RULES);
|
||||
} catch (final IllegalArgumentException e) {
|
||||
throw new InvalidJidException(e);
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
domainpart = IDN.toASCII(dp, IDN.USE_STD3_ASCII_RULES);
|
||||
} catch (final IllegalArgumentException e) {
|
||||
throw new InvalidJidException(e);
|
||||
}
|
||||
}
|
||||
final String dp;
|
||||
if (slashCount > 0) {
|
||||
final String rp = jid.substring(slashLoc + 1, jid.length());
|
||||
try {
|
||||
resourcepart = Stringprep.resourceprep(rp);
|
||||
} catch (final StringprepException e) {
|
||||
throw new InvalidJidException(InvalidJidException.STRINGPREP_FAIL, e);
|
||||
}
|
||||
if (resourcepart.isEmpty() || resourcepart.length() > 1023) {
|
||||
throw new InvalidJidException(InvalidJidException.INVALID_PART_LENGTH);
|
||||
}
|
||||
dp = IDN.toUnicode(jid.substring(domainpartStart, slashLoc), IDN.USE_STD3_ASCII_RULES);
|
||||
finaljid = finaljid + dp + "/" + rp;
|
||||
} else {
|
||||
resourcepart = "";
|
||||
dp = IDN.toUnicode(jid.substring(domainpartStart, jid.length()),
|
||||
IDN.USE_STD3_ASCII_RULES);
|
||||
finaljid = finaljid + dp;
|
||||
}
|
||||
|
||||
// TODO: Find a proper domain validation library; validate individual parts, separators, etc.
|
||||
if (domainpart.isEmpty() || domainpart.length() > 1023) {
|
||||
throw new InvalidJidException(InvalidJidException.INVALID_PART_LENGTH);
|
||||
}
|
||||
// Remove trailing "." before storing the domain part.
|
||||
if (dp.endsWith(".")) {
|
||||
try {
|
||||
domainpart = IDN.toASCII(dp.substring(0, dp.length() - 1), IDN.USE_STD3_ASCII_RULES);
|
||||
} catch (final IllegalArgumentException e) {
|
||||
throw new InvalidJidException(e);
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
domainpart = IDN.toASCII(dp, IDN.USE_STD3_ASCII_RULES);
|
||||
} catch (final IllegalArgumentException e) {
|
||||
throw new InvalidJidException(e);
|
||||
}
|
||||
}
|
||||
|
||||
this.displayjid = finaljid;
|
||||
}
|
||||
// TODO: Find a proper domain validation library; validate individual parts, separators, etc.
|
||||
if (domainpart.isEmpty() || domainpart.length() > 1023) {
|
||||
throw new InvalidJidException(InvalidJidException.INVALID_PART_LENGTH);
|
||||
}
|
||||
|
||||
public Jid toBareJid() {
|
||||
try {
|
||||
return resourcepart.isEmpty() ? this : fromParts(localpart, domainpart, "");
|
||||
} catch (final InvalidJidException e) {
|
||||
// This should never happen.
|
||||
return null;
|
||||
}
|
||||
}
|
||||
this.displayjid = finaljid;
|
||||
}
|
||||
|
||||
public Jid toDomainJid() {
|
||||
try {
|
||||
return resourcepart.isEmpty() && localpart.isEmpty() ? this : fromString(getDomainpart());
|
||||
} catch (final InvalidJidException e) {
|
||||
// This should never happen.
|
||||
return null;
|
||||
}
|
||||
}
|
||||
public Jid toBareJid() {
|
||||
try {
|
||||
return resourcepart.isEmpty() ? this : fromParts(localpart, domainpart, "");
|
||||
} catch (final InvalidJidException e) {
|
||||
// This should never happen.
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return displayjid;
|
||||
}
|
||||
public Jid toDomainJid() {
|
||||
try {
|
||||
return resourcepart.isEmpty() && localpart.isEmpty() ? this : fromString(getDomainpart());
|
||||
} catch (final InvalidJidException e) {
|
||||
// This should never happen.
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(final Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
@Override
|
||||
public String toString() {
|
||||
return displayjid;
|
||||
}
|
||||
|
||||
final Jid jid = (Jid) o;
|
||||
@Override
|
||||
public boolean equals(final Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
|
||||
return jid.hashCode() == this.hashCode();
|
||||
}
|
||||
final Jid jid = (Jid) o;
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
int result = localpart.hashCode();
|
||||
result = 31 * result + domainpart.hashCode();
|
||||
result = 31 * result + resourcepart.hashCode();
|
||||
return result;
|
||||
}
|
||||
return jid.hashCode() == this.hashCode();
|
||||
}
|
||||
|
||||
public boolean hasLocalpart() {
|
||||
return !localpart.isEmpty();
|
||||
}
|
||||
@Override
|
||||
public int hashCode() {
|
||||
int result = localpart.hashCode();
|
||||
result = 31 * result + domainpart.hashCode();
|
||||
result = 31 * result + resourcepart.hashCode();
|
||||
return result;
|
||||
}
|
||||
|
||||
public boolean isBareJid() {
|
||||
return this.resourcepart.isEmpty();
|
||||
}
|
||||
public boolean hasLocalpart() {
|
||||
return !localpart.isEmpty();
|
||||
}
|
||||
|
||||
public boolean isBareJid() {
|
||||
return this.resourcepart.isEmpty();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue