Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17009 from cpennington/cms-login-factory-page

Browse Source 
Convert cms login.html to the require_page pattern in preparation for…
This commit is contained in:
Calen Pennington
2018-01-24 10:19:27 -05:00
committed by GitHub
parent 90bb8af3c6 974f099835
commit 69348d06d7
13 changed files with 96 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/xss_linter.py
View File

@@ -314,7 +314,7 @@ class RuleViolation(object):
found.
"""
pragma_match = re.search(r'xss-lint:\s*disable=([a-zA-Z,-]+)', string)
pragma_match = re.search(r'xss-lint:\s*disable=([a-zA-Z,\- ]+)', string)
if pragma_match is None:
return
if scope_start_string:
@@ -324,7 +324,7 @@ class RuleViolation(object):
return
for disabled_rule in pragma_match.group(1).split(','):
if disabled_rule == self.rule.rule_id:
if disabled_rule.strip() == self.rule.rule_id:
self.is_disabled = True
return
@@ -2383,6 +2383,8 @@ class MakoTemplateLinter(BaseLinter):
</script> | # script tag end
<%static:require_module(_async)?.*?> | # require js script tag start (optionally the _async version)
</%static:require_module(_async)?> | # require js script tag end (optionally the _async version)
<%static:require_page.*?> | # require js script tag start
</%static:require_page> | # require js script tag end
<%static:webpack.*?> | # webpack script tag start
</%static:webpack> | # webpack script tag end
<%static:studiofrontend.*?> | # studiofrontend script tag start