ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-26 13:59:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge PR 343 from david415/2820.hide_ip_set_tcp_tor.0

Browse Source 
Closes ticket:2820
This commit is contained in:
Brian Warner 2016-09-13 22:06:03 -07:00
commit 3282f2aa8a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/scripts/create_node.py
View File

@ -120,6 +120,10 @@ def write_node_config(c, config):
c.write("# Tahoe installation.\n")
c.write("\n\n")
if config["hide-ip"]:
c.write("[connections]\n")
c.write("tcp = tor\n")
c.write("[node]\n")
nickname = argv_to_unicode(config.get("nickname") or "")
c.write("nickname = %s\n" % (nickname.encode('utf-8'),))

4
src/allmydata/test/cli/test_create.py
View File

@ -39,6 +39,7 @@ class Config(unittest.TestCase):
self.assertEqual(cfg.getboolean("node", "reveal-IP-address"), True)
self.assertEqual(cfg.get("node", "tub.port"), "disabled")
self.assertEqual(cfg.get("node", "tub.location"), "disabled")
self.assertFalse(cfg.has_section("connections"))
@defer.inlineCallbacks
def test_client_hide_ip(self):
@ -46,6 +47,7 @@ class Config(unittest.TestCase):
rc, out, err = yield run_cli("create-client", "--hide-ip", basedir)
cfg = self.read_config(basedir)
self.assertEqual(cfg.getboolean("node", "reveal-IP-address"), False)
self.assertEqual(cfg.get("connections", "tcp"), "tor")
@defer.inlineCallbacks
def test_node(self):
@ -53,6 +55,7 @@ class Config(unittest.TestCase):
rc, out, err = yield run_cli("create-node", "--hostname=foo", basedir)
cfg = self.read_config(basedir)
self.assertEqual(cfg.getboolean("node", "reveal-IP-address"), True)
self.assertFalse(cfg.has_section("connections"))
@defer.inlineCallbacks
def test_node_hide_ip(self):
@ -61,6 +64,7 @@ class Config(unittest.TestCase):
"--hostname=foo", basedir)
cfg = self.read_config(basedir)
self.assertEqual(cfg.getboolean("node", "reveal-IP-address"), False)
self.assertEqual(cfg.get("connections", "tcp"), "tor")
@defer.inlineCallbacks
def test_node_hostname(self):