Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Allow unblocking of scripts from urls containing ip addresses #7378

Merged
merged 1 commit into from
Feb 28, 2017
Merged

Allow unblocking of scripts from urls containing ip addresses #7378

merged 1 commit into from
Feb 28, 2017

Conversation

evq
Copy link
Member

@evq evq commented Feb 25, 2017 •
edited
Loading

Auditors: @diracdeltas

Fixes #2988

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).

Test Plan:

  1. Create a temporary folder with index.html containing:
<html>
<p> welcome 2 mi web sight </p>
<p id="sneaky" style="display:none"> y u allow js </p>
<script>
document.getElementById('sneaky').style.display='block';
</script>
</html>
  1. Run python -m SimpleHTTPServer inside the temporary folder.
  2. Open Brave, go to Preferences and disable scripts globally.
  3. Open the url http://127.0.0.1:8000.
  4. Verify unblocking the script adds the additional text y u allow js.

I also added automated tests to the noscript info tests which can be run via:

npm run test -- --grep="^noscript"

@evq
Copy link
Member Author

evq commented Feb 25, 2017

Looks like the ipv6 test failed on Travis, seems they pulled ipv6 support some time back. Two options:

  1. I can delete the ipv6 test
  2. I can programmatically skip execution of the ipv6 test based on the env var TRAVIS which is set to true when running on Travis

@diracdeltas
Copy link
Member

I can programmatically skip execution of the ipv6 test based on the env var TRAVIS which is set to true when running on Travis

sgtm

@diracdeltas diracdeltas self-assigned this Feb 27, 2017
@diracdeltas
Copy link
Member

lgtm, plz rebase -i it

@evq
Copy link
Member Author

evq commented Feb 27, 2017

👌

@diracdeltas diracdeltas added this to the 0.13.5 milestone Feb 28, 2017
@diracdeltas diracdeltas merged commit 0dc505a into brave:master Feb 28, 2017
@DivineOmega DivineOmega mentioned this pull request Mar 1, 2017
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@diracdeltas diracdeltas diracdeltas approved these changes

Assignees

@diracdeltas diracdeltas

Labels
feature/shields QA/checked-macOS
Projects
None yet
Milestone
0.13.5
Development

Successfully merging this pull request may close these issues.
4 participants
@evq @diracdeltas @alexwykoff @luixxiul