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

Revert "Add instructions for working around NoScript XSS upload problem" #4319

Merged
merged 1 commit into from
Apr 9, 2019

Conversation

eloquence
Copy link
Member

@eloquence eloquence commented Apr 3, 2019

Resolves #4160.

This reverts commit b355308 (and the dependent commit babc2f5).

Status

Ready for review

Test plan

  1. Build updated staging environment
  2. Connect to source interface using Tor browser version 8.0.8 or greater
  3. Verify that "Scan uploads for potential cross-site requests" option (under "Advanced" NoScript settings) is not set. It should be unset by default.
  4. Verify that NoScript instructions implemented in Remove NoScript workaround instructions from Source Interface #4160 no longer appear on source interface
  5. Upload a test file of at least 75MB size repeatedly (I recommend a total of 5 times)

Expected result:

  • All uploads complete successfully.

Deployment

No special considerations. Tor browser includes the required fix as of version 8.0.8, which was also shipped with Tails 3.13.1, and which should auto-updated on most systems.

Checklist

  • Linting (make ci-lint) and tests (make -C securedrop test) pass in the development container

@codecov-io
Copy link

codecov-io commented Apr 3, 2019

Codecov Report

Merging #4319 into develop will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #4319      +/-   ##
===========================================
- Coverage    84.63%   84.62%   -0.02%     
===========================================
  Files           43       43              
  Lines         2785     2783       -2     
  Branches       304      304              
===========================================
- Hits          2357     2355       -2     
  Misses         359      359              
  Partials        69       69
Impacted Files Coverage Δ
securedrop/securedrop/source_app/info.py 100% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2068b84...9fbc098. Read the comment docs.

@eloquence eloquence marked this pull request as ready for review April 3, 2019 04:10
Copy link
Contributor

@rmol rmol left a comment

Choose a reason for hiding this comment

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

I've tested this by uploading a 100MB file five times with no failures. The only problem I see is that the revert somehow picked up the flexbox SASS module, which is used in other places. That should be kept.

@@ -71,10 +71,6 @@
@import "modules/grid-item"
// Option - might be unused. Delete?
@import "modules/option"
// Flexbox - support for flexbox layouts
@import "modules/flexbox"
Copy link
Contributor

Choose a reason for hiding this comment

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

The flexbox module is used elsewhere, so needs to be kept. Not sure how it got swept up in the revert, as it was added in 4ae0c3f#diff-e95835e98013102be1f7b1c88d5505e0.

Copy link
Member Author

Choose a reason for hiding this comment

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

If I remember correctly, the revert triggered a conflict; I must have accidentally removed it on resolution. Will amend.

@rmol
Copy link
Contributor

rmol commented Apr 4, 2019

Looks good. I checked an instance of content that was misaligned without the flexbox module and it's fine now.

Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

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

Went through the test plan as described:

  • Build updated staging environment

  • Connect to source interface using Tor browser version 8.0.8 or greater

  • Verify that "Scan uploads for potential cross-site requests" option (under "Advanced" NoScript settings) is not set. It should be unset by default.

  • Verify that NoScript instructions implemented in Remove NoScript workaround instructions from Source Interface #4160 no longer appear on source interface

  • Upload a test file of at least 75MB size repeatedly - I tried with files ranging from 76 to 120MB

  • make upgrade-start && make upgrade-test-local results in reverted NoScript instruction changes.
    One minor nit inline, but shouldn't block merge. Based on this and @rmol 's review above, LGTM


<p>{{ gettext('Repeat steps 1-3 from above and re-check the setting. The setting has no effect while your Security Slider is set to "Safest", but we recommend enabling it during normal Tor usage.') }}</p>

<p><a href="/lookup">« {{ gettext('Back to submission page') }}</a></p>
Copy link
Contributor

Choose a reason for hiding this comment

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

This also reverts babc2f5 which explains the difference in diff line counts

@emkll emkll merged commit 49400d0 into develop Apr 9, 2019
@emkll emkll deleted the revert-noscript branch April 9, 2019 19:52
@emkll emkll mentioned this pull request Apr 18, 2019
16 tasks
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.

Remove NoScript workaround instructions from Source Interface
4 participants