ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-18 23:38:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

client.py: create node key even when storage is disabled. Closes #1945.

Browse Source 
Thanks to Leif for the catch!
This commit is contained in:
Brian Warner
2013-04-18 00:06:55 -07:00
parent 04c7cfe38b
commit b989555d96
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/allmydata/client.py
View File

@ -134,6 +134,7 @@ class Client(node.Node, pollmixin.PollMixin):
self.init_introducer_client() self.init_introducer_client()
self.init_stats_provider() self.init_stats_provider()
self.init_secrets() self.init_secrets()
self.init_node_key()
self.init_storage() self.init_storage()
self.init_control() self.init_control()
self.helper = None self.helper = None
@ -209,7 +210,7 @@ class Client(node.Node, pollmixin.PollMixin):
self.convergence = base32.a2b(convergence_s) self.convergence = base32.a2b(convergence_s)
self._secret_holder = SecretHolder(lease_secret, self.convergence) self._secret_holder = SecretHolder(lease_secret, self.convergence)
def _maybe_create_node_key(self): def init_node_key(self):
# we only create the key once. On all subsequent runs, we re-use the # we only create the key once. On all subsequent runs, we re-use the
# existing key # existing key
def _make_key(): def _make_key():
@ -255,8 +256,6 @@ class Client(node.Node, pollmixin.PollMixin):
return return
readonly = self.get_config("storage", "readonly", False, boolean=True) readonly = self.get_config("storage", "readonly", False, boolean=True)
self._maybe_create_node_key()
storedir = os.path.join(self.basedir, self.STOREDIR) storedir = os.path.join(self.basedir, self.STOREDIR)
data = self.get_config("storage", "reserved_space", None) data = self.get_config("storage", "reserved_space", None)

16
src/allmydata/test/test_client.py
View File

@ -78,6 +78,22 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase):
cancel_secret = c.get_cancel_secret() cancel_secret = c.get_cancel_secret()
self.failUnless(base32.b2a(cancel_secret)) self.failUnless(base32.b2a(cancel_secret))
def test_nodekey_yes_storage(self):
basedir = "test_client.Basic.test_nodekey_yes_storage"
os.mkdir(basedir)
fileutil.write(os.path.join(basedir, "tahoe.cfg"),
BASECONFIG)
c = client.Client(basedir)
self.failUnless(c.get_long_nodeid().startswith("v0-"))
def test_nodekey_no_storage(self):
basedir = "test_client.Basic.test_nodekey_no_storage"
os.mkdir(basedir)
fileutil.write(os.path.join(basedir, "tahoe.cfg"),
BASECONFIG + "[storage]\n" + "enabled = false\n")
c = client.Client(basedir)
self.failUnless(c.get_long_nodeid().startswith("v0-"))
def test_reserved_1(self): def test_reserved_1(self):
basedir = "client.Basic.test_reserved_1" basedir = "client.Basic.test_reserved_1"
os.mkdir(basedir) os.mkdir(basedir)