Skip to content

Reject wildcards and malformed addresses as direct_ip #2619

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
niklaswa merged 1 commit into from
Oct 11, 2026
Merged

Reject wildcards and malformed addresses as direct_ip #2619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file added .github/actions/validate-manifest/__pycache__/validate.cpython-314.pyc
View file
Open in desktop
Binary file not shown.
25 changes: 21 additions & 4 deletions .github/actions/validate-manifest/validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
SERVER_NAME = re.compile(r'^[a-z0-9]+$')
GAMEMODE_KEY = re.compile(r'^[a-z0-9_-]+$')
YOUTUBE_ID = re.compile(r'^[A-Za-z0-9_-]{11}$')
# A domain or IPv4 address, optionally with a port. Case is checked separately
HOSTNAME = re.compile(r'^(?=[^:]{1,253}(?::\d{1,5})?$)(?:(?!-)[a-z0-9-]{1,63}(?<!-)\.)+[a-z0-9-]{1,63}(?::\d{1,5})?$',
re.IGNORECASE)

SESSION = requests.Session()
SESSION.headers['User-Agent'] = ('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 '
Expand Down Expand Up @@ -152,15 +155,29 @@ def validate_manifest(path, is_new, report):
report.error('- `server_name` may only contain lowercase letters and digits (`server_name`)')
if data['direct_ip'] != data['direct_ip'].lower():
report.error(f'- Please use lowercase for the direct IP: `{data["direct_ip"].lower()}` (`direct_ip`)')
valid_ip = bool(HOSTNAME.match(data['direct_ip']))
if not valid_ip and data['direct_ip'] not in ['', '-']:
if '%' in data['direct_ip'] or '*' in data['direct_ip']:
report.error('- The direct IP has to be the address players join, e.g. `play.example.net`. '
'Wildcards belong into `server_wildcards` (`direct_ip`)')
else:
report.error('- The direct IP has to be a plain address like `play.example.net`, '
'without `https://`, paths or spaces (`direct_ip`)')

wildcards = data.get('server_wildcards', [])
for wildcard in wildcards:
wildcards = []
for wildcard in data.get('server_wildcards', []):
if not wildcard.startswith('%.'):
report.error('- Invalid wildcard entry. Each entry must start with **%.**. Further information here: '
'https://en.wikipedia.org/wiki/Wildcard_DNS_record (`server_wildcards`)')
elif not HOSTNAME.match(wildcard[2:]):
report.error(f'- Invalid wildcard entry `{wildcard}`, it has to be `%.` followed by a domain '
'like `%.example.net` (`server_wildcards`)')
else:
wildcards.append(wildcard)

status = check_server(data['direct_ip'], report)
if wildcards and all(wildcard.startswith('%.') for wildcard in wildcards):
# An invalid address would only produce a misleading offline note
status = check_server(data['direct_ip'], report) if valid_ip else None
if valid_ip and wildcards:
check_wildcards(data['direct_ip'], wildcards, status, report)

if 'social' in data:
Expand Down
2 changes: 1 addition & 1 deletion docs/Manifest.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ them.
|------------------------------------|------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
| `server_name`* | Short server name (must match the directory name!) | `"laby"` |
| `nice_name`* | Nice server name | `"LabyMod"` |
| `direct_ip`* | Direct Minecraft server ip | `"play.labymod.net"` |
| `direct_ip`* | Address players join, without wildcards (they belong into `server_wildcards`) | `"play.labymod.net"` |
| `server_wildcards` | Wildcards the user can use | `["%.laby.net", "%.labymod.net"]` |
| `supported_languages` | Supported languages on your server - Format: ISO 639-1 | `["de", "en"]` |
| `social.web` | [Website **URL**](Usages.md#social) | `"https://labymod.net"` |
Expand Down
Loading