Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-01-09 16:39:11 (GMT)
committerSwift Review <review@swift.im>2015-02-11 09:35:21 (GMT)
commit779f0d57bc9d90300aad0b1386dc937612ac35f4 (patch)
tree2b7beb4db6af92eef45a6adaf0118d3ba149056b /Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp
parent66567c962202920b0d6bc06029ed37565cd4a81c (diff)
downloadswift-779f0d57bc9d90300aad0b1386dc937612ac35f4.zip
swift-779f0d57bc9d90300aad0b1386dc937612ac35f4.tar.bz2
Support domain names in S5B proxy <streamhost> tags.
S5BProxyManager now resolves DNS names of proxy entries discovered via service discovery. Test-Information: Tested against a XMPP installation that uses domain names in proxy entires. Change-Id: I728243333ec6e62e86f088f2a7b6e222c629757b
Diffstat (limited to 'Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp')
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp109
1 files changed, 92 insertions, 17 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp b/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp
index 0b94763..ef0a733 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp
@@ -4,69 +4,144 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+
#include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h>
#include <boost/smart_ptr/make_shared.hpp>
+#include <boost/bind.hpp>
#include <Swiften/Base/foreach.h>
#include <Swiften/FileTransfer/SOCKS5BytestreamClientSession.h>
#include <Swiften/Base/Log.h>
+#include <Swiften/Network/DomainNameResolver.h>
+#include <Swiften/Network/ConnectionFactory.h>
+#include <Swiften/Network/TimerFactory.h>
+#include <Swiften/Network/DomainNameAddressQuery.h>
+#include <Swiften/Network/DomainNameResolveError.h>
namespace Swift {
-SOCKS5BytestreamProxiesManager::SOCKS5BytestreamProxiesManager(ConnectionFactory *connFactory, TimerFactory *timeFactory) : connectionFactory(connFactory), timerFactory(timeFactory) {
+SOCKS5BytestreamProxiesManager::SOCKS5BytestreamProxiesManager(ConnectionFactory *connFactory, TimerFactory *timeFactory, DomainNameResolver* resolver, IQRouter* iqRouter, const JID& serviceRoot) : connectionFactory_(connFactory), timerFactory_(timeFactory), resolver_(resolver), iqRouter_(iqRouter), serviceRoot_(serviceRoot) {
+
+}
+SOCKS5BytestreamProxiesManager::~SOCKS5BytestreamProxiesManager() {
+ if (proxyFinder_) {
+ proxyFinder_->stop();
+ }
}
void SOCKS5BytestreamProxiesManager::addS5BProxy(S5BProxyRequest::ref proxy) {
- localS5BProxies.push_back(proxy);
+ if (proxy) {
+ SWIFT_LOG_ASSERT(HostAddress(proxy->getStreamHost().get().host).isValid(), warning) << std::endl;
+ if (!localS5BProxies_) {
+ localS5BProxies_ = std::vector<S5BProxyRequest::ref>();
+ }
+ localS5BProxies_->push_back(proxy);
+ onDiscoveredProxiesChanged();
+ }
}
-const std::vector<S5BProxyRequest::ref>& SOCKS5BytestreamProxiesManager::getS5BProxies() const {
- return localS5BProxies;
+const boost::optional<std::vector<S5BProxyRequest::ref> >& SOCKS5BytestreamProxiesManager::getOrDiscoverS5BProxies() {
+ if (!localS5BProxies_ && !proxyFinder_) {
+ queryForProxies();
+ }
+ return localS5BProxies_;
}
void SOCKS5BytestreamProxiesManager::connectToProxies(const std::string& sessionID) {
SWIFT_LOG(debug) << "session ID: " << sessionID << std::endl;
ProxyJIDClientSessionMap clientSessions;
- foreach(S5BProxyRequest::ref proxy, localS5BProxies) {
- boost::shared_ptr<Connection> conn = connectionFactory->createConnection();
+ if (localS5BProxies_) {
+ foreach(S5BProxyRequest::ref proxy, localS5BProxies_.get()) {
+ boost::shared_ptr<Connection> conn = connectionFactory_->createConnection();
- boost::shared_ptr<SOCKS5BytestreamClientSession> session = boost::make_shared<SOCKS5BytestreamClientSession>(conn, proxy->getStreamHost().get().addressPort, sessionID, timerFactory);
- clientSessions[proxy->getStreamHost().get().jid] = session;
- session->start();
+ HostAddressPort addressPort = HostAddressPort(proxy->getStreamHost().get().host, proxy->getStreamHost().get().port);
+ SWIFT_LOG_ASSERT(addressPort.isValid(), warning) << std::endl;
+ boost::shared_ptr<SOCKS5BytestreamClientSession> session = boost::make_shared<SOCKS5BytestreamClientSession>(conn, addressPort, sessionID, timerFactory_);
+ clientSessions[proxy->getStreamHost().get().jid] = session;
+ session->start();
+ }
}
- proxySessions[sessionID] = clientSessions;
+ proxySessions_[sessionID] = clientSessions;
}
boost::shared_ptr<SOCKS5BytestreamClientSession> SOCKS5BytestreamProxiesManager::getProxySessionAndCloseOthers(const JID& proxyJID, const std::string& sessionID) {
// checking parameters
- if (proxySessions.find(sessionID) == proxySessions.end()) {
+ if (proxySessions_.find(sessionID) == proxySessions_.end()) {
return boost::shared_ptr<SOCKS5BytestreamClientSession>();
}
- if (proxySessions[sessionID].find(proxyJID) == proxySessions[sessionID].end()) {
+ if (proxySessions_[sessionID].find(proxyJID) == proxySessions_[sessionID].end()) {
return boost::shared_ptr<SOCKS5BytestreamClientSession>();
}
// get active session
- boost::shared_ptr<SOCKS5BytestreamClientSession> activeSession = proxySessions[sessionID][proxyJID];
- proxySessions[sessionID].erase(proxyJID);
+ boost::shared_ptr<SOCKS5BytestreamClientSession> activeSession = proxySessions_[sessionID][proxyJID];
+ proxySessions_[sessionID].erase(proxyJID);
// close other sessions
- foreach(const ProxyJIDClientSessionMap::value_type& myPair, proxySessions[sessionID]) {
+ foreach(const ProxyJIDClientSessionMap::value_type& myPair, proxySessions_[sessionID]) {
myPair.second->stop();
}
- proxySessions.erase(sessionID);
+ proxySessions_.erase(sessionID);
return activeSession;
}
boost::shared_ptr<SOCKS5BytestreamClientSession> SOCKS5BytestreamProxiesManager::createSOCKS5BytestreamClientSession(HostAddressPort addressPort, const std::string& destAddr) {
- SOCKS5BytestreamClientSession::ref connection = boost::make_shared<SOCKS5BytestreamClientSession>(connectionFactory->createConnection(), addressPort, destAddr, timerFactory);
+ SOCKS5BytestreamClientSession::ref connection = boost::make_shared<SOCKS5BytestreamClientSession>(connectionFactory_->createConnection(), addressPort, destAddr, timerFactory_);
return connection;
}
+void SOCKS5BytestreamProxiesManager::handleProxyFound(S5BProxyRequest::ref proxy) {
+ if (proxy) {
+ if (HostAddress(proxy->getStreamHost().get().host).isValid()) {
+ addS5BProxy(proxy);
+ }
+ else {
+ DomainNameAddressQuery::ref resolveRequest = resolver_->createAddressQuery(proxy->getStreamHost().get().host);
+ resolveRequest->onResult.connect(boost::bind(&SOCKS5BytestreamProxiesManager::handleNameLookupResult, this, _1, _2, proxy));
+ resolveRequest->run();
+ }
+ }
+ else {
+ onDiscoveredProxiesChanged();
+ }
+ proxyFinder_->stop();
+}
+
+void SOCKS5BytestreamProxiesManager::handleNameLookupResult(const std::vector<HostAddress>& address, boost::optional<DomainNameResolveError> error, S5BProxyRequest::ref proxy) {
+ if (error) {
+ onDiscoveredProxiesChanged();
+ }
+ else {
+ if (address.empty()) {
+ SWIFT_LOG(warning) << "S5B proxy hostname does not resolve." << std::endl;
+ onDiscoveredProxiesChanged();
+ }
+ else {
+ S5BProxyRequest::StreamHost streamHost = proxy->getStreamHost().get();
+ streamHost.host = address[0].toString();
+ proxy->setStreamHost(streamHost);
+ addS5BProxy(proxy);
+ }
+ }
+}
+
+void SOCKS5BytestreamProxiesManager::queryForProxies() {
+ proxyFinder_ = boost::make_shared<SOCKS5BytestreamProxyFinder>(serviceRoot_, iqRouter_);
+
+ proxyFinder_->onProxyFound.connect(boost::bind(&SOCKS5BytestreamProxiesManager::handleProxyFound, this, _1));
+ proxyFinder_->start();
+}
+
}