Skip to content

Sanitize device fields and prevent crash with numeric hostnames #1089

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
jokob-sk merged 2 commits into from
Jun 20, 2025
Merged

Sanitize device fields and prevent crash with numeric hostnames #1089

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a4198c
Sanitize device fields and prevent crash with numeric hostnames
slammingprogramming Jun 20, 2025
31806c7
Fixed, Again
slammingprogramming Jun 20, 2025
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: 5 additions & 5 deletions server/scan/device_handling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,9 +674,9 @@ def guess_icon(vendor, mac, ip, name, default):
mylog('debug', [f"[guess_icon] Guessing icon for (vendor|mac|ip|name): ('{vendor}'|'{mac}'|{ip}|{name})"])

result = default
mac = mac.upper()
vendor = vendor.lower() if vendor else "unknown"
name = name.lower() if name else "(unknown)"
mac = str(mac).upper() if mac else "00:00:00:00:00:00"
vendor = str(vendor).lower() if vendor else "unknown"
name = str(name).lower() if name else "(unknown)"

# Guess icon based on vendor
if any(brand in vendor for brand in {"samsung", "motorola"}):
Expand Down Expand Up @@ -732,8 +732,8 @@ def guess_icon(vendor, mac, ip, name, default):
# Guess device type
def guess_type(vendor, mac, ip, name, default):
result = default
mac = mac.upper()
vendor = vendor.lower() if vendor else "unknown"
mac = str(mac).upper() if mac else "00:00:00:00:00:00"
vendor = str(vendor).lower() if vendor else "unknown"
name = str(name).lower() if name else "(unknown)"

# Guess icon based on vendor
Expand Down