Skip to content

/ ghostery-extension

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

Jump to bottom

GH-1477 Wildcard/Regex Whitelisting #501

Merged
merged 8 commits into from Mar 3, 2020
+588 −15
Merged

GH-1477 Wildcard/Regex Whitelisting #501

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
17381a6
Add regex/wildcard listing with unit tests. Add safe-regex and jest-w…
benstrumeyer Feb 21, 2020
4831bf5
Add more tests. Check if a pageHost has valid url or regex characters
benstrumeyer Feb 25, 2020
359ed37
Update tests for checking if a regex is safe
benstrumeyer Feb 25, 2020
12031ac
Merge branch 'develop' into feature/regex-whitelisting
benstrumeyer Feb 25, 2020
5b14de2
Remove regex functionality and update unit tests
benstrumeyer Feb 27, 2020
7b5445f
Check for truthy instead of not undefined
benstrumeyer Feb 27, 2020
3b81390
Remove bad unit test
benstrumeyer Feb 27, 2020
5e3998b
Fix localhost:3000
benstrumeyer Mar 3, 2020
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev
Loading status checks…

Fix localhost:3000

  • Loading branch information
@benstrumeyer
benstrumeyer committed Mar 3, 2020
commit 5e3998b785f0e74e2fc5908e369610db7506d56f
2 app/panel/components/Settings/TrustAndRestrict.jsx
View file
Open in desktop
@@ -146,7 +146,7 @@ class TrustAndRestrict extends React.Component {

isValidUrlorWildcard(pageHost) {
This conversation was marked as resolved by christophertino

This comment has been minimized.

Sign in to view
@christophertino

christophertino Mar 2, 2020
Member

This fails when trying to add localhost:3000 to the list.

This comment has been minimized.

Sign in to view
@benstrumeyer

benstrumeyer Mar 3, 2020
Author Contributor

Good catch! I fixed the validation regex and added a unit test
// Only allow valid host name characters, ':' for port numbers and '*' for wildcards
const isSafePageHost = /^[a-zA-Z1-9-.:*]*$/;
const isSafePageHost = /^[a-zA-Z0-9-.:*]*$/;
if (!isSafePageHost.test(pageHost)) { return false; }

// Check for valid URL from node-validator
12 app/panel/components/Settings/__tests__/TrustAndRestrict.jsx
View file
Open in desktop
@@ -31,11 +31,17 @@ describe('app/panel/components/Settings/TrustAndRestrict', () => {
describe('app/panel/components/Settings/', () => {
test('isValidUrlorWildcard should return true with url entered', () => {
const wrapper = shallow(<TrustAndRestrict />);
const input = 'ghostery.com';
let input = 'ghostery.com';

const fn = jest.spyOn(wrapper.instance(), 'isValidUrlorWildcard');
let fn = jest.spyOn(wrapper.instance(), 'isValidUrlorWildcard');
when(fn).calledWith(input);
const returnValue = wrapper.instance().isValidUrlorWildcard(input);
let returnValue = wrapper.instance().isValidUrlorWildcard(input);
expect(returnValue).toBe(true);

input = 'localhost:3000';
fn = jest.spyOn(wrapper.instance(), 'isValidUrlorWildcard');
when(fn).calledWith(input);
returnValue = wrapper.instance().isValidUrlorWildcard(input);
expect(returnValue).toBe(true);
});

ProTip! Use n and p to navigate between commits in a pull request.