[tor-commits] [chutney/master] Add an hs-intro network

[teor at torproject.org]

commit cc9de2764a8816892706fa484eae419ea9b5aa11
Author: teor <teor2345 at gmail.com>
Date:   Wed Jun 14 14:12:45 2017 +1000

    Add an hs-intro network
    
    This network has different hidden service intro point counts.
    
    Implements #22599.
---
 networks/hs-intro         | 39 +++++++++++++++++++++++++++++++++++++++
 torrc_templates/hs0.tmpl  |  2 ++
 torrc_templates/hs1.tmpl  |  2 ++
 torrc_templates/hs10.tmpl |  2 ++
 torrc_templates/hs2.tmpl  |  2 ++
 torrc_templates/hs3.tmpl  |  2 ++
 torrc_templates/hs4.tmpl  |  2 ++
 torrc_templates/hs5.tmpl  |  2 ++
 torrc_templates/hs6.tmpl  |  2 ++
 torrc_templates/hs7.tmpl  |  2 ++
 torrc_templates/hs8.tmpl  |  2 ++
 torrc_templates/hs9.tmpl  |  2 ++
 12 files changed, 61 insertions(+)

diff --git a/networks/hs-intro b/networks/hs-intro
new file mode 100644
index 0000000..c5714ce
--- /dev/null
+++ b/networks/hs-intro
@@ -0,0 +1,39 @@
+# By default, Authorities are not configured as exits
+Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
+NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
+Client = Node(tag="c", torrc="client.tmpl")
+HS0 = Node(tag="h", hs=1, torrc="hs0.tmpl")
+HS1 = Node(tag="h", hs=1, torrc="hs1.tmpl")
+HS2 = Node(tag="h", hs=1, torrc="hs2.tmpl")
+HS3 = Node(tag="h", hs=1, torrc="hs3.tmpl")
+HS4 = Node(tag="h", hs=1, torrc="hs4.tmpl")
+HS5 = Node(tag="h", hs=1, torrc="hs5.tmpl")
+HS6 = Node(tag="h", hs=1, torrc="hs6.tmpl")
+HS7 = Node(tag="h", hs=1, torrc="hs7.tmpl")
+HS8 = Node(tag="h", hs=1, torrc="hs8.tmpl")
+HS9 = Node(tag="h", hs=1, torrc="hs9.tmpl")
+HS10 = Node(tag="h", hs=1, torrc="hs10.tmpl")
+
+# Since only 25% of relays get the guard flag,
+# TestingDirAuthVoteGuard * may need to be used in small networks
+
+# 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
+# A hidden service with 10 intro points actually tries 12, then repurposes 2
+NODES = Authority.getN(2) + NonExitRelay.getN(10) + \
+        Client.getN(1) + \
+        HS0.getN(2) + \
+        HS1.getN(2) + \
+        HS2.getN(2) + \
+        HS3.getN(2) + \
+        HS4.getN(2) + \
+        HS5.getN(2) + \
+        HS6.getN(2) + \
+        HS7.getN(2) + \
+        HS8.getN(2) + \
+        HS9.getN(2) + \
+        HS10.getN(2)
+
+ConfigureNodes(NODES)
diff --git a/torrc_templates/hs0.tmpl b/torrc_templates/hs0.tmpl
new file mode 100644
index 0000000..bb5a9b5
--- /dev/null
+++ b/torrc_templates/hs0.tmpl
@@ -0,0 +1,2 @@
+${include:hs.tmpl}
+HiddenServiceNumIntroductionPoints 0
diff --git a/torrc_templates/hs1.tmpl b/torrc_templates/hs1.tmpl
new file mode 100644
index 0000000..47948a9
--- /dev/null
+++ b/torrc_templates/hs1.tmpl
@@ -0,0 +1,2 @@
+${include:hs.tmpl}
+HiddenServiceNumIntroductionPoints 1
diff --git a/torrc_templates/hs10.tmpl b/torrc_templates/hs10.tmpl
new file mode 100644
index 0000000..e8758e6
--- /dev/null
+++ b/torrc_templates/hs10.tmpl
@@ -0,0 +1,2 @@
+${include:hs.tmpl}
+HiddenServiceNumIntroductionPoints 10
diff --git a/torrc_templates/hs2.tmpl b/torrc_templates/hs2.tmpl
new file mode 100644
index 0000000..b98cd39
--- /dev/null
+++ b/torrc_templates/hs2.tmpl
@@ -0,0 +1,2 @@
+${include:hs.tmpl}
+HiddenServiceNumIntroductionPoints 2
diff --git a/torrc_templates/hs3.tmpl b/torrc_templates/hs3.tmpl
new file mode 100644
index 0000000..a1dd6a4
--- /dev/null
+++ b/torrc_templates/hs3.tmpl
@@ -0,0 +1,2 @@
+${include:hs.tmpl}
+HiddenServiceNumIntroductionPoints 3
diff --git a/torrc_templates/hs4.tmpl b/torrc_templates/hs4.tmpl
new file mode 100644
index 0000000..13d0aa4
--- /dev/null
+++ b/torrc_templates/hs4.tmpl
@@ -0,0 +1,2 @@
+${include:hs.tmpl}
+HiddenServiceNumIntroductionPoints 4
diff --git a/torrc_templates/hs5.tmpl b/torrc_templates/hs5.tmpl
new file mode 100644
index 0000000..6d7544c
--- /dev/null
+++ b/torrc_templates/hs5.tmpl
@@ -0,0 +1,2 @@
+${include:hs.tmpl}
+HiddenServiceNumIntroductionPoints 5
diff --git a/torrc_templates/hs6.tmpl b/torrc_templates/hs6.tmpl
new file mode 100644
index 0000000..8e3eff3
--- /dev/null
+++ b/torrc_templates/hs6.tmpl
@@ -0,0 +1,2 @@
+${include:hs.tmpl}
+HiddenServiceNumIntroductionPoints 6
diff --git a/torrc_templates/hs7.tmpl b/torrc_templates/hs7.tmpl
new file mode 100644
index 0000000..7a57c4f
--- /dev/null
+++ b/torrc_templates/hs7.tmpl
@@ -0,0 +1,2 @@
+${include:hs.tmpl}
+HiddenServiceNumIntroductionPoints 7
diff --git a/torrc_templates/hs8.tmpl b/torrc_templates/hs8.tmpl
new file mode 100644
index 0000000..ce3c160
--- /dev/null
+++ b/torrc_templates/hs8.tmpl
@@ -0,0 +1,2 @@
+${include:hs.tmpl}
+HiddenServiceNumIntroductionPoints 8
diff --git a/torrc_templates/hs9.tmpl b/torrc_templates/hs9.tmpl
new file mode 100644
index 0000000..f287b13
--- /dev/null
+++ b/torrc_templates/hs9.tmpl
@@ -0,0 +1,2 @@
+${include:hs.tmpl}
+HiddenServiceNumIntroductionPoints 9