From e967849e5a6f57cb291b946ea77f873a9622e8f0 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Sat, 22 Jul 2017 00:26:50 +0200 Subject: [PATCH] Fix all errors in transports --- .../smackx/jingle/internal/JingleSession.java | 10 +- .../jingle/internal/JingleTransport.java | 3 +- .../jingle_ibb/JingleIBBTransport.java | 3 +- .../jingle_ibb/JingleIBBTransportManager.java | 2 +- .../jingle_s5b/JingleS5BTransport.java | 130 +++++++++- .../jingle_s5b/JingleS5BTransportAdapter.java | 3 +- .../jingle_s5b/JingleS5BTransportManager.java | 2 +- .../legacy/JingleS5BTransportSession.java | 227 ------------------ 8 files changed, 139 insertions(+), 241 deletions(-) delete mode 100644 smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/legacy/JingleS5BTransportSession.java diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/internal/JingleSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/internal/JingleSession.java index cd5abcfbd..fe4cd17fa 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/internal/JingleSession.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/internal/JingleSession.java @@ -232,7 +232,7 @@ public class JingleSession { JingleTransport transport = entry.getValue().getTransport(); JingleContentTransportInfoElement info = entry.getKey().getTransport().getInfo(); - transport.handleTransportInfo(info); + transport.handleTransportInfo(info, request); } return IQ.createResultIQ(request); @@ -378,6 +378,14 @@ public class JingleSession { return role == Role.initiator ? initiator : responder; } + public boolean isInitiator() { + return role == Role.initiator; + } + + public boolean isResponder() { + return role == Role.responder; + } + public String getSessionId() { return sessionId; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/internal/JingleTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/internal/JingleTransport.java index e29aed921..9703e124a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/internal/JingleTransport.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/internal/JingleTransport.java @@ -22,6 +22,7 @@ import java.util.List; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement; +import org.jivesoftware.smackx.jingle.element.JingleElement; import org.jivesoftware.smackx.jingle.transport.BytestreamSessionEstablishedListener; import org.jivesoftware.smackx.jingle.element.JingleContentTransportInfoElement; @@ -90,7 +91,7 @@ public abstract class JingleTransport { return peersProposal; } - public abstract void handleTransportInfo(JingleContentTransportInfoElement info); + public abstract void handleTransportInfo(JingleContentTransportInfoElement info, JingleElement wrapping); public void setParent(JingleContent parent) { if (this.parent != parent) { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java index ca932347e..58517829c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java @@ -24,6 +24,7 @@ import org.jivesoftware.smackx.bytestreams.BytestreamListener; import org.jivesoftware.smackx.bytestreams.BytestreamRequest; import org.jivesoftware.smackx.bytestreams.BytestreamSession; import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager; +import org.jivesoftware.smackx.jingle.element.JingleElement; import org.jivesoftware.smackx.jingle.internal.JingleTransport; import org.jivesoftware.smackx.jingle.internal.JingleTransportCandidate; import org.jivesoftware.smackx.jingle.transport.BytestreamSessionEstablishedListener; @@ -111,7 +112,7 @@ public class JingleIBBTransport extends JingleTransport { + private static final Logger LOGGER = Logger.getLogger(JingleS5BTransport.class.getName()); + public static final String NAMESPACE_V1 = "urn:xmpp:jingle:transports:s5b:1"; public static final String NAMESPACE = NAMESPACE_V1; @@ -134,9 +143,15 @@ public class JingleS5BTransport extends JingleTransport peers.getSelectedCandidate().getPriority()) { + nominated = getSelectedCandidate(); + } else if (getSelectedCandidate().getPriority() < peers.getSelectedCandidate().getPriority()) { + nominated = peers.getSelectedCandidate(); + } else { + nominated = getParent().getParent().isInitiator() ? getSelectedCandidate() : peers.getSelectedCandidate(); + } + } else if (getSelectedCandidate() != CANDIDATE_FAILURE) { + nominated = getSelectedCandidate(); + } else { + nominated = peers.getSelectedCandidate(); + } + + if (nominated == peers.getSelectedCandidate()) { + LOGGER.log(Level.INFO, "Their choice, so our proposed candidate is used."); + boolean isProxy = nominated.getType() == JingleS5BTransportCandidateElement.Type.proxy; + try { + nominated = nominated.connect(MAX_TIMEOUT); + } catch (InterruptedException | IOException | XMPPException | SmackException | TimeoutException e) { + LOGGER.log(Level.INFO, "Could not connect to our candidate.", e); + //TODO: Proxy-Error + return; + } + + if (isProxy) { + LOGGER.log(Level.INFO, "Is external proxy. Activate it."); + Bytestream activate = new Bytestream(getSid()); + activate.setMode(null); + activate.setType(IQ.Type.set); + activate.setTo(nominated.getStreamHost().getJID()); + activate.setToActivate(getParent().getParent().getPeer()); + activate.setFrom(getParent().getParent().getOurJid()); + + try { + getParent().getParent().getJingleManager().getConnection().createStanzaCollectorAndSend(activate).nextResultOrThrow(); + } catch (InterruptedException | XMPPException.XMPPErrorException | SmackException.NotConnectedException | SmackException.NoResponseException e) { + LOGGER.log(Level.WARNING, "Could not activate proxy.", e); + return; + } + + LOGGER.log(Level.INFO, "Send candidate-activate."); + JingleElement candidateActivate = jingleS5BTransportManager.createCandidateActivated((JingleS5BTransport) nominated.getParent(), nominated); + + try { + session.getJingleManager().getConnection().createStanzaCollectorAndSend(candidateActivate) + .nextResultOrThrow(); + } catch (InterruptedException | XMPPException.XMPPErrorException | SmackException.NotConnectedException | SmackException.NoResponseException e) { + LOGGER.log(Level.WARNING, "Could not send candidate-activated", e); + return; + } + } + + LOGGER.log(Level.INFO, "Start transmission."); + Socks5BytestreamSession bs = new Socks5BytestreamSession(nominated.getSocket(), !isProxy); + //callback.onSessionInitiated(bs); + + } + //Our choice + else { + LOGGER.log(Level.INFO, "Our choice, so their candidate was used."); + boolean isProxy = nominated.getType() == JingleS5BTransportCandidateElement.Type.proxy; + if (!isProxy) { + LOGGER.log(Level.INFO, "Direct connection."); + Socks5BytestreamSession bs = new Socks5BytestreamSession(nominated.getSocket(), true); + //callback.onSessionInitiated(bs); + } else { + LOGGER.log(Level.INFO, "Our choice was their external proxy. wait for candidate-activate."); + } + } + } + @Override - public void handleTransportInfo(JingleContentTransportInfoElement info) { + public void handleTransportInfo(JingleContentTransportInfoElement info, JingleElement wrapping) { switch (info.getElementName()) { case JingleS5BTransportInfoElement.CandidateUsed.ELEMENT: - handleCandidateUsed((JingleS5BTransportInfoElement) info); + handleCandidateUsed((JingleS5BTransportInfoElement) info, wrapping); return; case JingleS5BTransportInfoElement.CandidateActivated.ELEMENT: @@ -178,13 +286,19 @@ public class JingleS5BTransport extends JingleTransport out-of-order! if (peers.getSelectedCandidate() != null) { - //TODO: Alert! We already received one candidateUsed previously! + try { + jingleManager.getConnection().createStanzaCollectorAndSend(JingleElement.createJingleErrorOutOfOrder(wrapping)); + } catch (SmackException.NotConnectedException | InterruptedException e) { + LOGGER.log(Level.SEVERE, "Could not respond to candidate-used transport-info: " + e, e); + } return; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportAdapter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportAdapter.java index debeda7a2..df42fd577 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportAdapter.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportAdapter.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import org.jivesoftware.smackx.jingle.adapter.JingleTransportAdapter; import org.jivesoftware.smackx.jingle.element.JingleContentTransportCandidateElement; import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement; +import org.jivesoftware.smackx.jingle.internal.JingleTransportCandidate; import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportCandidateElement; import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportElement; @@ -32,7 +33,7 @@ public class JingleS5BTransportAdapter implements JingleTransportAdapter candidates = new ArrayList<>(); + ArrayList> candidates = new ArrayList<>(); for (JingleContentTransportCandidateElement e : element.getCandidates()) { candidates.add(JingleS5BTransportCandidate.fromElement((JingleS5BTransportCandidateElement) e)); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportManager.java index 1b8a2d87a..ea763c00f 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportManager.java @@ -275,6 +275,6 @@ public final class JingleS5BTransportManager extends Manager implements JingleTr @Override public int compareTo(JingleTransportManager manager) { - return 0; + return 1; // We are #1! } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/legacy/JingleS5BTransportSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/legacy/JingleS5BTransportSession.java deleted file mode 100644 index 7e270124e..000000000 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/legacy/JingleS5BTransportSession.java +++ /dev/null @@ -1,227 +0,0 @@ -/** - * - * Copyright 2017 Paul Schaub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jivesoftware.smackx.jingle.transport.legacy; - -import java.io.IOException; -import java.net.Socket; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.TimeoutException; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.jivesoftware.smack.SmackException; -import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamSession; -import org.jivesoftware.smackx.bytestreams.socks5.Socks5Client; -import org.jivesoftware.smackx.bytestreams.socks5.Socks5ClientForInitiator; -import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy; -import org.jivesoftware.smackx.bytestreams.socks5.Socks5Utils; -import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; -import org.jivesoftware.smackx.jingle.transports.JingleTransportInitiationCallback; -import org.jivesoftware.smackx.jingle.transports.JingleTransportSession; -import org.jivesoftware.smackx.jingle.element.JingleContentElement; -import org.jivesoftware.smackx.jingle.element.JingleContentTransportCandidateElement; -import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement; -import org.jivesoftware.smackx.jingle.element.JingleElement; -import org.jivesoftware.smackx.jingle.transport.jingle_s5b.JingleS5BTransportManager; -import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportCandidateElement; -import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportElement; -import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportInfoElement; - -/** - * Handler that handles Jingle Socks5Bytestream transports (XEP-0260). - */ -public class JingleS5BTransportSession extends JingleTransportSession { - - - private void initiateSession() { - Socks5Proxy.getSocks5Proxy().addTransfer(createTransport().getDestinationAddress()); - JingleContentElement content = jingleSession.getContents().get(0); - UsedCandidate usedCandidate = chooseFromProposedCandidates(theirProposal); - if (usedCandidate == null) { - ourChoice = CANDIDATE_FAILURE; - JingleElement candidateError = transportManager().createCandidateError( - jingleSession.getRemote(), jingleSession.getInitiator(), jingleSession.getSessionId(), - content.getSenders(), content.getCreator(), content.getName(), theirProposal.getStreamId()); - try { - jingleSession.getConnection().sendStanza(candidateError); - } catch (SmackException.NotConnectedException | InterruptedException e) { - LOGGER.log(Level.WARNING, "Could not send candidate-error.", e); - } - } else { - ourChoice = usedCandidate; - JingleElement jingle = transportManager().createCandidateUsed(jingleSession.getRemote(), jingleSession.getInitiator(), jingleSession.getSessionId(), - content.getSenders(), content.getCreator(), content.getName(), theirProposal.getStreamId(), ourChoice.candidate.getCandidateId()); - try { - jingleSession.getConnection().createStanzaCollectorAndSend(jingle) - .nextResultOrThrow(); - } catch (InterruptedException | XMPPException.XMPPErrorException | SmackException.NotConnectedException | SmackException.NoResponseException e) { - LOGGER.log(Level.WARNING, "Could not send candidate-used.", e); - } - } - connectIfReady(); - } - - private UsedCandidate chooseFromProposedCandidates(JingleS5BTransportElement proposal) { - for (JingleContentTransportCandidateElement c : proposal.getCandidates()) { - JingleS5BTransportCandidateElement candidate = (JingleS5BTransportCandidateElement) c; - - try { - return connectToTheirCandidate(candidate); - } catch (InterruptedException | TimeoutException | XMPPException | SmackException | IOException e) { - LOGGER.log(Level.WARNING, "Could not connect to " + candidate.getHost(), e); - } - } - LOGGER.log(Level.WARNING, "Failed to connect to any candidate."); - return null; - } - - public IQ handleCandidateUsed(JingleElement jingle) { - JingleS5BTransportInfoElement info = (JingleS5BTransportInfoElement) jingle.getContents().get(0).getTransport().getInfo(); - String candidateId = ((JingleS5BTransportInfoElement.CandidateUsed) info).getCandidateId(); - theirChoice = new UsedCandidate(ourProposal, ourProposal.getCandidate(candidateId), null); - - if (theirChoice.candidate == null) { - /* - TODO: Booooooh illegal candidateId!! Go home!!!!11elf - */ - } - - connectIfReady(); - - return IQ.createResultIQ(jingle); - } - - public IQ handleCandidateActivate(JingleElement jingle) { - LOGGER.log(Level.INFO, "handleCandidateActivate"); - Socks5BytestreamSession bs = new Socks5BytestreamSession(ourChoice.socket, - ourChoice.candidate.getJid().asBareJid().equals(jingleSession.getRemote().asBareJid())); - callback.onSessionInitiated(bs); - return IQ.createResultIQ(jingle); - } - - public IQ handleCandidateError(JingleElement jingle) { - theirChoice = CANDIDATE_FAILURE; - connectIfReady(); - return IQ.createResultIQ(jingle); - } - - public IQ handleProxyError(JingleElement jingle) { - //TODO - return IQ.createResultIQ(jingle); - } - - /** - * Determine, which candidate (ours/theirs) is the nominated one. - * Connect to this candidate. If it is a proxy and it is ours, activate it and connect. - * If its a proxy and it is theirs, wait for activation. - * If it is not a proxy, just connect. - */ - private void connectIfReady() { - JingleContentElement content = jingleSession.getContents().get(0); - if (ourChoice == null || theirChoice == null) { - // Not yet ready. - LOGGER.log(Level.INFO, "Not ready."); - return; - } - - if (ourChoice == CANDIDATE_FAILURE && theirChoice == CANDIDATE_FAILURE) { - LOGGER.log(Level.INFO, "Failure."); - jingleSession.onTransportMethodFailed(getNamespace()); - return; - } - - LOGGER.log(Level.INFO, "Ready."); - - //Determine nominated candidate. - UsedCandidate nominated; - if (ourChoice != CANDIDATE_FAILURE && theirChoice != CANDIDATE_FAILURE) { - if (ourChoice.candidate.getPriority() > theirChoice.candidate.getPriority()) { - nominated = ourChoice; - } else if (ourChoice.candidate.getPriority() < theirChoice.candidate.getPriority()) { - nominated = theirChoice; - } else { - nominated = jingleSession.isInitiator() ? ourChoice : theirChoice; - } - } else if (ourChoice != CANDIDATE_FAILURE) { - nominated = ourChoice; - } else { - nominated = theirChoice; - } - - if (nominated == theirChoice) { - LOGGER.log(Level.INFO, "Their choice, so our proposed candidate is used."); - boolean isProxy = nominated.candidate.getType() == JingleS5BTransportCandidateElement.Type.proxy; - try { - nominated = connectToOurCandidate(nominated.candidate); - } catch (InterruptedException | IOException | XMPPException | SmackException | TimeoutException e) { - LOGGER.log(Level.INFO, "Could not connect to our candidate.", e); - //TODO: Proxy-Error - return; - } - - if (isProxy) { - LOGGER.log(Level.INFO, "Is external proxy. Activate it."); - Bytestream activate = new Bytestream(ourProposal.getStreamId()); - activate.setMode(null); - activate.setType(IQ.Type.set); - activate.setTo(nominated.candidate.getJid()); - activate.setToActivate(jingleSession.getRemote()); - activate.setFrom(jingleSession.getLocal()); - try { - jingleSession.getConnection().createStanzaCollectorAndSend(activate).nextResultOrThrow(); - } catch (InterruptedException | XMPPException.XMPPErrorException | SmackException.NotConnectedException | SmackException.NoResponseException e) { - LOGGER.log(Level.WARNING, "Could not activate proxy.", e); - return; - } - - LOGGER.log(Level.INFO, "Send candidate-activate."); - JingleElement candidateActivate = transportManager().createCandidateActivated( - jingleSession.getRemote(), jingleSession.getInitiator(), jingleSession.getSessionId(), - content.getSenders(), content.getCreator(), content.getName(), nominated.transport.getStreamId(), - nominated.candidate.getCandidateId()); - try { - jingleSession.getConnection().createStanzaCollectorAndSend(candidateActivate) - .nextResultOrThrow(); - } catch (InterruptedException | XMPPException.XMPPErrorException | SmackException.NotConnectedException | SmackException.NoResponseException e) { - LOGGER.log(Level.WARNING, "Could not send candidate-activated", e); - return; - } - } - - LOGGER.log(Level.INFO, "Start transmission."); - Socks5BytestreamSession bs = new Socks5BytestreamSession(nominated.socket, !isProxy); - callback.onSessionInitiated(bs); - - } - //Our choice - else { - LOGGER.log(Level.INFO, "Our choice, so their candidate was used."); - boolean isProxy = nominated.candidate.getType() == JingleS5BTransportCandidateElement.Type.proxy; - if (!isProxy) { - LOGGER.log(Level.INFO, "Direct connection."); - Socks5BytestreamSession bs = new Socks5BytestreamSession(nominated.socket, true); - callback.onSessionInitiated(bs); - } else { - LOGGER.log(Level.INFO, "Our choice was their external proxy. wait for candidate-activate."); - } - } - } - -}