Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: abp/filters/parser.py

Issue 29793573: Issue 6701 - Implement CSP support in python-abp (Closed) Base URL: https://hg.adblockplus.org/python-abp/
Patch Set: Created May 29, 2018, 4:54 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « .hgignore ('k') | tests/test_parser.py » ('j') | tests/test_parser.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: abp/filters/parser.py
===================================================================
--- a/abp/filters/parser.py
+++ b/abp/filters/parser.py
@@ -100,6 +100,7 @@
COLLAPSE = 'collapse'
SITEKEY = 'sitekey'
DONOTTRACK = 'donottrack'
+ CSP = 'csp'
def _line_type(name, field_names, format_string):
@@ -145,7 +146,12 @@
HEADER_REGEXP = re.compile(r'\[(Adblock(?:\s*Plus\s*[\d\.]+?)?)\]', flags=re.I)
HIDING_FILTER_REGEXP = re.compile(r'^([^/*|@"!]*?)#([@?])?#(.+)$')
FILTER_OPTIONS_REGEXP = re.compile(
- r'\$(~?[\w-]+(?:=[^,\s]+)?(?:,~?[\w-]+(?:=[^,\s]+)?)*)$'
+ r'\$(~?[\w-]+(?:=[^,]+)?(?:,~?[\w-]+(?:=[^,]+)?)*)$'
+)
+
+# Regular expression that matches an invalid Content Security Policy
rhowell 2018/06/07 18:16:55 Removing this, since we aren't currently checking
+INVALID_CSP_REGEXP = re.compile(
+ r'(;|^) ?(base-uri|referrer|report-to|report-uri|upgrade-insecure-requests)\b'
)
« no previous file with comments | « .hgignore ('k') | tests/test_parser.py » ('j') | tests/test_parser.py » ('J')

Powered by Google App Engine
This is Rietveld