Changeset d2426ea in trunk for src/allmydata

Timestamp:

2009-11-18T01:54:44Z (15 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

f8569069

Parents:

5fe713f

Message:

move convergence secret into SecretHolder?, next to lease secret

Location:

src/allmydata

Files:

• client.py (modified) (5 diffs)
• test/test_filenode.py (modified) (1 diff)
• test/test_helper.py (modified) (1 diff)
• test/test_mutable.py (modified) (1 diff)
• test/test_upload.py (modified) (1 diff)
• test/test_web.py (modified) (3 diffs)

src/allmydata/client.py ¶

@@ -39 +39 @@
 
 class SecretHolder:
-    def __init__(self, lease_secret):
+    def __init__(self, lease_secret, convergence_secret):
         self._lease_secret = lease_secret
+        self._convergence_secret = convergence_secret
 
     def get_renewal_secret(self):
@@ -47 +48 @@
     def get_cancel_secret(self):
         return hashutil.my_cancel_secret_hash(self._lease_secret)
+
+    def get_convergence_secret(self):
+        return self._convergence_secret
 
 class KeyGenerator:
@@ -109 +113 @@
         self.init_introducer_client()
         self.init_stats_provider()
-        self.init_lease_secret()
+        self.init_secrets()
         self.init_storage()
         self.init_control()
@@ -180 +184 @@
         return { 'node.uptime': time.time() - self.started_timestamp }
 
-    def init_lease_secret(self):
-        secret_s = self.get_or_create_private_config("secret", _make_secret)
-        lease_secret = base32.a2b(secret_s)
-        self._secret_holder = SecretHolder(lease_secret)
+    def init_secrets(self):
+        lease_s = self.get_or_create_private_config("secret", _make_secret)
+        lease_secret = base32.a2b(lease_s)
+        convergence_s = self.get_or_create_private_config('convergence',
+                                                          _make_secret)
+        self.convergence = base32.a2b(convergence_s)
+        self._secret_holder = SecretHolder(lease_secret, self.convergence)
 
     def init_storage(self):
@@ -256 +263 @@
         DEP["n"] = int(self.get_config("client", "shares.total", DEP["n"]))
         DEP["happy"] = int(self.get_config("client", "shares.happy", DEP["happy"]))
-        convergence_s = self.get_or_create_private_config('convergence', _make_secret)
-        self.convergence = base32.a2b(convergence_s)
 
         self.init_client_storage_broker()

src/allmydata/test/test_filenode.py ¶

@@ -22 +22 @@
     def get_history(self):
         return None
-    _secret_holder = client.SecretHolder("lease secret")
+    _secret_holder = client.SecretHolder("lease secret", "convergence secret")
 
 class Node(unittest.TestCase):

src/allmydata/test/test_helper.py ¶

@@ -91 +91 @@
         self.s = FakeClient()
         self.storage_broker = StorageFarmBroker(None, True)
-        self.secret_holder = client.SecretHolder("lease secret")
+        self.secret_holder = client.SecretHolder("lease secret", "convergence")
         self.s.startService()
 

src/allmydata/test/test_mutable.py ¶

@@ -197 +197 @@
 def make_nodemaker(s=None, num_peers=10):
     storage_broker = make_storagebroker(s, num_peers)
-    sh = client.SecretHolder("lease secret")
+    sh = client.SecretHolder("lease secret", "convergence secret")
     keygen = client.KeyGenerator()
     keygen.set_default_keysize(522)

src/allmydata/test/test_upload.py ¶

@@ -188 +188 @@
     def get_storage_broker(self):
         return self.storage_broker
-    _secret_holder = client.SecretHolder("lease secret")
+    _secret_holder = client.SecretHolder("lease secret", "convergence secret")
 
 class GotTooFarError(Exception):

src/allmydata/test/test_web.py ¶

@@ -26 +26 @@
 from allmydata.test.common_web import HTTPClientGETFactory, \
      HTTPClientHEADFactory
-from allmydata.client import Client
+from allmydata.client import Client, SecretHolder
 
 # create a fake uploader/downloader, and a couple of fake dirnodes, then
@@ -94 +94 @@
         self.introducer_furl = "None"
         self.stats_provider = FakeStatsProvider()
-        self._secret_holder = None
+        self._secret_holder = SecretHolder("lease secret", "convergence secret")
         self.helper = None
         self.convergence = "some random string"
@@ -102 +102 @@
         self.uploader = FakeUploader()
         self.uploader.setServiceParent(self)
-        self.nodemaker = FakeNodeMaker(None, None, None,
+        self.nodemaker = FakeNodeMaker(None, self._secret_holder, None,
                                        self.uploader, None, None,
                                        None, None)