Adds ruleset for www.guardian.com SecureDrop instance #7
Conversation
Fixes #6 http[s]?://www.theguardian.securedrop.tor.onion points to http://33y6fjyhs3phzfjj.onion
| @@ -0,0 +1,5 @@ | |||
| <ruleset name="The Guardian"> | |||
| <target host="www.theguardian.securedrop.tor.onion" /> | |||
There was a problem hiding this comment.
Ah.. I'm realizing we have a shortcoming in the sddir.py script and will need to edit it. Basically I wrote the sddir.py script back when we were merely stripping the original TLD and adding the pseudo-TLD, but now we're letting organizations choose a human-readable name (providing it will not collide with another news organization or cause confusion).
As such, I think we need to store in version control both (i) the landing page domain (in this case www.theguardian.com as you correctly have in onboarded.txt) such that we can join with the relevant SD directory API entry, and (ii) the desired rule, since we'll want to use that for the target host and rule from fields when writing this rule in rulesets/. I'm thinking maybe something like making onboarded.txt CSV with fields primary_domain, sd_rewrite_url (one row per organization) and then modifying the sddir.py script to use it. What do you think @kushaldas? Feel free to deviate from this if you have another idea.
Now onboarded.txt is a proper CSV file, with two fields: primary_domain,sd_rewrite_rule The file also has the updated entry for The Gurdian. This enables us to allow the organizations to request the human readable name (in the sd_rewrite_rule), and add that as the ruleset.
|
@redshiftzero Pushed the changes. |
There was a problem hiding this comment.
Thanks @kushaldas, your changes look good and I believe the previous reviewer's comments have been addressed.
I have appended 48bb8bb to include the rule merge step as well as the rule signing process described the the README. I have also tested the ruleset by locally modifying my configuration to use https://raw.githubusercontent.com/freedomofpress/securedrop-https-everywhere-ruleset/guardian/ as the Path Prefix, and can confirm both new and existing rules are applied correctly. This is now good to merge/deploy.
Fixes #6
http[s]?://www.theguardian.securedrop.tor.onion points to
http://33y6fjyhs3phzfjj.onion