hackerncoder/relay_status
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add contact parsing test

Browse source
This commit is contained in:
HackerNCoder 2021-12-26 22:07:19 +00:00
parent 9cf29db5a3
commit 334680d8b8
No known key found for this signature in database
GPG key ID: 569FFF33FF802E16
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
relaystatus.py
View file

@ -19,12 +19,17 @@ for new_relay in relays:
if datetime.datetime.strptime(new_relay["first_seen"], "%Y-%m-%d %H:%M:%S") > (datetime.datetime.utcnow() - datetime.timedelta(hours=1)): if datetime.datetime.strptime(new_relay["first_seen"], "%Y-%m-%d %H:%M:%S") > (datetime.datetime.utcnow() - datetime.timedelta(hours=1)):
exit = "no" exit = "no"
eol = "no" eol = "no"
contact = ""
if "contact" in relay:
test = re.search("([a-zA-Z0-9_.+-]+(\[\]|\@|at)[a-zA-Z0-9-.]+\.[a-zA-Z0-9-.]+)", relay["contact"], re.IGNORECASE)
if test:
contact = ", contact: " + test.group(1)
if not re.search("0.3.5|0.4.5|0.4.6|0.4.7", new_relay["platform"], re.IGNORECASE): if not re.search("0.3.5|0.4.5|0.4.6|0.4.7", new_relay["platform"], re.IGNORECASE):
eol = "yes" eol = "yes"
if new_relay["exit_policy"][0] != "reject *:*": if new_relay["exit_policy"][0] != "reject *:*":
exit = "yes" exit = "yes"
exitStatus += "\"" + new_relay["nickname"] + "\", fingerprint: " + new_relay["fingerprint"] + ", EOL: " + eol + ", effective family: " + str(len(new_relay["effective_family"])-1) + "; https://metrics.torproject.org/rs.html#search/" + new_relay["fingerprint"] + "\n" exitStatus += "\"" + new_relay["nickname"] + "\", fingerprint: " + new_relay["fingerprint"] + ", EOL: " + eol + ", effective family: " + str(len(new_relay["effective_family"])-1) + "; https://metrics.torproject.org/rs.html#search/" + new_relay["fingerprint"] + "\n"
relayStatus += "\"" + new_relay["nickname"] + "\", fingerprint: " + new_relay["fingerprint"] + ", exit: " + exit + ", EOL: " + eol + ", effective family: " + str(len(new_relay["effective_family"])-1) + "; https://metrics.torproject.org/rs.html#search/" + new_relay["fingerprint"] + "\n" relayStatus += "\"" + new_relay["nickname"] + "\", fingerprint: " + new_relay["fingerprint"] + ", exit: " + exit + ", EOL: " + eol + contact + ", effective family: " + str(len(new_relay["effective_family"])-1) + "; https://metrics.torproject.org/rs.html#search/" + new_relay["fingerprint"] + "\n"
if relayStatus: if relayStatus:
relayWatchEmail += relayStatus relayWatchEmail += relayStatus