sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support xmpp uris with single 'omemo' parameter for fingerprint (w/o sid)

This commit is contained in:
Daniel Gultsch 2020-01-16 18:54:56 +01:00
parent e0c034c2c9
commit c8b5b96af9
4 changed files with 218 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conversations/java/eu/siacs/conversations/ui/WelcomeActivity.java
View File

@ -52,12 +52,12 @@ public class WelcomeActivity extends XmppActivity {
private boolean processXmppUri(final XmppUri xmppUri) { private boolean processXmppUri(final XmppUri xmppUri) {
if (xmppUri.isValidJid()) { if (xmppUri.isValidJid()) {
final String preauth = xmppUri.getParamater("preauth"); final String preauth = xmppUri.getParameter("preauth");
final Jid jid = xmppUri.getJid(); final Jid jid = xmppUri.getJid();
final Intent intent; final Intent intent;
if (xmppUri.isAction(XmppUri.ACTION_REGISTER)) { if (xmppUri.isAction(XmppUri.ACTION_REGISTER)) {
intent = SignupUtils.getTokenRegistrationIntent(this, jid, preauth); intent = SignupUtils.getTokenRegistrationIntent(this, jid, preauth);
} else if (xmppUri.isAction(XmppUri.ACTION_ROSTER) && "y".equals(xmppUri.getParamater("ibr"))) { } else if (xmppUri.isAction(XmppUri.ACTION_ROSTER) && "y".equals(xmppUri.getParameter("ibr"))) {
intent = SignupUtils.getTokenRegistrationIntent(this, Jid.ofDomain(jid.getDomain()), preauth); intent = SignupUtils.getTokenRegistrationIntent(this, Jid.ofDomain(jid.getDomain()), preauth);
intent.putExtra(StartConversationActivity.EXTRA_INVITE_URI, xmppUri.toString()); intent.putExtra(StartConversationActivity.EXTRA_INVITE_URI, xmppUri.toString());
} else { } else {

1
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View File

@ -324,6 +324,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
if (handleErrorMessage(account, original)) { if (handleErrorMessage(account, original)) {
return; return;
} }
Log.d(Config.LOGTAG,original.toString());
final MessagePacket packet; final MessagePacket packet;
Long timestamp = null; Long timestamp = null;
boolean isCarbon = false; boolean isCarbon = false;

4
src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
View File

@ -88,7 +88,7 @@ public class UriHandlerActivity extends AppCompatActivity {
final List<Jid> accounts = DatabaseBackend.getInstance(this).getAccountJids(true); final List<Jid> accounts = DatabaseBackend.getInstance(this).getAccountJids(true);
if (SignupUtils.isSupportTokenRegistry() && xmppUri.isValidJid()) { if (SignupUtils.isSupportTokenRegistry() && xmppUri.isValidJid()) {
final String preauth = xmppUri.getParamater("preauth"); final String preauth = xmppUri.getParameter("preauth");
final Jid jid = xmppUri.getJid(); final Jid jid = xmppUri.getJid();
if (xmppUri.isAction(XmppUri.ACTION_REGISTER)) { if (xmppUri.isAction(XmppUri.ACTION_REGISTER)) {
if (jid.getEscapedLocal() != null && accounts.contains(jid.asBareJid())) { if (jid.getEscapedLocal() != null && accounts.contains(jid.asBareJid())) {
@ -99,7 +99,7 @@ public class UriHandlerActivity extends AppCompatActivity {
startActivity(intent); startActivity(intent);
return; return;
} }
if (xmppUri.isAction(XmppUri.ACTION_ROSTER) && "y".equals(xmppUri.getParamater("ibr"))) { if (xmppUri.isAction(XmppUri.ACTION_ROSTER) && "y".equals(xmppUri.getParameter("ibr"))) {
intent = SignupUtils.getTokenRegistrationIntent(this, Jid.ofDomain(jid.getDomain()), preauth); intent = SignupUtils.getTokenRegistrationIntent(this, Jid.ofDomain(jid.getDomain()), preauth);
intent.putExtra(StartConversationActivity.EXTRA_INVITE_URI, xmppUri.toString()); intent.putExtra(StartConversationActivity.EXTRA_INVITE_URI, xmppUri.toString());
startActivity(intent); startActivity(intent);

159
src/main/java/eu/siacs/conversations/utils/XmppUri.java
View File

@ -18,18 +18,16 @@ import rocks.xmpp.addr.Jid;
public class XmppUri { public class XmppUri {
protected Uri uri;
protected String jid;
private List<Fingerprint> fingerprints = new ArrayList<>();
private Map<String,String> parameters = Collections.emptyMap();
private boolean safeSource = true;
private static final String OMEMO_URI_PARAM = "omemo-sid-";
public static final String ACTION_JOIN = "join"; public static final String ACTION_JOIN = "join";
public static final String ACTION_MESSAGE = "message"; public static final String ACTION_MESSAGE = "message";
public static final String ACTION_REGISTER = "register"; public static final String ACTION_REGISTER = "register";
public static final String ACTION_ROSTER = "roster"; public static final String ACTION_ROSTER = "roster";
private static final String OMEMO_URI_PARAM = "omemo-sid-";
protected Uri uri;
protected String jid;
private List<Fingerprint> fingerprints = new ArrayList<>();
private Map<String, String> parameters = Collections.emptyMap();
private boolean safeSource = true;
public XmppUri(String uri) { public XmppUri(String uri) {
try { try {
@ -52,6 +50,77 @@ public class XmppUri {
parse(uri); parse(uri);
} }
private static Map<String, String> parseParameters(final String query, final char seperator) {
final ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<>();
final String[] pairs = query == null ? new String[0] : query.split(String.valueOf(seperator));
for (String pair : pairs) {
final String[] parts = pair.split("=", 2);
if (parts.length == 0) {
continue;
}
final String key = parts[0].toLowerCase(Locale.US);
final String value;
if (parts.length == 2) {
String decoded;
try {
decoded = URLDecoder.decode(parts[1], "UTF-8");
} catch (UnsupportedEncodingException e) {
decoded = "";
}
value = decoded;
} else {
value = "";
}
builder.put(key, value);
}
return builder.build();
}
private static List<Fingerprint> parseFingerprints(Map<String, String> parameters) {
ImmutableList.Builder<Fingerprint> builder = new ImmutableList.Builder<>();
for (Map.Entry<String, String> parameter : parameters.entrySet()) {
final String key = parameter.getKey();
final String value = parameter.getValue().toLowerCase(Locale.US);
if (key.startsWith(OMEMO_URI_PARAM)) {
try {
final int id = Integer.parseInt(key.substring(OMEMO_URI_PARAM.length()));
builder.add(new Fingerprint(FingerprintType.OMEMO, value, id));
} catch (Exception e) {
//ignoring invalid device id
}
} else if ("omemo".equals(key)) {
builder.add(new Fingerprint(FingerprintType.OMEMO, value, 0));
}
}
return builder.build();
}
public static String getFingerprintUri(final String base, final List<XmppUri.Fingerprint> fingerprints, char separator) {
final StringBuilder builder = new StringBuilder(base);
builder.append('?');
for (int i = 0; i < fingerprints.size(); ++i) {
XmppUri.FingerprintType type = fingerprints.get(i).type;
if (type == XmppUri.FingerprintType.OMEMO) {
builder.append(XmppUri.OMEMO_URI_PARAM);
builder.append(fingerprints.get(i).deviceId);
}
builder.append('=');
builder.append(fingerprints.get(i).fingerprint);
if (i != fingerprints.size() - 1) {
builder.append(separator);
}
}
return builder.toString();
}
private static String lameUrlDecode(String url) {
return url.replace("%23", "#").replace("%25", "%");
}
public static String lameUrlEncode(String url) {
return url.replace("%", "%25").replace("#", "%23");
}
public boolean isSafeSource() { public boolean isSafeSource() {
return safeSource; return safeSource;
} }
@ -79,7 +148,7 @@ public class XmppUri {
if (segments.size() > 1 && "j".equalsIgnoreCase(segments.get(0))) { if (segments.size() > 1 && "j".equalsIgnoreCase(segments.get(0))) {
this.parameters = ImmutableMap.of(ACTION_JOIN, ""); this.parameters = ImmutableMap.of(ACTION_JOIN, "");
} }
final Map<String,String> parameters = parseParameters(uri.getQuery(), '&'); final Map<String, String> parameters = parseParameters(uri.getQuery(), '&');
this.fingerprints = parseFingerprints(parameters); this.fingerprints = parseFingerprints(parameters);
} else if ("xmpp".equalsIgnoreCase(scheme)) { } else if ("xmpp".equalsIgnoreCase(scheme)) {
// sample: xmpp:foo@bar.com // sample: xmpp:foo@bar.com
@ -111,33 +180,6 @@ public class XmppUri {
} }
} }
private static Map<String,String> parseParameters(final String query, final char seperator) {
final ImmutableMap.Builder<String,String> builder = new ImmutableMap.Builder<>();
final String[] pairs = query == null ? new String[0] : query.split(String.valueOf(seperator));
for (String pair : pairs) {
final String[] parts = pair.split("=", 2);
if (parts.length == 0) {
continue;
}
final String key = parts[0].toLowerCase(Locale.US);
final String value;
if (parts.length == 2) {
String decoded;
try {
decoded = URLDecoder.decode(parts[1],"UTF-8");
} catch (UnsupportedEncodingException e) {
decoded = "";
}
value = decoded;
} else {
value = "";
}
builder.put(key, value);
}
return builder.build();
}
@Override @Override
@NonNull @NonNull
public String toString() { public String toString() {
@ -147,23 +189,6 @@ public class XmppUri {
return ""; return "";
} }
private static List<Fingerprint> parseFingerprints(Map<String,String> parameters) {
ImmutableList.Builder<Fingerprint> builder = new ImmutableList.Builder<>();
for (Map.Entry<String, String> parameter : parameters.entrySet()) {
final String key = parameter.getKey();
final String value = parameter.getValue().toLowerCase(Locale.US);
if (key.startsWith(OMEMO_URI_PARAM)) {
try {
final int id = Integer.parseInt(key.substring(OMEMO_URI_PARAM.length()));
builder.add(new Fingerprint(FingerprintType.OMEMO, value, id));
} catch (Exception e) {
//ignoring invalid device id
}
}
}
return builder.build();
}
public boolean isAction(final String action) { public boolean isAction(final String action) {
return parameters.containsKey(action); return parameters.containsKey(action);
} }
@ -196,7 +221,7 @@ public class XmppUri {
return parameters.get("name"); return parameters.get("name");
} }
public String getParamater(String key) { public String getParameter(String key) {
return this.parameters.get(key); return this.parameters.get(key);
} }
@ -212,24 +237,6 @@ public class XmppUri {
OMEMO OMEMO
} }
public static String getFingerprintUri(String base, List<XmppUri.Fingerprint> fingerprints, char separator) {
StringBuilder builder = new StringBuilder(base);
builder.append('?');
for (int i = 0; i < fingerprints.size(); ++i) {
XmppUri.FingerprintType type = fingerprints.get(i).type;
if (type == XmppUri.FingerprintType.OMEMO) {
builder.append(XmppUri.OMEMO_URI_PARAM);
builder.append(fingerprints.get(i).deviceId);
}
builder.append('=');
builder.append(fingerprints.get(i).fingerprint);
if (i != fingerprints.size() - 1) {
builder.append(separator);
}
}
return builder.toString();
}
public static class Fingerprint { public static class Fingerprint {
public final FingerprintType type; public final FingerprintType type;
public final String fingerprint; public final String fingerprint;
@ -247,12 +254,4 @@ public class XmppUri {
return type.toString() + ": " + fingerprint + (deviceId != 0 ? " " + deviceId : ""); return type.toString() + ": " + fingerprint + (deviceId != 0 ? " " + deviceId : "");
} }
} }
private static String lameUrlDecode(String url) {
return url.replace("%23", "#").replace("%25", "%");
}
public static String lameUrlEncode(String url) {
return url.replace("%", "%25").replace("#", "%23");
}
} }