isolate test_keygen data

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / key_generator.py

diff --git a/src/allmydata/key_generator.py b/src/allmydata/key_generator.py
index 61fa9b2edf0ccebf86993a27960b4900e52d0996..63bf51b833f31be7ca567cfa8654398164a5286a 100644 (file)
--- a/src/allmydata/key_generator.py
+++ b/src/allmydata/key_generator.py
@@ -2,27 +2,27 @@
 import os
 import time
 
-import foolscap
+from foolscap.api import Referenceable, Tub
 from zope.interface import implements
 from twisted.internet import reactor
 from twisted.application import service
-from twisted.python import log
+from allmydata.util import log, fileutil
 
 from pycryptopp.publickey import rsa
 from allmydata.interfaces import RIKeyGenerator
 
-class KeyGenerator(service.MultiService, foolscap.Referenceable):
+class KeyGenerator(service.MultiService, Referenceable):
     implements(RIKeyGenerator)
 
-    DEFAULT_KEY_SIZE = 2048
     pool_size = 16 # no. keys to keep on hand in the pool
     pool_refresh_delay = 6 # no. sec to wait after a fetch before generating new keys
     verbose = False
 
-    def __init__(self):
+    def __init__(self, default_key_size=2048):
         service.MultiService.__init__(self)
         self.keypool = []
         self.last_fetch = 0
+        self.default_key_size = default_key_size
 
     def startService(self):
         self.timer = reactor.callLater(0, self.maybe_refill_pool)
@@ -52,9 +52,10 @@ class KeyGenerator(service.MultiService, foolscap.Referenceable):
         if self.last_fetch + self.pool_refresh_delay < now:
             self.vlog('%s refilling pool' % (self,))
             while len(self.keypool) < self.pool_size:
-                self.keypool.append(self.gen_key(self.DEFAULT_KEY_SIZE))
+                self.keypool.append(self.gen_key(self.default_key_size))
         else:
             self.vlog('%s not refilling pool' % (self,))
+            reactor.callLater(1, self.maybe_refill_pool)
 
     def gen_key(self, key_size):
         self.vlog('%s generating key size %s' % (self, key_size, ))
@@ -64,7 +65,7 @@ class KeyGenerator(service.MultiService, foolscap.Referenceable):
 
     def remote_get_rsa_key_pair(self, key_size):
         self.vlog('%s remote_get_key' % (self,))
-        if key_size != self.DEFAULT_KEY_SIZE or not self.keypool:
+        if key_size != self.default_key_size or not self.keypool:
             key = self.gen_key(key_size)
             self.reset_timer()
             return key
@@ -75,12 +76,14 @@ class KeyGenerator(service.MultiService, foolscap.Referenceable):
 class KeyGeneratorService(service.MultiService):
     furl_file = 'key_generator.furl'
 
-    def __init__(self, basedir='.', display_furl=True):
+    def __init__(self, basedir='.', display_furl=True, default_key_size=2048):
         service.MultiService.__init__(self)
         self.basedir = basedir
-        self.tub = foolscap.Tub(certFile=os.path.join(self.basedir, 'key_generator.pem'))
+        fileutil.make_dirs(self.basedir)
+        self.tub = Tub(certFile=os.path.join(self.basedir, 'key_generator.pem'))
+        self.tub.setOption("expose-remote-exception-types", False)
         self.tub.setServiceParent(self)
-        self.key_generator = KeyGenerator()
+        self.key_generator = KeyGenerator(default_key_size=default_key_size)
         self.key_generator.setServiceParent(self)
 
         portnum = self.get_portnum()