Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Amend check rules python for Fetch Test #18865

Merged
zoracon merged 5 commits into from
Feb 20, 2020
Merged

Amend check rules python for Fetch Test #18865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d38b267
Amend Rule Checker
zoracon Feb 7, 2020
c1c5ceb
Amend message for disabling rulesets in both cases
zoracon Feb 7, 2020
25da34f
Change variable name to be more consistent
zoracon Feb 7, 2020
b1f3b53
Amend spacing
zoracon Feb 7, 2020
dbedc1c
Adjust timestamp
zoracon Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test/rules/disable-broken-rulesets.checker.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ read_timeout = 30
redirect_depth = 10
threads = 20
fetch_in_subprocess = false
ssl_version = TLSv1_2

[log]
logfile = -
Expand Down
10 changes: 7 additions & 3 deletions test/rules/src/https_everywhere_checker/check_rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
import urllib.parse
from rules import Ruleset
from rule_trie import RuleTrie
from datetime import datetime

timestamp = datetime.now().replace(microsecond=0)

def convertLoglevel(levelString):
"""Converts string 'debug', 'info', etc. into corresponding
Expand Down Expand Up @@ -143,7 +145,7 @@ def fetchUrl(self, plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, rul
except Exception as e:
errno, message = e.args
if errno == 6:
message = "Fetch error: {} => {}: {}".format(
message = "Time: {}\n Fetch error: {} => {}: {}".format(timestamp,
plainUrl, transformedUrl, e)
self.queue_result("error", "fetch-error {}".format(e),
ruleFname, plainUrl, https_url=transformedUrl)
Expand Down Expand Up @@ -226,11 +228,13 @@ def disableRuleset(ruleset, problemRules, urlCount):
# Go ahead and disable rulset if all targets are problematic
if urlCount == len(problemRules):
logging.info("Disabling ruleset {}".format(ruleset.filename))
disableMessage = "Entire ruleset disabled at {}\n".format(timestamp)
contents = re.sub("(<ruleset [^>]*)>",
"\\1 default_off=\"failed ruleset test\">", contents);
# If not all targets, just the target
else:
for rule in rules:
disableMessage = "The following targets have been disabled at {}:\n".format(timestamp)
host = urllib.parse.urlparse(rule)
logging.info("Disabling target {}".format(host.netloc))
contents = re.sub('<[ \n]*target[ \n]+host[ \n]*=[ \n]*"{}"[ \n]*\/?[ \n]*>'.format(host.netloc),
Expand All @@ -245,9 +249,9 @@ def disableRuleset(ruleset, problemRules, urlCount):
contents = "<!--\n-->\n" + contents
problemStatement = ("""
<!--
Disabled by https-everywhere-checker because:
{}
""".format("\n".join(problems)))
{}
""".format(disableMessage, "\n".join(problems)))
contents = re.sub("^<!--", problemStatement, contents)
with open(ruleset.filename, "w") as f:
f.write(contents)
Expand Down