narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

use ibb if other party doesn’t annouce s5b feature

Browse source
This commit is contained in:
Daniel Gultsch 2019-06-16 22:57:10 +02:00
parent fe6c981ae2
commit 9fc1ead74f
6 changed files with 1128 additions and 1132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/Config.java
View file

@ -101,7 +101,7 @@ public final class Config {
public static final boolean DISABLE_PROXY_LOOKUP = false; //useful to debug ibb
public static final boolean DISABLE_HTTP_UPLOAD = false;
public static final boolean DISABLE_HTTP_UPLOAD = true;
public static final boolean EXTENDED_SM_LOGGING = false; // log stanza counts
public static final boolean BACKGROUND_STANZA_LOGGING = false; //log all stanzas that were received while the app is in background
public static final boolean RESET_ATTEMPT_COUNT_ON_NETWORK_CHANGE = true; //setting to true might increase power consumption

4
src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
View file

@ -27,8 +27,8 @@ public abstract class AbstractGenerator {
Content.Version.FT_3.getNamespace(),
Content.Version.FT_4.getNamespace(),
Content.Version.FT_5.getNamespace(),
"urn:xmpp:jingle:transports:s5b:1",
"urn:xmpp:jingle:transports:ibb:1",
Namespace.JINGLE_TRANSPORTS_S5B,
Namespace.JINGLE_TRANSPORTS_IBB,
"http://jabber.org/protocol/muc",
"jabber:x:conference",
Namespace.OOB,

2
src/main/java/eu/siacs/conversations/xml/Namespace.java
View file

@ -25,4 +25,6 @@ public final class Namespace {
public static final String BOOKMARKS = "storage:bookmarks";
public static final String SYNCHRONIZATION = "im.quicksy.synchronization:0";
public static final String AVATAR_CONVERSION = "urn:xmpp:pep-vcard-conversion:0";
public static final String JINGLE_TRANSPORTS_S5B = "urn:xmpp:jingle:transports:s5b:1";
public static final String JINGLE_TRANSPORTS_IBB = "urn:xmpp:jingle:transports:ibb:1";
}

228
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View file

@ -10,6 +10,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@ -34,6 +35,7 @@ import eu.siacs.conversations.services.AbstractConnectionManager;
import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.utils.CryptoHelper;
import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.xml.Namespace;
import eu.siacs.conversations.xmpp.OnIqPacketReceived;
import eu.siacs.conversations.xmpp.jingle.stanzas.Content;
import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket;
@ -43,16 +45,14 @@ import rocks.xmpp.addr.Jid;
public class JingleConnection implements Transferable {
private static final int JINGLE_STATUS_INITIATED = 0;
private static final int JINGLE_STATUS_ACCEPTED = 1;
private static final int JINGLE_STATUS_FINISHED = 4;
static final int JINGLE_STATUS_TRANSMITTING = 5;
private static final int JINGLE_STATUS_FAILED = 99;
private static final int JINGLE_STATUS_OFFERED = -1;
private JingleConnectionManager mJingleConnectionManager;
private XmppConnectionService mXmppConnectionService;
private static final int JINGLE_STATUS_OFFERED = -1;
protected static final int JINGLE_STATUS_INITIATED = 0;
protected static final int JINGLE_STATUS_ACCEPTED = 1;
protected static final int JINGLE_STATUS_FINISHED = 4;
protected static final int JINGLE_STATUS_TRANSMITTING = 5;
protected static final int JINGLE_STATUS_FAILED = 99;
private Content.Version ftVersion = Content.Version.FT_3;
private int ibbBlockSize = 8192;
@ -96,16 +96,7 @@ public class JingleConnection implements Transferable {
}
};
private byte[] expectedHash = new byte[0];
private boolean responding() {
return responder != null && responder.equals(account.getJid());
}
private boolean initiating() {
return initiator.equals(account.getJid());
}
final OnFileTransmissionStatusChanged onFileTransmissionStatusChanged = new OnFileTransmissionStatusChanged() {
private final OnFileTransmissionStatusChanged onFileTransmissionStatusChanged = new OnFileTransmissionStatusChanged() {
@Override
public void onFileTransmitted(DownloadableFile file) {
@ -113,6 +104,7 @@ public class JingleConnection implements Transferable {
if (expectedHash.length > 0 && !Arrays.equals(expectedHash, file.getSha1Sum())) {
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": hashes did not match");
}
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": file transmitted(). we are responding");
sendSuccess();
mXmppConnectionService.getFileBackend().updateFileParams(message);
mXmppConnectionService.databaseBackend.createMessage(message);
@ -151,22 +143,6 @@ public class JingleConnection implements Transferable {
JingleConnection.this.fail();
}
};
InputStream getFileInputStream() {
return this.mFileInputStream;
}
OutputStream getFileOutputStream() throws IOException {
if (this.file == null) {
Log.d(Config.LOGTAG,"file object was not assigned");
return null;
}
this.file.getParentFile().mkdirs();
this.file.createNewFile();
this.mFileOutputStream = AbstractConnectionManager.createOutputStream(this.file);
return this.mFileOutputStream;
}
private OnTransportConnected onIbbTransportConnected = new OnTransportConnected() {
@Override
public void failed() {
@ -175,10 +151,11 @@ public class JingleConnection implements Transferable {
@Override
public void established() {
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": ibb transport connected. sending file");
mJingleStatus = JINGLE_STATUS_TRANSMITTING;
JingleConnection.this.transport.send(file, onFileTransmissionStatusChanged);
}
};
private OnProxyActivated onProxyActivated = new OnProxyActivated() {
@Override
@ -204,6 +181,29 @@ public class JingleConnection implements Transferable {
.getXmppConnectionService();
}
private boolean responding() {
return responder != null && responder.equals(account.getJid());
}
private boolean initiating() {
return initiator.equals(account.getJid());
}
InputStream getFileInputStream() {
return this.mFileInputStream;
}
OutputStream getFileOutputStream() throws IOException {
if (this.file == null) {
Log.d(Config.LOGTAG, "file object was not assigned");
return null;
}
this.file.getParentFile().mkdirs();
this.file.createNewFile();
this.mFileOutputStream = AbstractConnectionManager.createOutputStream(this.file);
return this.mFileOutputStream;
}
public String getSessionId() {
return this.sessionId;
}
@ -275,15 +275,12 @@ public class JingleConnection implements Transferable {
public void init(final Message message) {
if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
Conversation conversation = (Conversation) message.getConversation();
conversation.getAccount().getAxolotlService().prepareKeyTransportMessage(conversation, new OnMessageCreatedCallback() {
@Override
public void run(XmppAxolotlMessage xmppAxolotlMessage) {
conversation.getAccount().getAxolotlService().prepareKeyTransportMessage(conversation, xmppAxolotlMessage -> {
if (xmppAxolotlMessage != null) {
init(message, xmppAxolotlMessage);
} else {
fail();
}
}
});
} else {
init(message, null);
@ -297,28 +294,23 @@ public class JingleConnection implements Transferable {
this.message = message;
this.account = message.getConversation().getAccount();
upgradeNamespace();
this.initialTransport = getRemoteFeatures().contains(Namespace.JINGLE_TRANSPORTS_S5B) ? Transport.SOCKS : Transport.IBB;
this.message.setTransferable(this);
this.mStatus = Transferable.STATUS_UPLOADING;
this.initiator = this.account.getJid();
this.responder = this.message.getCounterpart();
this.sessionId = this.mJingleConnectionManager.nextRandomId();
this.transportId = this.mJingleConnectionManager.nextRandomId();
if (this.candidates.size() > 0) {
if (this.initialTransport == Transport.IBB) {
this.sendInitRequest();
} else if (this.candidates.size() > 0) {
this.sendInitRequest();
} else {
this.mJingleConnectionManager.getPrimaryCandidate(account,
new OnPrimaryCandidateFound() {
@Override
public void onPrimaryCandidateFound(boolean success,
final JingleCandidate candidate) {
this.mJingleConnectionManager.getPrimaryCandidate(account, (success, candidate) -> {
if (success) {
final JingleSocks5Transport socksConnection = new JingleSocks5Transport(
JingleConnection.this, candidate);
connections.put(candidate.getCid(),
socksConnection);
socksConnection
.connect(new OnTransportConnected() {
final JingleSocks5Transport socksConnection = new JingleSocks5Transport(this, candidate);
connections.put(candidate.getCid(), socksConnection);
socksConnection.connect(new OnTransportConnected() {
@Override
public void failed() {
@ -340,26 +332,29 @@ public class JingleConnection implements Transferable {
Log.d(Config.LOGTAG, "no primary candidate of our own was found");
sendInitRequest();
}
}
});
}
}
private void upgradeNamespace() {
Jid jid = this.message.getCounterpart();
String resource = jid != null ?jid.getResource() : null;
if (resource != null) {
Presence presence = this.account.getRoster().getContact(jid).getPresences().getPresences().get(resource);
ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null;
if (result != null) {
List<String> features = result.getFeatures();
List<String> features = getRemoteFeatures();
if (features.contains(Content.Version.FT_5.getNamespace())) {
this.ftVersion = Content.Version.FT_5;
} else if (features.contains(Content.Version.FT_4.getNamespace())) {
this.ftVersion = Content.Version.FT_4;
}
}
private List<String> getRemoteFeatures() {
Jid jid = this.message.getCounterpart();
String resource = jid != null ? jid.getResource() : null;
if (resource != null) {
Presence presence = this.account.getRoster().getContact(jid).getPresences().getPresences().get(resource);
ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null;
return result == null ? Collections.emptyList() : result.getFeatures();
} else {
return Collections.emptyList();
}
}
@ -391,11 +386,13 @@ public class JingleConnection implements Transferable {
try {
this.ibbBlockSize = Math.min(Integer.parseInt(receivedBlockSize), this.ibbBlockSize);
} catch (NumberFormatException e) {
Log.d(Config.LOGTAG, "number format exception " + e.getMessage());
this.sendCancel();
this.fail();
return;
}
} else {
Log.d(Config.LOGTAG, "received block size =" + receivedBlockSize);
this.sendCancel();
this.fail();
return;
@ -455,6 +452,20 @@ public class JingleConnection implements Transferable {
message.setBody(Long.toString(size));
conversation.add(message);
mJingleConnectionManager.updateConversationUi(true);
this.file = this.mXmppConnectionService.getFileBackend().getFile(message, false);
if (mXmppAxolotlMessage != null) {
XmppAxolotlMessage.XmppAxolotlKeyTransportMessage transportMessage = account.getAxolotlService().processReceivingKeyTransportMessage(mXmppAxolotlMessage, false);
if (transportMessage != null) {
message.setEncryption(Message.ENCRYPTION_AXOLOTL);
this.file.setKey(transportMessage.getKey());
this.file.setIv(transportMessage.getIv());
message.setFingerprint(transportMessage.getFingerprint());
} else {
Log.d(Config.LOGTAG, "could not process KeyTransportMessage");
}
}
message.resetFileParams();
this.file.setExpectedSize(size);
if (mJingleConnectionManager.hasStoragePermission()
&& size < this.mJingleConnectionManager.getAutoAcceptFileSize()
&& mXmppConnectionService.isDataSaverDisabled()) {
@ -471,20 +482,6 @@ public class JingleConnection implements Transferable {
.getAutoAcceptFileSize());
this.mXmppConnectionService.getNotificationService().push(message);
}
this.file = this.mXmppConnectionService.getFileBackend().getFile(message, false);
if (mXmppAxolotlMessage != null) {
XmppAxolotlMessage.XmppAxolotlKeyTransportMessage transportMessage = account.getAxolotlService().processReceivingKeyTransportMessage(mXmppAxolotlMessage, false);
if (transportMessage != null) {
message.setEncryption(Message.ENCRYPTION_AXOLOTL);
this.file.setKey(transportMessage.getKey());
this.file.setIv(transportMessage.getIv());
message.setFingerprint(transportMessage.getFingerprint());
} else {
Log.d(Config.LOGTAG,"could not process KeyTransportMessage");
}
}
this.file.setExpectedSize(size);
message.resetFileParams();
Log.d(Config.LOGTAG, "receiving file: expecting size of " + this.file.getExpectedSize());
} else {
this.sendCancel();
@ -519,13 +516,14 @@ public class JingleConnection implements Transferable {
return;
}
content.setTransportId(this.transportId);
if (this.initialTransport == Transport.IBB) {
content.ibbTransport().setAttribute("block-size", Integer.toString(this.ibbBlockSize));
} else {
content.socks5transport().setChildren(getCandidatesAsElements());
}
packet.setContent(content);
this.sendJinglePacket(packet,new OnIqPacketReceived() {
@Override
public void onIqPacketReceived(Account account, IqPacket packet) {
if (packet.getType() == IqPacket.TYPE.RESULT) {
this.sendJinglePacket(packet, (account, response) -> {
if (response.getType() == IqPacket.TYPE.RESULT) {
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": other party received offer");
if (mJingleStatus == JINGLE_STATUS_OFFERED) {
mJingleStatus = JINGLE_STATUS_INITIATED;
@ -534,8 +532,7 @@ public class JingleConnection implements Transferable {
Log.d(Config.LOGTAG, "received ack for offer when status was " + mJingleStatus);
}
} else {
fail(IqParser.extractErrorMessage(packet));
}
fail(IqParser.extractErrorMessage(response));
}
});
@ -570,17 +567,13 @@ public class JingleConnection implements Transferable {
}
private void sendAcceptSocks() {
this.mJingleConnectionManager.getPrimaryCandidate(this.account, new OnPrimaryCandidateFound() {
@Override
public void onPrimaryCandidateFound(boolean success, final JingleCandidate candidate) {
this.mJingleConnectionManager.getPrimaryCandidate(this.account, (success, candidate) -> {
final JinglePacket packet = bootstrapPacket("session-accept");
final Content content = new Content(contentCreator, contentName);
content.setFileOffer(fileOffer, ftVersion);
content.setTransportId(transportId);
if (success && candidate != null && !equalCandidateExists(candidate)) {
final JingleSocks5Transport socksConnection = new JingleSocks5Transport(
JingleConnection.this,
candidate);
final JingleSocks5Transport socksConnection = new JingleSocks5Transport(this, candidate);
connections.put(candidate.getCid(), socksConnection);
socksConnection.connect(new OnTransportConnected() {
@ -610,7 +603,6 @@ public class JingleConnection implements Transferable {
sendJinglePacket(packet);
connectNextCandidate();
}
}
});
}
@ -622,6 +614,7 @@ public class JingleConnection implements Transferable {
content.setTransportId(transportId);
content.ibbTransport().setAttribute("block-size", this.ibbBlockSize);
packet.setContent(content);
this.transport.receive(file, onFileTransmissionStatusChanged);
this.sendJinglePacket(packet);
}
@ -644,12 +637,23 @@ public class JingleConnection implements Transferable {
}
private boolean receiveAccept(JinglePacket packet) {
Content content = packet.getJingleContent();
mergeCandidates(JingleCandidate.parse(content.socks5transport()
.getChildren()));
this.mJingleStatus = JINGLE_STATUS_ACCEPTED;
mXmppConnectionService.markMessage(message, Message.STATUS_UNSEND);
Content content = packet.getJingleContent();
if (content.hasSocks5Transport()) {
mergeCandidates(JingleCandidate.parse(content.socks5transport().getChildren()));
this.connectNextCandidate();
} else if (content.hasIbbTransport()) {
String receivedBlockSize = packet.getJingleContent().ibbTransport().getAttribute("block-size");
if (receivedBlockSize != null) {
int bs = Integer.parseInt(receivedBlockSize);
if (bs > this.ibbBlockSize) {
this.ibbBlockSize = bs;
}
}
this.transport = new JingleInbandTransport(this, this.transportId, this.ibbBlockSize);
this.transport.connect(onIbbTransportConnected);
}
return true;
}
@ -684,8 +688,7 @@ public class JingleConnection implements Transferable {
}
return true;
} else if (content.socks5transport().hasChild("candidate-used")) {
String cid = content.socks5transport()
.findChild("candidate-used").getAttribute("cid");
String cid = content.socks5transport().findChild("candidate-used").getAttribute("cid");
if (cid != null) {
Log.d(Config.LOGTAG, "candidate used by counterpart:" + cid);
JingleCandidate candidate = getCandidate(cid);
@ -698,7 +701,7 @@ public class JingleConnection implements Transferable {
if (mJingleStatus == JINGLE_STATUS_ACCEPTED && this.sentCandidate) {
this.connect();
} else {
Log.d(Config.LOGTAG, "ignoring because file is already in transmission or we haven't sent our candidate yet status="+mJingleStatus+" sentCandidate="+Boolean.toString(sentCandidate));
Log.d(Config.LOGTAG, "ignoring because file is already in transmission or we haven't sent our candidate yet status=" + mJingleStatus + " sentCandidate=" + sentCandidate);
}
return true;
} else {
@ -741,19 +744,13 @@ public class JingleConnection implements Transferable {
.setAttribute("sid", sid);
activation.query().addChild("activate")
.setContent(this.getCounterPart().toString());
mXmppConnectionService.sendIqPacket(account,activation,
new OnIqPacketReceived() {
@Override
public void onIqPacketReceived(Account account,
IqPacket packet) {
if (packet.getType() != IqPacket.TYPE.RESULT) {
mXmppConnectionService.sendIqPacket(account, activation, (account, response) -> {
if (response.getType() != IqPacket.TYPE.RESULT) {
onProxyActivated.failed();
} else {
onProxyActivated.success();
sendProxyActivated(connection.getCandidate().getCid());
}
}
});
} else {
Log.d(Config.LOGTAG,
@ -857,14 +854,11 @@ public class JingleConnection implements Transferable {
if (initiating()) {
this.sendJinglePacket(answer, new OnIqPacketReceived() {
@Override
public void onIqPacketReceived(Account account, IqPacket packet) {
if (packet.getType() == IqPacket.TYPE.RESULT) {
this.sendJinglePacket(answer, (account, response) -> {
if (response.getType() == IqPacket.TYPE.RESULT) {
Log.d(Config.LOGTAG, account.getJid().asBareJid() + " recipient ACKed our transport-accept. creating ibb");
transport.connect(onIbbTransportConnected);
}
}
});
} else {
this.transport.receive(file, onFileTransmissionStatusChanged);
@ -911,6 +905,7 @@ public class JingleConnection implements Transferable {
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": received session-terminate/success while responding");
}
}
@Override
public void cancel() {
this.cancelled = true;
@ -1022,8 +1017,7 @@ public class JingleConnection implements Transferable {
JinglePacket packet = bootstrapPacket("transport-info");
Content content = new Content(this.contentCreator, this.contentName);
content.setTransportId(this.transportId);
content.socks5transport().addChild("activated")
.setAttribute("cid", cid);
content.socks5transport().addChild("activated").setAttribute("cid", cid);
packet.setContent(content);
this.sendJinglePacket(packet);
}
@ -1042,7 +1036,7 @@ public class JingleConnection implements Transferable {
}
private void sendCandidateError() {
Log.d(Config.LOGTAG,"sending canditate error");
Log.d(Config.LOGTAG, "sending candidate error");
JinglePacket packet = bootstrapPacket("transport-info");
Content content = new Content(this.contentCreator, this.contentName);
content.setTransportId(this.transportId);
@ -1092,7 +1086,7 @@ public class JingleConnection implements Transferable {
return null;
}
public void updateProgress(int i) {
void updateProgress(int i) {
this.mProgress = i;
mJingleConnectionManager.updateConversationUi(false);
}
@ -1105,12 +1099,6 @@ public class JingleConnection implements Transferable {
return this.ftVersion;
}
interface OnProxyActivated {
void success();
void failed();
}
public boolean hasTransportId(String sid) {
return sid.equals(this.transportId);
}
@ -1158,4 +1146,10 @@ public class JingleConnection implements Transferable {
public AbstractConnectionManager getConnectionManager() {
return this.mJingleConnectionManager;
}
interface OnProxyActivated {
void success();
void failed();
}
}

3
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
View file

@ -154,6 +154,7 @@ public class JingleInbandTransport extends JingleTransport {
if (count == -1) {
sendClose();
file.setSha1Sum(digest.digest());
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": sendNextBlock() count was -1");
this.onFileTransmissionStatusChanged.onFileTransmitted(file);
fileInputStream.close();
return;
@ -181,6 +182,7 @@ public class JingleInbandTransport extends JingleTransport {
} else {
sendClose();
file.setSha1Sum(digest.digest());
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": sendNextBlock() remaining size");
this.onFileTransmissionStatusChanged.onFileTransmitted(file);
fileInputStream.close();
}
@ -204,6 +206,7 @@ public class JingleInbandTransport extends JingleTransport {
file.setSha1Sum(digest.digest());
fileOutputStream.flush();
fileOutputStream.close();
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": receive next block nothing remaining");
this.onFileTransmissionStatusChanged.onFileTransmitted(file);
} else {
connection.updateProgress((int) ((((double) (this.fileSize - this.remainingSize)) / this.fileSize) * 100));

17
src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
View file

@ -2,6 +2,7 @@ package eu.siacs.conversations.xmpp.jingle.stanzas;
import eu.siacs.conversations.entities.DownloadableFile;
import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.xml.Namespace;
public class Content extends Element {
@ -102,32 +103,28 @@ public class Content extends Element {
}
public Element socks5transport() {
Element transport = this.findChild("transport",
"urn:xmpp:jingle:transports:s5b:1");
Element transport = this.findChild("transport", Namespace.JINGLE_TRANSPORTS_S5B);
if (transport == null) {
transport = this.addChild("transport",
"urn:xmpp:jingle:transports:s5b:1");
transport = this.addChild("transport", Namespace.JINGLE_TRANSPORTS_S5B);
transport.setAttribute("sid", this.transportId);
}
return transport;
}
public Element ibbTransport() {
Element transport = this.findChild("transport",
"urn:xmpp:jingle:transports:ibb:1");
Element transport = this.findChild("transport", Namespace.JINGLE_TRANSPORTS_IBB);
if (transport == null) {
transport = this.addChild("transport",
"urn:xmpp:jingle:transports:ibb:1");
transport = this.addChild("transport", Namespace.JINGLE_TRANSPORTS_IBB);
transport.setAttribute("sid", this.transportId);
}
return transport;
}
public boolean hasSocks5Transport() {
return this.hasChild("transport", "urn:xmpp:jingle:transports:s5b:1");
return this.hasChild("transport", Namespace.JINGLE_TRANSPORTS_S5B);
}
public boolean hasIbbTransport() {
return this.hasChild("transport", "urn:xmpp:jingle:transports:ibb:1");
return this.hasChild("transport", Namespace.JINGLE_TRANSPORTS_IBB);
}
}