[tor-commits] [chutney/master] Add more minimal HS, Single Onion and Exit networks

[teor at torproject.org]

commit 3f39ce19111a11aa5620467936c2c7cd37f769da
Author: teor <teor2345 at gmail.com>
Date:   Wed Jan 31 16:04:14 2018 +1100

    Add more minimal HS, Single Onion and Exit networks
    
    (Maybe we should come up with a way of combining networks?)
---
 networks/hs-single-onion-v23-exit-min | 19 +++++++++++++++++++
 networks/hs-v23-exit-min              | 15 +++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/networks/hs-single-onion-v23-exit-min b/networks/hs-single-onion-v23-exit-min
new file mode 100644
index 0000000..5f2d6f5
--- /dev/null
+++ b/networks/hs-single-onion-v23-exit-min
@@ -0,0 +1,19 @@
+# By default, Authorities are not configured as exits
+Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
+ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl")
+HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl")
+SingleOnionv2 = Node(tag="h", hs=1, torrc="single-onion.tmpl")
+SingleOnionv3 = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl")
+
+# A hidden service needs 5 authorities/relays to ensure it can build HS
+# connections:
+# a minimum path length of 3, plus the client-nominated rendezvous point,
+# plus a seperate introduction point
+NODES = Authority.getN(2) + ExitRelay.getN(3) + \
+        Client.getN(1) + \
+        HSv2.getN(1) + HSv3.getN(1) + \
+        SingleOnionv2.getN(1) + SingleOnionv3.getN(1)
+
+ConfigureNodes(NODES)
diff --git a/networks/hs-v23-exit-min b/networks/hs-v23-exit-min
new file mode 100644
index 0000000..ec7d9ac
--- /dev/null
+++ b/networks/hs-v23-exit-min
@@ -0,0 +1,15 @@
+# By default, Authorities are not configured as exits
+Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
+ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl")
+HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl")
+
+# A hidden service needs 5 authorities/relays to ensure it can build HS
+# connections:
+# a minimum path length of 3, plus the client-nominated rendezvous point,
+# plus a seperate introduction point
+NODES = Authority.getN(2) + ExitRelay.getN(3) + \
+        Client.getN(1) + HSv2.getN(1) + HSv3.getN(1)
+
+ConfigureNodes(NODES)