phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 23:09:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

net: Pass onion service target to Tor controller

Browse source
This commit is contained in:
Hennadii Stepanov 2020-09-24 22:40:05 +03:00
parent e3f07851f0
commit 57f17e57c8
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
3 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/init.cpp
View file

@ -1912,7 +1912,7 @@ bool AppInitMain(const util::Ref& context, NodeContext& node, interfaces::BlockA
LogPrintf("nBestHeight = %d\n", chain_active_height); LogPrintf("nBestHeight = %d\n", chain_active_height);
if (args.GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION)) if (args.GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION))
StartTorControl(); StartTorControl(DefaultOnionServiceTarget());
Discover(); Discover();

40
src/torcontrol.cpp
View file

@ -3,13 +3,16 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chainparams.h>
#include <torcontrol.h> #include <torcontrol.h>
#include <util/strencodings.h>
#include <netbase.h> #include <chainparams.h>
#include <net.h> #include <chainparamsbase.h>
#include <util/system.h>
#include <crypto/hmac_sha256.h> #include <crypto/hmac_sha256.h>
#include <net.h>
#include <netaddress.h>
#include <netbase.h>
#include <util/strencodings.h>
#include <util/system.h>
#include <vector> #include <vector>
#include <deque> #include <deque>
@ -410,7 +413,7 @@ static bool WriteBinaryFile(const fs::path &filename, const std::string &data)
class TorController class TorController
{ {
public: public:
TorController(struct event_base* base, const std::string& tor_control_center); TorController(struct event_base* base, const std::string& tor_control_center, const CService& target);
~TorController(); ~TorController();
/** Get name of file to store private key in */ /** Get name of file to store private key in */
@ -428,6 +431,7 @@ private:
struct event *reconnect_ev; struct event *reconnect_ev;
float reconnect_timeout; float reconnect_timeout;
CService service; CService service;
const CService m_target;
/** Cookie for SAFECOOKIE auth */ /** Cookie for SAFECOOKIE auth */
std::vector<uint8_t> cookie; std::vector<uint8_t> cookie;
/** ClientNonce for SAFECOOKIE auth */ /** ClientNonce for SAFECOOKIE auth */
@ -450,10 +454,11 @@ private:
static void reconnect_cb(evutil_socket_t fd, short what, void *arg); static void reconnect_cb(evutil_socket_t fd, short what, void *arg);
}; };
TorController::TorController(struct event_base* _base, const std::string& tor_control_center): TorController::TorController(struct event_base* _base, const std::string& tor_control_center, const CService& target):
base(_base), base(_base),
m_tor_control_center(tor_control_center), conn(base), reconnect(true), reconnect_ev(0), m_tor_control_center(tor_control_center), conn(base), reconnect(true), reconnect_ev(0),
reconnect_timeout(RECONNECT_TIMEOUT_START) reconnect_timeout(RECONNECT_TIMEOUT_START),
m_target(target)
{ {
reconnect_ev = event_new(base, -1, 0, reconnect_cb, this); reconnect_ev = event_new(base, -1, 0, reconnect_cb, this);
if (!reconnect_ev) if (!reconnect_ev)
@ -536,7 +541,7 @@ void TorController::auth_cb(TorControlConnection& _conn, const TorControlReply&
private_key = "NEW:RSA1024"; // Explicitly request RSA1024 - see issue #9214 private_key = "NEW:RSA1024"; // Explicitly request RSA1024 - see issue #9214
// Request onion service, redirect port. // Request onion service, redirect port.
// Note that the 'virtual' port is always the default port to avoid decloaking nodes using other ports. // Note that the 'virtual' port is always the default port to avoid decloaking nodes using other ports.
_conn.Command(strprintf("ADD_ONION %s Port=%i,127.0.0.1:%i", private_key, Params().GetDefaultPort(), GetListenPort()), _conn.Command(strprintf("ADD_ONION %s Port=%i,%s", private_key, Params().GetDefaultPort(), m_target.ToStringIPPort()),
std::bind(&TorController::add_onion_cb, this, std::placeholders::_1, std::placeholders::_2)); std::bind(&TorController::add_onion_cb, this, std::placeholders::_1, std::placeholders::_2));
} else { } else {
LogPrintf("tor: Authentication failed\n"); LogPrintf("tor: Authentication failed\n");
@ -731,14 +736,14 @@ void TorController::reconnect_cb(evutil_socket_t fd, short what, void *arg)
static struct event_base *gBase; static struct event_base *gBase;
static std::thread torControlThread; static std::thread torControlThread;
static void TorControlThread() static void TorControlThread(CService onion_service_target)
{ {
TorController ctrl(gBase, gArgs.GetArg("-torcontrol", DEFAULT_TOR_CONTROL)); TorController ctrl(gBase, gArgs.GetArg("-torcontrol", DEFAULT_TOR_CONTROL), onion_service_target);
event_base_dispatch(gBase); event_base_dispatch(gBase);
} }
void StartTorControl() void StartTorControl(CService onion_service_target)
{ {
assert(!gBase); assert(!gBase);
#ifdef WIN32 #ifdef WIN32
@ -752,7 +757,9 @@ void StartTorControl()
return; return;
} }
torControlThread = std::thread(std::bind(&TraceThread<void (*)()>, "torcontrol", &TorControlThread)); torControlThread = std::thread(&TraceThread<std::function<void()>>, "torcontrol", [onion_service_target] {
TorControlThread(onion_service_target);
});
} }
void InterruptTorControl() void InterruptTorControl()
@ -773,3 +780,10 @@ void StopTorControl()
gBase = nullptr; gBase = nullptr;
} }
} }
CService DefaultOnionServiceTarget()
{
struct in_addr onion_service_target;
onion_service_target.s_addr = htonl(INADDR_LOOPBACK);
return {onion_service_target, BaseParams().OnionServiceTargetPort()};
}

7
src/torcontrol.h
View file

@ -8,12 +8,17 @@
#ifndef BITCOIN_TORCONTROL_H #ifndef BITCOIN_TORCONTROL_H
#define BITCOIN_TORCONTROL_H #define BITCOIN_TORCONTROL_H
#include <string>
class CService;
extern const std::string DEFAULT_TOR_CONTROL; extern const std::string DEFAULT_TOR_CONTROL;
static const bool DEFAULT_LISTEN_ONION = true; static const bool DEFAULT_LISTEN_ONION = true;
void StartTorControl(); void StartTorControl(CService onion_service_target);
void InterruptTorControl(); void InterruptTorControl();
void StopTorControl(); void StopTorControl();
CService DefaultOnionServiceTarget();
#endif /* BITCOIN_TORCONTROL_H */ #endif /* BITCOIN_TORCONTROL_H */