From 41d726ef73a20e7e7ee1ff81c5f8326aa0e6c7d8 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 2 May 2018 20:39:16 +0200 Subject: return InvalidJid object instead of null if Jid can not be parsed --- .../java/de/pixart/messenger/xmpp/InvalidJid.java | 140 +++++++++++++++++++++ .../de/pixart/messenger/xmpp/XmppConnection.java | 60 +++++---- .../messenger/xmpp/jingle/JingleCandidate.java | 3 +- .../stanzas/AbstractAcknowledgeableStanza.java | 5 + .../messenger/xmpp/stanzas/AbstractStanza.java | 21 ++-- .../de/pixart/messenger/xmpp/stanzas/IqPacket.java | 6 + 6 files changed, 200 insertions(+), 35 deletions(-) create mode 100644 src/main/java/de/pixart/messenger/xmpp/InvalidJid.java (limited to 'src/main/java/de/pixart/messenger/xmpp') diff --git a/src/main/java/de/pixart/messenger/xmpp/InvalidJid.java b/src/main/java/de/pixart/messenger/xmpp/InvalidJid.java new file mode 100644 index 000000000..fd4ca4b90 --- /dev/null +++ b/src/main/java/de/pixart/messenger/xmpp/InvalidJid.java @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2018, Daniel Gultsch All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package de.pixart.messenger.xmpp; + +import android.support.annotation.NonNull; + +import rocks.xmpp.addr.Jid; + +public class InvalidJid implements Jid { + + private final String value; + + public InvalidJid(String jid) { + this.value = jid; + } + + @Override + @NonNull + public String toString() { + return value; + } + + @Override + public boolean isFullJid() { + throw new AssertionError("Not implemented"); + } + + @Override + public boolean isBareJid() { + throw new AssertionError("Not implemented"); + } + + @Override + public Jid asBareJid() { + throw new AssertionError("Not implemented"); + } + + @Override + public Jid withLocal(CharSequence charSequence) { + throw new AssertionError("Not implemented"); + } + + @Override + public Jid withResource(CharSequence charSequence) { + throw new AssertionError("Not implemented"); + } + + @Override + public Jid atSubdomain(CharSequence charSequence) { + throw new AssertionError("Not implemented"); + } + + @Override + public String getLocal() { + throw new AssertionError("Not implemented"); + } + + @Override + public String getEscapedLocal() { + throw new AssertionError("Not implemented"); + } + + @Override + public String getDomain() { + throw new AssertionError("Not implemented"); + } + + @Override + public String getResource() { + throw new AssertionError("Not implemented"); + } + + @Override + public String toEscapedString() { + throw new AssertionError("Not implemented"); + } + + @Override + public int length() { + return value.length(); + } + + @Override + public char charAt(int index) { + return value.charAt(index); + } + + @Override + public CharSequence subSequence(int start, int end) { + return value.subSequence(start, end); + } + + @Override + public int compareTo(@NonNull Jid o) { + throw new AssertionError("Not implemented"); + } + + public static Jid getNullForInvalid(Jid jid) { + if (jid != null && jid instanceof InvalidJid) { + return null; + } else { + return jid; + } + } + + public static boolean isValid(Jid jid) { + if (jid != null && jid instanceof InvalidJid) { + return false; + } else { + return true; + } + } +} \ No newline at end of file diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java index 867fb824e..775f7b430 100644 --- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java @@ -5,6 +5,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.SystemClock; import android.security.KeyChain; +import android.support.annotation.NonNull; import android.util.Base64; import android.util.Log; import android.util.Pair; @@ -189,6 +190,25 @@ public class XmppConnection implements Runnable { mXmppConnectionService = service; } + private static void fixResource(Context context, Account account) { + String resource = account.getResource(); + int fixedPartLength = context.getString(R.string.app_name).length() + 1; //include the trailing dot + int randomPartLength = 4; // 3 bytes + if (resource != null && resource.length() > fixedPartLength + randomPartLength) { + if (validBase64(resource.substring(fixedPartLength, fixedPartLength + randomPartLength))) { + account.setResource(resource.substring(0, fixedPartLength + randomPartLength)); + } + } + } + + private static boolean validBase64(String input) { + try { + return Base64.decode(input, Base64.URL_SAFE).length == 3; + } catch (Throwable throwable) { + return false; + } + } + protected void changeStatus(final Account.State nextStatus) { synchronized (this) { this.mThread = Thread.currentThread(); @@ -690,8 +710,8 @@ public class XmppConnection implements Runnable { } } - private Element processPacket(final Tag currentTag, final int packetType) - throws XmlPullParserException, IOException { + private @NonNull + Element processPacket(final Tag currentTag, final int packetType) throws XmlPullParserException, IOException { Element element; switch (packetType) { case PACKET_IQ: @@ -704,7 +724,7 @@ public class XmppConnection implements Runnable { element = new PresencePacket(); break; default: - return null; + throw new AssertionError("Should never encounter invalid type"); } element.setAttributes(currentTag.getAttributes()); Tag nextTag = tagReader.readTag(); @@ -748,8 +768,9 @@ public class XmppConnection implements Runnable { private void processIq(final Tag currentTag) throws XmlPullParserException, IOException { final IqPacket packet = (IqPacket) processPacket(currentTag, PACKET_IQ); - if (packet.getId() == null) { - return; // an iq packet without id is definitely invalid + if (!packet.valid()) { + Log.e(Config.LOGTAG, "encountered invalid iq from='" + packet.getFrom() + "' to='" + packet.getTo() + "'"); + return; } if (packet instanceof JinglePacket) { @@ -793,11 +814,19 @@ public class XmppConnection implements Runnable { private void processMessage(final Tag currentTag) throws XmlPullParserException, IOException { final MessagePacket packet = (MessagePacket) processPacket(currentTag, PACKET_MESSAGE); + if (!packet.valid()) { + Log.e(Config.LOGTAG, "encountered invalid message from='" + packet.getFrom() + "' to='" + packet.getTo() + "'"); + return; + } this.messageListener.onMessagePacketReceived(account, packet); } private void processPresence(final Tag currentTag) throws XmlPullParserException, IOException { PresencePacket packet = (PresencePacket) processPacket(currentTag, PACKET_PRESENCE); + if (!packet.valid()) { + Log.e(Config.LOGTAG, "encountered invalid presence from='" + packet.getFrom() + "' to='" + packet.getTo() + "'"); + return; + } this.presenceListener.onPresencePacketReceived(account, packet); } @@ -1257,7 +1286,7 @@ public class XmppConnection implements Runnable { final List elements = packet.query().getChildren(); for (final Element element : elements) { if (element.getName().equals("item")) { - final Jid jid = element.getAttributeAsJid("jid"); + final Jid jid = InvalidJid.getNullForInvalid(element.getAttributeAsJid("jid")); if (jid != null && !jid.equals(account.getServer())) { items.add(jid); } @@ -1331,25 +1360,6 @@ public class XmppConnection implements Runnable { return mXmppConnectionService.getString(R.string.app_name) + '.' + nextRandomId(true); } - private static void fixResource(Context context, Account account) { - String resource = account.getResource(); - int fixedPartLength = context.getString(R.string.app_name).length() + 1; //include the trailing dot - int randomPartLength = 4; // 3 bytes - if (resource != null && resource.length() > fixedPartLength + randomPartLength) { - if (validBase64(resource.substring(fixedPartLength, fixedPartLength + randomPartLength))) { - account.setResource(resource.substring(0, fixedPartLength + randomPartLength)); - } - } - } - - private static boolean validBase64(String input) { - try { - return Base64.decode(input, Base64.URL_SAFE).length == 3; - } catch (Throwable throwable) { - return false; - } - } - private String nextRandomId() { return nextRandomId(false); } diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java index 9f163d5d9..e47b01d89 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.InvalidJid; import rocks.xmpp.addr.Jid; public class JingleCandidate { @@ -108,7 +109,7 @@ public class JingleCandidate { JingleCandidate parsedCandidate = new JingleCandidate( candidate.getAttribute("cid"), false); parsedCandidate.setHost(candidate.getAttribute("host")); - parsedCandidate.setJid(candidate.getAttributeAsJid("jid")); + parsedCandidate.setJid(InvalidJid.getNullForInvalid(candidate.getAttributeAsJid("jid"))); parsedCandidate.setType(candidate.getAttribute("type")); parsedCandidate.setPriority(Integer.parseInt(candidate .getAttribute("priority"))); diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractAcknowledgeableStanza.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractAcknowledgeableStanza.java index 22d035e6e..e795b40fd 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractAcknowledgeableStanza.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractAcknowledgeableStanza.java @@ -1,6 +1,7 @@ package de.pixart.messenger.xmpp.stanzas; import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.InvalidJid; abstract public class AbstractAcknowledgeableStanza extends AbstractStanza { @@ -28,4 +29,8 @@ abstract public class AbstractAcknowledgeableStanza extends AbstractStanza { } return null; } + + public boolean valid() { + return InvalidJid.isValid(getFrom()) && InvalidJid.isValid(getTo()); + } } diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java index 58d2a8b68..ee0884aa6 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java @@ -31,20 +31,23 @@ public class AbstractStanza extends Element { } public boolean fromServer(final Account account) { - return getFrom() == null - || getFrom().equals(Jid.of(account.getServer())) - || getFrom().equals(account.getJid().asBareJid()) - || getFrom().equals(account.getJid()); + final Jid from = getFrom(); + return from == null + || from.equals(Jid.of(account.getServer())) + || from.equals(account.getJid().asBareJid()) + || from.equals(account.getJid()); } public boolean toServer(final Account account) { - return getTo() == null - || getTo().equals(Jid.of(account.getServer())) - || getTo().equals(account.getJid().asBareJid()) - || getTo().equals(account.getJid()); + final Jid to = getTo(); + return to == null + || to.equals(Jid.of(account.getServer())) + || to.equals(account.getJid().asBareJid()) + || to.equals(account.getJid()); } public boolean fromAccount(final Account account) { - return getFrom() != null && getFrom().asBareJid().equals(account.getJid().asBareJid()); + final Jid from = getFrom(); + return from != null && from.asBareJid().equals(account.getJid().asBareJid()); } } diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/IqPacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/IqPacket.java index 2efc948f4..5f4e39eca 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/IqPacket.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/IqPacket.java @@ -66,4 +66,10 @@ public class IqPacket extends AbstractAcknowledgeableStanza { return packet; } + @Override + public boolean valid() { + String id = getId(); + return id != null && super.valid(); + } + } -- cgit v1.2.3