Get chutney working with dynamic networks

3 files changed, 45 insertions, 10 deletions

diff --git a/lib/chutney/Templating.py b/lib/chutney/Templating.py
index 48ca44a..8141a85 100644
--- a/lib/chutney/Templating.py
+++ b/lib/chutney/Templating.py
@@ -114,9 +114,10 @@ class _DictWrapper(object):
            on other values.
         """
         try:
-            return self._getitem(key,my)
+            return self._getitem(key, my)
         except KeyError:
             pass
+
         if self._parent is None:
             raise _KeyError(key)
 
@@ -129,10 +130,11 @@ class _DictWrapper(object):
                 raise _KeyError(key)
 
         try:
-            return lookup(key,my)
+            return lookup(key, my)
         except KeyError:
             raise _KeyError(key)
 
+
 class Environ(_DictWrapper):
     """An 'Environ' is used to define a set of key-value mappings with a
        fall-back parent Environ.  When looking for keys in the
@@ -199,12 +201,19 @@ class Environ(_DictWrapper):
         self._dict = kw
 
     def _getitem(self, key, my):
+        #print("trying to get " + key)
+        #print(self._dict)
         try:
             return self._dict[key]
         except KeyError:
             pass
 
+        #print("self")
+        #print(dir(self))
         fn = getattr(self, "_get_%s"%key, None)
+        #print("function " + str(fn))
+        #if key == "dir":
+        #    print("found dir " + self._get_dir(self))
         if fn is not None:
             try:
                 rv = fn(my)
@@ -224,6 +233,19 @@ class Environ(_DictWrapper):
         s.update(name[5:] for name in dir(self) if name.startswith("_get_"))
         return s
 
+    def __str__(self):
+        output = ""
+        if self._parent:
+            output += self._parent.__str__()
+            output += "\n\n"
+        output += "Environ:\n"
+        for entry, value in self._dict.items():
+            output += "  " + entry + ": " + str(value) + "\n"
+        for fname in dir(self):
+            if fname.startswith("_get_"):
+                output += "  " + fname + ": <Function>\n"
+        return output
+
 class IncluderDict(_DictWrapper):
     """Helper to implement ${include:} template substitution.  Acts as a
        dictionary that maps include:foo to the contents of foo (relative to
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 559b635..eb8c310 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -65,8 +65,8 @@ class Node(object):
         nodelist.append(self)
 
     @staticmethod
-    def create(number, args):
-        return [Node(kwargs = args) for i in range(0, number)]
+    def create(number, kwargs):
+        return [Node(**kwargs) for i in range(0, number)]
 
     def specialize(self, **kwargs):
         return Node(parent=self, **kwargs)
@@ -97,6 +97,7 @@ class Node(object):
         """
         if self._stemcontroller is None:
             self._stemcontroller = stem.control.Controller.from_port(port = self._env['controlport'])
+            self._stemcontroller.authenticate()
         return self._stemcontroller
 
     def setNodenum(self, num):
@@ -366,7 +367,7 @@ class LocalNodeBuilder(NodeBuilder):
             # 'basic'
             if hasbridgeauth:
                 options = ("AlternateDirAuthority",)
-	    else:
+            else:
                 options = ("DirAuthority",)
             self._env['dirserver_flags'] += " hs v3ident=%s" % v3id
 
@@ -571,7 +572,7 @@ class TorEnviron(chutney.Templating.Environ):
     def _get_dirport(self, my):
         return my['dirport_base']+my['nodenum']
 
-    def _get_dir(self, my):
+    def  _get_dir(self, my):
         return os.path.abspath(os.path.join(my['net_base_dir'],
                                             "nodes",
                                          "%03d%s"%(my['nodenum'], my['tag'])))
@@ -725,10 +726,14 @@ def runConfigFile(verb, f):
 
     return getattr(network, verb)()
 
+def signal_handler(signal, frame):
+    _THE_NETWORK.stop()
+    sys.exit(0)
+
 def main():
     global _BASE_ENVIRON
     global _THE_NETWORK
-    _BASE_ENVIRON = TorEnviron(chutney.Templating.Environ(**DEFAULTS))
+    _BASE_ENVIRON = chutney.Templating.Environ(**DEFAULTS)
     _THE_NETWORK = Network(_BASE_ENVIRON)
 
     if len(sys.argv) < 3:
@@ -739,8 +744,12 @@ def main():
     f = open(sys.argv[2])
     result = runConfigFile(sys.argv[1], f)
     if result is False:
-        return -1
+        sys.exit(-1)
+
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.pause()
+
     return 0
 
 if __name__ == '__main__':
-    sys.exit(main())
+    main()
diff --git a/networks/hidden-service b/networks/hidden-service
index bcaf0ef..897ce80 100644
--- a/networks/hidden-service
+++ b/networks/hidden-service
@@ -35,12 +35,16 @@ DelayedHiddenService = Node(
 )
 
 def start():
+    print("Starting hidden service test")
+
     if not all([ n.getController().start() for n in initialNodes ]):
         return False
+    else:
+        print("All initial nodes running")
 
     def log_listener(logevent):
-        print(logevent.message)
         if "Successfully uploaded v2 rend descriptors" in logevent.message:
+            print("log message: " + logevent.message)
             DelayedHiddenService.getController().start()
 
     HiddenService.getStemController().add_event_listener(log_listener, EventType.INFO)