Switch main branch to use 2021 signing key

zenmonkeykstop commented 3 years ago

Status

Ready for review

This PR pushes the historical changes in the key-rotation-2021 branch to main, updating the current ruleset to the latest one signed with the 2021 release key.

Review Checklist

[ ] The ruleset has been verified by modifying the HTTPS Everywhere configuration in a Tor Browser 10.5+ instance pointing to Path Prefix: https://raw.githubusercontent.com/freedomofpress/securedrop-https-everywhere-ruleset/$BRANCH_NAME
[ ] nginx config is correct ( there's a comment about removing a line but I think it should actually stay, as the base URL has changed)

Post-Deployment Checklist

[ ] Update httpse CI to populate the 2021 ruleset from the main branch, instead of from key-rotation-2021.

maeve-fpf commented 3 years ago

LGTM, just blocking on https://github.com/freedomofpress/k8s-configs/pull/205 being merged.

I don't mind, but If it bothers you at all one of my commits is duplicated with [TEST] in the commit message (probably from being cherry-picked) and it could be rebased out.

zenmonkeykstop commented 3 years ago

I'm fine with it, given the nature of the repo I'd rather preserve the history intact.

conorsch commented 3 years ago

Tagging myself in on review here. Will coordinate actual merge (and therefore deploy) with @maeve-fpf ahead of time. First, I'll review the changes locally.

conorsch commented 3 years ago

Comments addressed, @maeve-fpf. I'm going to push this to staging, as you advised, and if no problems, will proceed with prod deploy later today.

freedomofpress / securedrop-https-everywhere-ruleset