fixed caps hash generation for empty form values

src/main/java/eu/siacs/conversations/entities/Presence.java

@@ -1,5 +1,7 @@
 package eu.siacs.conversations.entities;
 
+import android.support.annotation.NonNull;
+
 import java.lang.Comparable;
 import java.util.Locale;
 
@@ -62,7 +64,7 @@ public class Presence implements Comparable {
 		return new Presence(Status.fromShowString(show), ver, hash, node, message);
 	}
 
-	public int compareTo(Object other) {
+	public int compareTo(@NonNull Object other) {
 		return this.status.compareTo(((Presence)other).status);
 	}
 

src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java

@@ -2,7 +2,10 @@ package eu.siacs.conversations.entities;
 
 import android.content.ContentValues;
 import android.database.Cursor;
+import android.support.annotation.NonNull;
 import android.util.Base64;
+import android.util.Log;
+
 import java.io.UnsupportedEncodingException;
 import java.lang.Comparable;
 import java.security.MessageDigest;
@@ -16,6 +19,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xml.Namespace;
 import eu.siacs.conversations.xmpp.forms.Data;
@@ -27,25 +31,257 @@ public class ServiceDiscoveryResult {
 	public static final String HASH = "hash";
 	public static final String VER = "ver";
 	public static final String RESULT = "result";
+	protected final String hash;
+	protected final byte[] ver;
+	protected final List<String> features;
+	protected final List<Data> forms;
+	private final List<Identity> identities;
+	public ServiceDiscoveryResult(final IqPacket packet) {
+		this.identities = new ArrayList<>();
+		this.features = new ArrayList<>();
+		this.forms = new ArrayList<>();
+		this.hash = "sha-1"; // We only support sha-1 for now
 
-	protected static String blankNull(String s) {
+		final List<Element> elements = packet.query().getChildren();
-		return s == null ? "" : s;
+
+		for (final Element element : elements) {
+			if (element.getName().equals("identity")) {
+				Identity id = new Identity(element);
+				if (id.getType() != null && id.getCategory() != null) {
+					identities.add(id);
+				}
+			} else if (element.getName().equals("feature")) {
+				if (element.getAttribute("var") != null) {
+					features.add(element.getAttribute("var"));
+				}
+			} else if (element.getName().equals("x") && element.getAttribute("xmlns").equals(Namespace.DATA)) {
+				forms.add(Data.parse(element));
+			}
+		}
+		this.ver = this.mkCapHash();
+	}
+	private ServiceDiscoveryResult(String hash, byte[] ver, JSONObject o) throws JSONException {
+		this.identities = new ArrayList<>();
+		this.features = new ArrayList<>();
+		this.forms = new ArrayList<>();
+		this.hash = hash;
+		this.ver = ver;
+
+		JSONArray identities = o.optJSONArray("identities");
+		if (identities != null) {
+			for (int i = 0; i < identities.length(); i++) {
+				this.identities.add(new Identity(identities.getJSONObject(i)));
+			}
+		}
+		JSONArray features = o.optJSONArray("features");
+		if (features != null) {
+			for (int i = 0; i < features.length(); i++) {
+				this.features.add(features.getString(i));
+			}
+		}
+		JSONArray forms = o.optJSONArray("forms");
+		if (forms != null) {
+			for (int i = 0; i < forms.length(); i++) {
+				this.forms.add(createFormFromJSONObject(forms.getJSONObject(i)));
+			}
+		}
+	}
+
+	public ServiceDiscoveryResult(Cursor cursor) throws JSONException {
+		this(
+				cursor.getString(cursor.getColumnIndex(HASH)),
+				Base64.decode(cursor.getString(cursor.getColumnIndex(VER)), Base64.DEFAULT),
+				new JSONObject(cursor.getString(cursor.getColumnIndex(RESULT)))
+		);
+	}
+
+	private static String clean(String s) {
+		return s.replace("<","&lt;");
+	}
+
+	private static String blankNull(String s) {
+		return s == null ? "" : clean(s);
+	}
+
+	private static Data createFormFromJSONObject(JSONObject o) {
+		Data data = new Data();
+		JSONArray names = o.names();
+		for (int i = 0; i < names.length(); ++i) {
+			try {
+				String name = names.getString(i);
+				JSONArray jsonValues = o.getJSONArray(name);
+				ArrayList<String> values = new ArrayList<>(jsonValues.length());
+				for (int j = 0; j < jsonValues.length(); ++j) {
+					values.add(jsonValues.getString(j));
+				}
+				data.put(name, values);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		return data;
+	}
+
+	private static JSONObject createJSONFromForm(Data data) {
+		JSONObject object = new JSONObject();
+		for (Field field : data.getFields()) {
+			try {
+				JSONArray jsonValues = new JSONArray();
+				for (String value : field.getValues()) {
+					jsonValues.put(value);
+				}
+				object.put(field.getFieldName(), jsonValues);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		try {
+			JSONArray jsonValues = new JSONArray();
+			jsonValues.put(data.getFormType());
+			object.put(Data.FORM_TYPE, jsonValues);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return object;
+	}
+
+	public String getVer() {
+		return new String(Base64.encode(this.ver, Base64.DEFAULT)).trim();
+	}
+
+	public List<Identity> getIdentities() {
+		return this.identities;
+	}
+
+	public List<String> getFeatures() {
+		return this.features;
+	}
+
+	public boolean hasIdentity(String category, String type) {
+		for (Identity id : this.getIdentities()) {
+			if ((category == null || id.getCategory().equals(category)) &&
+					(type == null || id.getType().equals(type))) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public String getExtendedDiscoInformation(String formType, String name) {
+		for (Data form : this.forms) {
+			if (formType.equals(form.getFormType())) {
+				for (Field field : form.getFields()) {
+					if (name.equals(field.getFieldName())) {
+						return field.getValue();
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	private byte[] mkCapHash() {
+		StringBuilder s = new StringBuilder();
+
+		List<Identity> identities = this.getIdentities();
+		Collections.sort(identities);
+
+		for (Identity id : identities) {
+			s.append(blankNull(id.getCategory()))
+					.append("/")
+					.append(blankNull(id.getType()))
+					.append("/")
+					.append(blankNull(id.getLang()))
+					.append("/")
+					.append(blankNull(id.getName()))
+					.append("<");
+		}
+
+		List<String> features = this.getFeatures();
+		Collections.sort(features);
+
+		for (String feature : features) {
+			s.append(clean(feature)).append("<");
+		}
+
+		Collections.sort(forms, (lhs, rhs) -> lhs.getFormType().compareTo(rhs.getFormType()));
+
+		for (Data form : forms) {
+			s.append(clean(form.getFormType())).append("<");
+			List<Field> fields = form.getFields();
+			Collections.sort(fields, (lhs, rhs) -> lhs.getFieldName().compareTo(rhs.getFieldName()));
+			for (Field field : fields) {
+				s.append(clean(field.getFieldName())).append("<");
+				List<String> values = field.getValues();
+				Collections.sort(values);
+				for (String value : values) {
+					s.append(blankNull(value)).append("<");
+				}
+			}
+		}
+
+		MessageDigest md;
+		try {
+			md = MessageDigest.getInstance("SHA-1");
+		} catch (NoSuchAlgorithmException e) {
+			return null;
+		}
+
+		try {
+			return md.digest(s.toString().getBytes("UTF-8"));
+		} catch (UnsupportedEncodingException e) {
+			return null;
+		}
+	}
+
+	private JSONObject toJSON() {
+		try {
+			JSONObject o = new JSONObject();
+
+			JSONArray ids = new JSONArray();
+			for (Identity id : this.getIdentities()) {
+				ids.put(id.toJSON());
+			}
+			o.put("identities", ids);
+
+			o.put("features", new JSONArray(this.getFeatures()));
+
+			JSONArray forms = new JSONArray();
+			for (Data data : this.forms) {
+				forms.put(createJSONFromForm(data));
+			}
+			o.put("forms", forms);
+
+			return o;
+		} catch (JSONException e) {
+			return null;
+		}
+	}
+
+	public ContentValues getContentValues() {
+		final ContentValues values = new ContentValues();
+		values.put(HASH, this.hash);
+		values.put(VER, getVer());
+		JSONObject jsonObject = toJSON();
+		values.put(RESULT, jsonObject == null ? "" : jsonObject.toString());
+		return values;
 	}
 
 	public static class Identity implements Comparable {
-		protected final String category;
 		protected final String type;
 		protected final String lang;
 		protected final String name;
+		final String category;
 
-		public Identity(final String category, final String type, final String lang, final String name) {
+		Identity(final String category, final String type, final String lang, final String name) {
 			this.category = category;
 			this.type = type;
 			this.lang = lang;
 			this.name = name;
 		}
 
-		public Identity(final Element el) {
+		Identity(final Element el) {
 			this(
 					el.getAttribute("category"),
 					el.getAttribute("type"),
@@ -54,7 +290,7 @@ public class ServiceDiscoveryResult {
 			);
 		}
 
-		public Identity(final JSONObject o) {
+		Identity(final JSONObject o) {
 
 			this(
 					o.optString("category", null),
@@ -80,23 +316,23 @@ public class ServiceDiscoveryResult {
 			return this.name;
 		}
 
-		public int compareTo(Object other) {
+		public int compareTo(@NonNull Object other) {
-			Identity o = (Identity)other;
+			Identity o = (Identity) other;
 			int r = blankNull(this.getCategory()).compareTo(blankNull(o.getCategory()));
-			if(r == 0) {
+			if (r == 0) {
 				r = blankNull(this.getType()).compareTo(blankNull(o.getType()));
 			}
-			if(r == 0) {
+			if (r == 0) {
 				r = blankNull(this.getLang()).compareTo(blankNull(o.getLang()));
 			}
-			if(r == 0) {
+			if (r == 0) {
 				r = blankNull(this.getName()).compareTo(blankNull(o.getName()));
 			}
 
 			return r;
 		}
 
-		public JSONObject toJSON() {
+		JSONObject toJSON() {
 			try {
 				JSONObject o = new JSONObject();
 				o.put("category", this.getCategory());
@@ -104,247 +340,9 @@ public class ServiceDiscoveryResult {
 				o.put("lang", this.getLang());
 				o.put("name", this.getName());
 				return o;
-			} catch(JSONException e) {
+			} catch (JSONException e) {
 				return null;
 			}
 		}
 	}
-
-	protected final String hash;
-	protected final byte[] ver;
-	protected final List<Identity> identities;
-	protected final List<String> features;
-	protected final List<Data> forms;
-
-	public ServiceDiscoveryResult(final IqPacket packet) {
-		this.identities = new ArrayList<>();
-		this.features = new ArrayList<>();
-		this.forms = new ArrayList<>();
-		this.hash = "sha-1"; // We only support sha-1 for now
-
-		final List<Element> elements = packet.query().getChildren();
-
-		for (final Element element : elements) {
-			if (element.getName().equals("identity")) {
-				Identity id = new Identity(element);
-				if (id.getType() != null && id.getCategory() != null) {
-					identities.add(id);
-				}
-			} else if (element.getName().equals("feature")) {
-				if (element.getAttribute("var") != null) {
-					features.add(element.getAttribute("var"));
-				}
-			} else if (element.getName().equals("x") && element.getAttribute("xmlns").equals(Namespace.DATA)) {
-				forms.add(Data.parse(element));
-			}
-		}
-		this.ver = this.mkCapHash();
-	}
-
-	public ServiceDiscoveryResult(String hash, byte[] ver, JSONObject o) throws JSONException {
-		this.identities = new ArrayList<>();
-		this.features = new ArrayList<>();
-		this.forms = new ArrayList<>();
-		this.hash = hash;
-		this.ver = ver;
-
-		JSONArray identities = o.optJSONArray("identities");
-		if (identities != null) {
-			for (int i = 0; i < identities.length(); i++) {
-				this.identities.add(new Identity(identities.getJSONObject(i)));
-			}
-		}
-		JSONArray features = o.optJSONArray("features");
-		if (features != null) {
-			for (int i = 0; i < features.length(); i++) {
-				this.features.add(features.getString(i));
-			}
-		}
-		JSONArray forms = o.optJSONArray("forms");
-		if (forms != null) {
-			for(int i = 0; i < forms.length(); i++) {
-				this.forms.add(createFormFromJSONObject(forms.getJSONObject(i)));
-			}
-		}
-	}
-
-	private static Data createFormFromJSONObject(JSONObject o) {
-		Data data = new Data();
-		JSONArray names = o.names();
-		for(int i = 0; i < names.length(); ++i) {
-			try {
-				String name = names.getString(i);
-				JSONArray jsonValues = o.getJSONArray(name);
-				ArrayList<String> values = new ArrayList<>(jsonValues.length());
-				for(int j = 0; j < jsonValues.length(); ++j) {
-					values.add(jsonValues.getString(j));
-				}
-				data.put(name, values);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-		return data;
-	}
-
-	private static JSONObject createJSONFromForm(Data data) {
-		JSONObject object = new JSONObject();
-		for(Field field : data.getFields()) {
-			try {
-				JSONArray jsonValues = new JSONArray();
-				for(String value : field.getValues()) {
-					jsonValues.put(value);
-				}
-				object.put(field.getFieldName(), jsonValues);
-			} catch(Exception e) {
-				e.printStackTrace();
-			}
-		}
-		try {
-			JSONArray jsonValues = new JSONArray();
-			jsonValues.put(data.getFormType());
-			object.put(Data.FORM_TYPE, jsonValues);
-		} catch(Exception e) {
-			e.printStackTrace();
-		}
-		return object;
-	}
-
-	public String getVer() {
-		return new String(Base64.encode(this.ver, Base64.DEFAULT)).trim();
-	}
-
-	public ServiceDiscoveryResult(Cursor cursor) throws JSONException {
-		this(
-			cursor.getString(cursor.getColumnIndex(HASH)),
-			Base64.decode(cursor.getString(cursor.getColumnIndex(VER)), Base64.DEFAULT),
-			new JSONObject(cursor.getString(cursor.getColumnIndex(RESULT)))
-		);
-	}
-
-	public List<Identity> getIdentities() {
-		return this.identities;
-	}
-
-	public List<String> getFeatures() {
-		return this.features;
-	}
-
-	public boolean hasIdentity(String category, String type) {
-		for(Identity id : this.getIdentities()) {
-			if((category == null || id.getCategory().equals(category)) &&
-			   (type == null || id.getType().equals(type))) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	public String getExtendedDiscoInformation(String formType, String name) {
-		for(Data form : this.forms) {
-			if (formType.equals(form.getFormType())) {
-				for(Field field: form.getFields()) {
-					if (name.equals(field.getFieldName())) {
-						return field.getValue();
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	protected byte[] mkCapHash() {
-		StringBuilder s = new StringBuilder();
-
-		List<Identity> identities = this.getIdentities();
-		Collections.sort(identities);
-
-		for(Identity id : identities) {
-			s.append(
-				blankNull(id.getCategory()) + "/" +
-				blankNull(id.getType()) + "/" +
-				blankNull(id.getLang()) + "/" +
-				blankNull(id.getName()) + "<"
-			);
-		}
-
-		List<String> features = this.getFeatures();
-		Collections.sort(features);
-
-		for (String feature : features) {
-			s.append(feature + "<");
-		}
-
-		Collections.sort(forms, new Comparator<Data>() {
-			@Override
-			public int compare(Data lhs, Data rhs) {
-				return lhs.getFormType().compareTo(rhs.getFormType());
-			}
-		});
-
-		for(Data form : forms) {
-			s.append(form.getFormType() + "<");
-			List<Field> fields = form.getFields();
-			Collections.sort(fields, new Comparator<Field>() {
-				@Override
-				public int compare(Field lhs, Field rhs) {
-					return lhs.getFieldName().compareTo(rhs.getFieldName());
-				}
-			});
-			for(Field field : fields) {
-				s.append(field.getFieldName()+"<");
-				List<String> values = field.getValues();
-				Collections.sort(values);
-				for(String value : values) {
-					s.append(value+"<");
-				}
-			}
-		}
-
-		MessageDigest md;
-		try {
-			md = MessageDigest.getInstance("SHA-1");
-		} catch (NoSuchAlgorithmException e) {
-			return null;
-		}
-
-		try {
-			return md.digest(s.toString().getBytes("UTF-8"));
-		} catch(UnsupportedEncodingException e) {
-			return null;
-		}
-	}
-
-	public JSONObject toJSON() {
-		try {
-			JSONObject o = new JSONObject();
-
-			JSONArray ids = new JSONArray();
-			for(Identity id : this.getIdentities()) {
-				ids.put(id.toJSON());
-			}
-			o.put("identities", ids);
-
-			o.put("features", new JSONArray(this.getFeatures()));
-
-			JSONArray forms = new JSONArray();
-			for(Data data : this.forms) {
-				forms.put(createJSONFromForm(data));
-			}
-			o.put("forms", forms);
-
-			return o;
-		} catch(JSONException e) {
-			return null;
-		}
-	}
-
-	public ContentValues getContentValues() {
-		final ContentValues values = new ContentValues();
-		values.put(HASH, this.hash);
-		values.put(VER, getVer());
-		values.put(RESULT, this.toJSON().toString());
-		return values;
-	}
 }

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@@ -3649,20 +3649,21 @@ public class XmppConnectionService extends Service {
 				account.inProgressDiscoFetches.add(key);
 				IqPacket request = new IqPacket(IqPacket.TYPE.GET);
 				request.setTo(jid);
-				String node = presence.getNode();
+				final String node = presence.getNode();
-				Element query = request.query("http://jabber.org/protocol/disco#info");
+				final String ver = presence.getVer();
-				if (node != null) {
+				final Element query = request.query("http://jabber.org/protocol/disco#info");
-					query.setAttribute("node",node);
+				if (node != null && ver != null) {
+					query.setAttribute("node",node+"#"+ver);
 				}
-				Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": making disco request for " + key.second + " to " + jid+ "node="+node);
+				Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": making disco request for " + key.second + " to " + jid);
-				sendIqPacket(account, request, (a, discoPacket) -> {
+				sendIqPacket(account, request, (a, response) -> {
-					if (discoPacket.getType() == IqPacket.TYPE.RESULT) {
+					if (response.getType() == IqPacket.TYPE.RESULT) {
-						ServiceDiscoveryResult disco1 = new ServiceDiscoveryResult(discoPacket);
+						ServiceDiscoveryResult discoveryResult = new ServiceDiscoveryResult(response);
-						if (presence.getVer().equals(disco1.getVer())) {
+						if (presence.getVer().equals(discoveryResult.getVer())) {
-							databaseBackend.insertDiscoveryResult(disco1);
+							databaseBackend.insertDiscoveryResult(discoveryResult);
-							injectServiceDiscorveryResult(a.getRoster(), presence.getHash(), presence.getVer(), disco1);
+							injectServiceDiscorveryResult(a.getRoster(), presence.getHash(), presence.getVer(), discoveryResult);
 						} else {
-							Log.d(Config.LOGTAG, a.getJid().asBareJid() + ": mismatch in caps for contact " + jid + " " + presence.getVer() + " vs " + disco1.getVer());
+							Log.d(Config.LOGTAG, a.getJid().asBareJid() + ": mismatch in caps for contact " + jid + " " + presence.getVer() + " vs " + discoveryResult.getVer());
 						}
 					}
 					a.inProgressDiscoFetches.remove(key);

src/main/java/eu/siacs/conversations/xmpp/forms/Field.java

@@ -58,10 +58,7 @@ public class Field extends Element {
 		List<String> values = new ArrayList<>();
 		for(Element child : getChildren()) {
 			if ("value".equals(child.getName())) {
-				String content = child.getContent();
+				values.add(child.getContent());
-				if (content != null) {
-					values.add(content);
-				}
 			}
 		}
 		return values;