Merge pull request #223 from freedomofpress/abc-no-subdomain

Add second onion name for abc.au
freedomofpress · Jan 31, 2025 · 7d96505 · 7d96505
2 parents 83a8831 + e62b0e1
commit 7d96505
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 7 deletions.
diff --git a/default.rulesets.1738357961.gz b/default.rulesets.1738357961.gz
diff --git a/index.html b/index.html
@@ -1,5 +1,5 @@
 <html>
-    <a href='rulesets-signature.1737649904.sha256'>rulesets-signature.1737649904.sha256</a><br>
+    <a href='rulesets-signature.1738357961.sha256'>rulesets-signature.1738357961.sha256</a><br>
     <a href='latest-rulesets-timestamp'>latest-rulesets-timestamp</a><br>
-    <a href='default.rulesets.1737649904.gz'>default.rulesets.1737649904.gz</a><br>
+    <a href='default.rulesets.1738357961.gz'>default.rulesets.1738357961.gz</a><br>
 </html>
diff --git a/latest-rulesets-timestamp b/latest-rulesets-timestamp
@@ -1 +1 @@
-1737649904
+1738357961
diff --git a/onboarded.txt b/onboarded.txt
@@ -2,6 +2,7 @@ primary_domain,sd_rewrite_rule,is_https
 theintercept.com,theintercept.securedrop.tor.onion
 www.theguardian.com,theguardian.securedrop.tor.onion
 www.abc.net.au,abc.au.securedrop.tor.onion
+www.abc.net.au,abcau.securedrop.tor.onion
 espenandersen.no,espena.securedrop.tor.onion
 www.nytimes.com,nytimes.securedrop.tor.onion,yes
 techcrunch.com,techcrunch.securedrop.tor.onion

diff --git a/rulesets-signature.1738357961.sha256 b/rulesets-signature.1738357961.sha256
diff --git a/rulesets/abc-legacy-securedrop-ruleset.xml b/rulesets/abc-legacy-securedrop-ruleset.xml
@@ -0,0 +1,5 @@
+<ruleset name="ABC legacy">
+	<target host="abc.au.securedrop.tor.onion" />
+	<rule from="^http[s]?://abc.au.securedrop.tor.onion"
+    to="http://dqa4zahticcobfq5rmmmbewbdtyiznbl75hu23k4i37y7yfoosrh7mqd.onion" />
+</ruleset>
diff --git a/rulesets/abc-securedrop-ruleset.xml b/rulesets/abc-securedrop-ruleset.xml
@@ -1,5 +1,5 @@
 <ruleset name="ABC">
-	<target host="abc.au.securedrop.tor.onion" />
-	<rule from="^http[s]?://abc.au.securedrop.tor.onion"
+	<target host="abcau.securedrop.tor.onion" />
+	<rule from="^http[s]?://abcau.securedrop.tor.onion"
     to="http://dqa4zahticcobfq5rmmmbewbdtyiznbl75hu23k4i37y7yfoosrh7mqd.onion" />
 </ruleset>
diff --git a/rulesets/default.rulesets b/rulesets/default.rulesets
diff --git a/sddir.py b/sddir.py
@@ -95,10 +95,16 @@ def write_custom_ruleset(
             onion_addr=onion_addr,
         )
     )
+    # Temporary workaround to allow abc.au to have two domains
+    # while we migrate from abc.au to abcau (see #219, #222).
+    if sd_rewrite_rule == "abc.au.securedrop.tor.onion":
+        slug = "abc-legacy"
+    else:
+        slug = directory_entry["slug"]
 
     RULESET_OUTPUT = "securedrop-ruleset.xml"
     with open(
-        os.path.join(RULESET_DIR, directory_entry["slug"] + "-" + RULESET_OUTPUT),
+        os.path.join(RULESET_DIR, slug + "-" + RULESET_OUTPUT),
         "w",
     ) as f:
         f.write(ruleset)