Skip to content

Fix and rename the host name validators #3855

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

Open
DL6ER wants to merge 2 commits into
base: development
Choose a base branch
from
+19 −13
Open

Fix and rename the host name validators #3855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e92e6b8
Fix and rename `validateHostname()` -> `validateClientPattern()`
DL6ER Aug 22, 2026
0c3435d
Rename `validateHostnameStrict()` -> `validateHostname()`
DL6ER Aug 22, 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
6 changes: 3 additions & 3 deletions scripts/js/groups-clients.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,17 +360,17 @@ function addClient() {
// - IPv4 address (with and without CIDR)
// - IPv6 address (with and without CIDR)
// - MAC address (in the form AA:BB:CC:DD:EE:FF)
// - host name (arbitrary form, we're only checking against some reserved characters)
// - host name, or an interface prefaced with a colon (like :eth0)
for (const [index, ip] of ips.entries()) {
if (utils.validateIPv4CIDR(ip) || utils.validateIPv6CIDR(ip) || utils.validateMAC(ip)) {
// Convert input to upper case (important for MAC addresses)
ips[index] = ip.toUpperCase();
} else if (!utils.validateHostname(ip)) {
} else if (!utils.validateClientPattern(ip)) {
utils.showAlert(
"warning",
"",
"Warning",
"Input is neither a valid IP or MAC address nor a valid host name!"
"Input is neither a valid IP or MAC address nor a valid host name or interface!"
);
return;
}
Expand Down
6 changes: 3 additions & 3 deletions scripts/js/settings-dhcp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ $(document).on("click", ".save-static-row", function () {
// Validate MAC and IP before saving
const macValid = !hwaddr || utils.validateMAC(hwaddr);
const ipValid = !ipaddr || utils.validateIPv4(ipaddr) || utils.validateIPv6Brackets(ipaddr);
const nameValid = !hostname || utils.validateHostnameStrict(hostname);
const nameValid = !hostname || utils.validateHostname(hostname);
if (!macValid || !ipValid || !nameValid) {
utils.showAlert(
"error",
Expand Down Expand Up @@ -536,7 +536,7 @@ function renderStaticDHCPTable() {
}

const tdHostname = $(cell).addClass("static-hostname").text(parsed.hostname);
if (parsed.hostname && !utils.validateHostnameStrict(parsed.hostname)) {
if (parsed.hostname && !utils.validateHostname(parsed.hostname)) {
tdHostname.addClass("table-danger");
}

Expand Down Expand Up @@ -658,7 +658,7 @@ $(document).on("input blur paste", "#StaticDHCPTable td.static-ipaddr", function

$(document).on("input blur paste", "#StaticDHCPTable td.static-hostname", function () {
const val = $(this).text().trim();
if (val && !utils.validateHostnameStrict(val)) {
if (val && !utils.validateHostname(val)) {
$(this).addClass("table-danger");
$(this).attr("title", "Invalid hostname: only letters, digits, hyphens, and dots allowed");
} else {
Expand Down
2 changes: 1 addition & 1 deletion scripts/js/settings-dns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ $(document).on("input blur paste", ".revserver-ip", function () {
});
$(document).on("input blur paste", ".revserver-domain", function () {
const val = $(this).text().trim();
if (val && !utils.validateHostnameStrict(val)) {
if (val && !utils.validateHostname(val)) {
$(this).addClass("table-danger");
$(this).attr("title", "Invalid domain");
$(this).siblings(".actions").find(".saveRevServers").prop("disabled", true);
Expand Down
18 changes: 12 additions & 6 deletions scripts/js/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,13 +357,19 @@ function validateMAC(mac) {
return macvalidator.test(mac.trim());
}

function validateHostname(name) {
const namevalidator = /[^<>;"]/u;
return namevalidator.test(name.trim());
function validateClientPattern(name) {
// A client that is neither an IP/subnet nor a MAC address can only be a host
// name or an interface (prefaced with a colon). FTL matches both verbatim and
// only ever records names built from these characters, so anything else can
// never describe a client.
const clientValidator = /^:?[\w.-]+$/u;
return clientValidator.test(name.trim());
}

function validateHostnameStrict(name) {
// Hostnames must not contain spaces, commas, or characters invalid in DNS names
function validateHostname(name) {
// These end up in comma-separated dnsmasq config lines, so a space or a comma
// is never acceptable. The rest follows a host name: dot-separated labels of
// letters, digits and inner hyphens.
const hostnameValidator =
/^[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?)*$/u;
return hostnameValidator.test(name.trim());
Expand Down Expand Up @@ -873,8 +879,8 @@ globalThis.utils = (function () {
stateSaveCallback,
stateLoadCallback,
validateMAC,
validateClientPattern,
validateHostname,
validateHostnameStrict,
addFromQueryLog,
addTD,
toPercent,
Expand Down