|
|
|
@ -1,4 +1,5 @@
|
|
|
|
|
import requests
|
|
|
|
|
import re
|
|
|
|
|
import os
|
|
|
|
|
import datetime
|
|
|
|
|
import json
|
|
|
|
@ -29,6 +30,8 @@ status = ""
|
|
|
|
|
#print("done diffing " + datetime.datetime.now().strftime("%H-%M-%S"))
|
|
|
|
|
|
|
|
|
|
#print("starting diff")
|
|
|
|
|
newVersions = 0
|
|
|
|
|
|
|
|
|
|
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)):
|
|
|
|
|
#added_relays += new_relay[1]["fingerprint"] + "\n"
|
|
|
|
@ -38,6 +41,8 @@ for new_relay in relays:
|
|
|
|
|
#print("New relay: \"" + new_relay[1]["nickname"] + "\", fingerpint: " + new_relay[1]["fingerprint"] + ", potential exit: " + exit + ", effective family size: " + str(len(new_relay[1]["effective_family"])) + ", first seen: " + new_relay[1]["first_seen"] + "\n")
|
|
|
|
|
status += "New relay: \"" + new_relay["nickname"] + "\", fingerprint: " + new_relay["fingerprint"] + ", potential exit: " + exit + ", effective family size: " + str(len(new_relay["effective_family"])-1) + "\n"
|
|
|
|
|
|
|
|
|
|
if re.search("0.3.5.17|0.4.5.11", new_relay["platform"], re.IGNORECASE):
|
|
|
|
|
newVersions += 1
|
|
|
|
|
#if jd.delete in diff1:
|
|
|
|
|
# for deleted_relay in diff1[jd.delete]:
|
|
|
|
|
# #deleted_relays += deleted_relay[1]["fingerprint"] + "\n"
|
|
|
|
@ -66,7 +71,7 @@ for new_relay in relays:
|
|
|
|
|
# output.write(r.text)
|
|
|
|
|
|
|
|
|
|
if status:
|
|
|
|
|
email += status
|
|
|
|
|
email += status + "\nTotal new versions: " + str(newVersions) + "\n"
|
|
|
|
|
try:
|
|
|
|
|
smtp = smtplib.SMTP('localhost')
|
|
|
|
|
smtp.sendmail('relaystatus@encryptionin.space', ['relaywatch@lists.encryptionin.space'], email)
|
|
|
|
|