Allow underscores in hostnames (librenms#16683)

peejaychilds · Nov 11, 2024 · 66efd42 · 66efd42
1 parent e3cc987
commit 66efd42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/LibreNMS/Util/Validate.php b/LibreNMS/Util/Validate.php
@@ -47,7 +47,7 @@ public static function hostname($hostname)
         // maximum length is 253 characters, maximum segment size is 63
 
         return
-            preg_match("/^([a-z\d](-*[a-z\d])*)(\.([a-z\d](-*[a-z\d])*))*\.?$/i", $hostname) //valid chars check
+            preg_match("/^([a-z\d](-*[a-z\d_])*)(\.([a-z\d](-*[a-z\d_])*))*\.?$/i", $hostname) //valid chars check
             && preg_match('/^.{1,253}$/', $hostname) //overall length check
             && preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*\.?$/", $hostname);
     }

diff --git a/tests/CommonFunctionsTest.php b/tests/CommonFunctionsTest.php
@@ -127,7 +127,7 @@ public function testIsValidHostname(): void
         $this->assertTrue(Validate::hostname('www.averylargedomainthatdoesnotreallyexist.com'), 'www.averylargedomainthatdoesnotreallyexist.com');
         $this->assertTrue(Validate::hostname('cont-ains.h-yph-en-s.com'), 'cont-ains.h-yph-en-s.com');
         $this->assertTrue(Validate::hostname('cisco-3750x'), 'cisco-3750x');
-        $this->assertFalse(Validate::hostname('cisco_3750x'), 'cisco_3750x');
+        $this->assertTrue(Validate::hostname('cisco_3750x'), 'cisco_3750x');
         $this->assertFalse(Validate::hostname('goo gle.com'), 'goo gle.com');
         $this->assertFalse(Validate::hostname('google..com'), 'google..com');
         $this->assertFalse(Validate::hostname('google.com '), 'google.com ');