Adds apache and 2600

[emkll]

Status

Ready for review

Fixes #37
Fixes #38

Review Checklist

• Changes to onboarded.txt are accurate
• The file default.rulesets.TIMESTAMP.gz has been updated, extracting that file and inspecting the contents of the JSON file produces the expected rules
• The ruleset has been verified by modifying the HTTPS Everywhere configuration in a Tor Browser instance pointing to Path Prefix: https://raw.githubusercontent.com/freedomofpress/securedrop-https-everywhere-ruleset/$BRANCH_NAME
• index.html has been updated using ./update_index.sh

Post-Deployment Checklist

• Added/modified onion names have been updated in the SecureDrop Directory

[conorsch]

Haven't reviewed yet, post-merge, please monitor for updates to the prod endpoint. They should happen automatically. There may still be a caching delay, but @maeve-fpf (or I) can bust the cache at a moment's notice. I'm more interest in confirming that the automatic updates to the rulesets are deployed upon merge into the main branch here.

[eloquence]

LGTM! Ticked boxes in in PR body.

[conorsch]

please monitor for updates to the prod endpoint

$ curl -s https://securedrop.org/https-everywhere/latest-rulesets-timestamp 
1614864041

Looks good! Matches the changes presented here.

[eloquence]

I'm having difficulty getting Tor Browser to actually fetch the updated rules. Even when Update last checked (in the HTTPSE extension preferences -> Update channels) is just a minute ago, the SecureDrop ruleset is stuck at 2021.2.5. Auto-update is enabled. I've tried in Tails and using a separate Tor Browser instance on Ubuntu.

curling the resources at first glance everything looks good, so I'm not sure what's going wrong here. Could you see if you can reproduce?

[conorsch]

Could indeed reproduce! curl was showing me the latest, but Tor Browser wasn't. That endpoint is heavily cached because it gets a few million hits a day, so I busted the cache manually. After some fussing with Tor Browser where it wouldn't respond to the "Update channel" button in the HTTPSE extension settings, I restarted Tor Browser, and it worked just fine.

So we still need to wire up some automatic cache busting for these changes, but can confirm that the logic was at least deployed. Cache would have expired in ~2h, but we can make it automatic on changes, too.

[eloquence]

Confirmed working for me now as well; updated directory entries with onion names. 🎉