Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backports addition of Forbidden Stories #58

Merged
merged 4 commits into from
Jun 30, 2021

Conversation

zenmonkeykstop
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop commented Jun 15, 2021

Status

Ready for review:

  • add Forbidden Stories to ruleset
  • update Torstar address
  • include cherry-picked changes to nginx config from Deal with // in URLs #59

Signed with 2021 key, currently only supported by TBB Alpha

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 10.5+ 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

@maeve-fpf
Copy link
Contributor

nginx changes look good! If it's at all helpful, I rebased nginx-fixes on 060948a (Forbidden Stories), so if someone wants to rebase on the latter they can drop my commits and merge them back in without the [TEST] junk in the commit message.

@zenmonkeykstop zenmonkeykstop force-pushed the backport-onboarded-changes branch from 43602e0 to 8153b38 Compare June 30, 2021 18:22
@zenmonkeykstop
Copy link
Contributor Author

Tried this out in the latest alpha, rule changes show up - if @eloquence or someone else can take a look it would be good to get it merged on the off-chance the alpha period goes really quickly :)

@eloquence
Copy link
Member

I've got an alpha ready, will give it a spin.

@eloquence eloquence self-assigned this Jun 30, 2021
@eloquence
Copy link
Member

eloquence commented Jun 30, 2021

Starting with the GitHub URL, of course I'm hitting the issue again where all onion names break after I change the Path Prefix - though "rulesets version" correctly set to 2021.6.30

@eloquence
Copy link
Member

OK, after troubleshooting with Kev, determined that the trick appears to be to wait a fairly significant time (up to ~1 minute) after adding the Path Prefix before trying an onion name again - the resolution of the ruleset date does not indicate that it's ready to use.

Copy link
Member

@eloquence eloquence left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All looks good once it actually loaded.

@eloquence eloquence merged commit 2d05048 into key-rotation-2021 Jun 30, 2021
@legoktm legoktm deleted the backport-onboarded-changes branch June 10, 2024 23:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants