Skip to content

Disallow Domains in Multiple Mappings & IP Addresses #4529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThatKawaiiSam merged 6 commits into from
Jan 4, 2026
Merged

Disallow Domains in Multiple Mappings & IP Addresses #4529

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
52d561d
feat: disallow domains in multiple mappings
wi Jan 1, 2026
164c87f
feat: error for invalid domains
wi Jan 1, 2026
059358d
chore: update msg
wi Jan 1, 2026
0064650
chore: server fixes!!!
Anakinnnnn Jan 4, 2026
bd4f5cb
chore: last fix
Anakinnnnn Jan 4, 2026
87180f9
chore: actual last fix
Anakinnnnn Jan 4, 2026
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
10 changes: 10 additions & 0 deletions .scripts/validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ def check_metadata(args: argparse.Namespace) -> defaultdict[str, list[str]]:
messages[server_id] = [f"{server_id} is being edited but is in the inactive file!"]

# Looping over each server folder
seen_domains = defaultdict(set)
for root, _, _ in os.walk(args.servers_dir):
server_id = root.split(os.path.sep)[-1]
if (
Expand All @@ -241,6 +242,8 @@ def check_metadata(args: argparse.Namespace) -> defaultdict[str, list[str]]:
primary_domain = get_tld(server.get("primaryAddress", ""), as_object=True, fail_silently=True, fix_protocol=True)
if primary_domain is not None and primary_domain.fld not in server["addresses"]:
messages[server_id].append(f"The primary address' domain ({primary_domain.fld}) is not in the addresses list. Or the primary address is not a valid domain.")
elif primary_domain is None:
messages[server_id].append(f"The primary address `{server.get('primaryAddress', '')}` is not a valid domain. Please review the [documentation](https://lunarclient.dev/server-mappings/adding-servers/metadata).")


all_versions = get_all_versions(server["minecraftVersions"])
Expand All @@ -256,6 +259,13 @@ def check_metadata(args: argparse.Namespace) -> defaultdict[str, list[str]]:
domain = get_tld(address, as_object=True, fail_silently=True, fix_protocol=True)
if domain is not None and domain.subdomain:
messages[server_id].append(f"{address} does not follow the [documentation](https://lunarclient.dev/server-mappings/adding-servers/metadata). Please make sure the address is a valid domain, and does not have a subdomain.")

if domain is not None and domain.fld in seen_domains:
messages[server_id].append(f"The domain {domain.fld} is also present in {', '.join(map(lambda s: f"`{s}`", seen_domains[domain.fld]))}. Please ensure each server has a unique domain(s).")
elif domain is not None:
seen_domains[domain.fld].add(server_id)
else:
messages[server_id].append(f"{address} is not a valid domain. Please review the [documentation](https://lunarclient.dev/server-mappings/adding-servers/metadata).")

if primary_region := server.get("primaryRegion"):
if not (regions := server.get("regions")) or primary_region not in regions:
Expand Down
Loading