Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-20 02:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Accept tabs inside dns.hosts and strip possible trailing comments

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2025-02-22 11:16:04 +01:00
parent 37d36d5815
commit 1f6ebdbea3
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/js/settings-dns-records.js
View File

@@ -9,26 +9,34 @@
function hostsDomain(data) { function hostsDomain(data) {
// Split record in format IP NAME1 [NAME2 [NAME3 [NAME...]]] // Split record in format IP NAME1 [NAME2 [NAME3 [NAME...]]]
const name = data.substring(data.indexOf(" ") + 1); // We split both on spaces and tabs to support both formats
// Also, we remove any comments after the name(s)
const name = data
.split(/[\t ]+/)
.slice(1)
.join(" ")
.split("#")[0]
.trim();
return name; return name;
} }
function hostsIP(data) { function hostsIP(data) {
// Split record in format IP NAME1 [NAME2 [NAME3 [NAME...]]] // Split record in format IP NAME1 [NAME2 [NAME3 [NAME...]]]
const ip = data.substring(0, data.indexOf(" ")); // We split both on spaces and tabs to support both formats
const ip = data.split(/[\t ]+/)[0].trim();
return ip; return ip;
} }
function CNAMEdomain(data) { function CNAMEdomain(data) {
// Split record in format <cname>,<target>[,<TTL>] // Split record in format <cname>,<target>[,<TTL>]
const CNAMEarr = data.split(","); const CNAMEarr = data.split(",");
return CNAMEarr[0]; return CNAMEarr[0].trim();
} }
function CNAMEtarget(data) { function CNAMEtarget(data) {
// Split record in format <cname>,<target>[,<TTL>] // Split record in format <cname>,<target>[,<TTL>]
const CNAMEarr = data.split(","); const CNAMEarr = data.split(",");
return CNAMEarr[1]; return CNAMEarr[1].trim();
} }
function CNAMEttl(data) { function CNAMEttl(data) {