Require address verification after one successful verification

This commit is contained in:
ShadowNinja
2021-08-05 20:09:49 -04:00
parent abf34fdaef
commit 2bd6b95a05
3 changed files with 31 additions and 1 deletions

View File

@@ -102,6 +102,8 @@ class Server(db.Model):
rollback_enabled = db.Column(db.Boolean, nullable=False)
can_see_far_names = db.Column(db.Boolean, nullable=False)
address_verification_required = db.Column(db.Boolean, nullable=False, default=False)
@staticmethod
def find_from_json(obj):
try:
@@ -194,6 +196,9 @@ class Server(db.Model):
self.last_update = now
if obj["address_verified"]:
self.address_verification_required = True
def as_json(self):
obj = {
"address": self.address,

View File

@@ -92,13 +92,15 @@ def announce():
if addr_info is None:
return f"Failed to resolve server address {obj['address']!r}.", 400
valid = False
if "world_uuid" not in obj:
valid = verify_announce(addr_info, obj["address"], obj["ip"])
if not valid:
if not valid and server and server.address_verification_required:
return render_template("address_verification_failed.txt",
announce_ip=announce_ip,
valid_addresses=[data[4][0] for data in addr_info]), 400
obj["address_verified"] = valid
obj["addr_info"] = addr_info