Skip to content

INTGRTNS-500-Fix-external-nameserver-ip-resolution-in-createNameserversArray #545

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
avishka-ra wants to merge 2 commits into
base: master
Choose a base branch
from
Open

INTGRTNS-500-Fix-external-nameserver-ip-resolution-in-createNameserversArray #545

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59d2066
Add glue record validation and update error messages
avishka-ra May 14, 2026
21b9b5b
Fix copilot PR review.
avishka-ra May 15, 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
51 changes: 38 additions & 13 deletions modules/registrars/openprovider/OpenProvider/API/APITools.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ class APITools
public static function createNameserversArray($params, $apiHelper = null)
{
$nameServers = array();
$domainFqdn = strtolower($params['sld'] . '.' . $params['tld']);

//can be used to hard-code a nameserver overwrite when using the DNS management addon
//can be used to hard-code a nameserver overwrite when using the DNS management addon
// if($params['dnsmanagement'] == true)
// {
// $params['ns1'] = 'ns1.openprovider.nl';
Expand All @@ -26,7 +27,7 @@ public static function createNameserversArray($params, $apiHelper = null)
// }

if ($params['test_mode'] == 'on' && $apiHelper != null) {

for ($i = 1; $i <= 5; $i++) {
$ns = $params["ns{$i}"];
if (!$ns) {
Expand All @@ -36,6 +37,15 @@ public static function createNameserversArray($params, $apiHelper = null)
$nsName = trim($nsParts[0]);
$nsIp = empty($nsParts[1]) ? null : trim($nsParts[1]);

// Glue records (NS is a child of the domain) require an IP.
// External nameservers must be accepted as-is without IP lookup.
$isGlue = str_ends_with(strtolower($nsName), '.' . $domainFqdn);

if (!$isGlue) {
$nameServers[] = new \OpenProvider\API\DomainNameServer(['name' => $nsName]);
continue;
}
Comment thread
avishka-ra marked this conversation as resolved.

//Try to get IP from searchNsRequest in REST API
if (empty($nsIp)) {
$myNameServerList = $apiHelper->getNameserverList($nsName);
Expand All @@ -52,9 +62,12 @@ public static function createNameserversArray($params, $apiHelper = null)
$nsIp = gethostbyname($nsName);
if (!filter_var($nsIp, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
$nsIp = "";
throw new \Exception("Invalid nameserver name: {$nsName}");
throw new \Exception(
"Could not resolve IP for glue record nameserver '{$nsName}'. "
. "Please register it in OpenProvider before continuing."
);
}
}
}

if (!empty($nsIp) && !empty($nsName)) {
$nameServers[] = new \OpenProvider\API\DomainNameServer(array(
Expand All @@ -65,13 +78,13 @@ public static function createNameserversArray($params, $apiHelper = null)
}

if (count($nameServers) < 2) {
throw new \Exception('You must enter minimum 2 nameservers');
throw new \Exception('You must provide at least 2 nameservers.');
}

return $nameServers;
}

$invalidNameServer = false;
$invalidGlueNameServers = [];
for ($i = 1; $i <= 5; $i++) {
$ns = $params["ns{$i}"];
if (!$ns) {
Expand All @@ -82,6 +95,15 @@ public static function createNameserversArray($params, $apiHelper = null)
$nsName = trim($nsParts[0]);
$nsIp = empty($nsParts[1]) ? null : trim($nsParts[1]);

// Glue records (NS is a child of the domain) require an IP.
// External nameservers must be accepted as-is without IP lookup.
$isGlue = str_ends_with(strtolower($nsName), '.' . $domainFqdn);

if (!$isGlue) {
$nameServers[] = new \OpenProvider\API\DomainNameServer(['name' => $nsName]);
continue;
}
Comment thread
avishka-ra marked this conversation as resolved.

if (empty($nsIp)) {
$api = new \OpenProvider\API\API();
$api->setParams($params);
Expand All @@ -99,8 +121,8 @@ public static function createNameserversArray($params, $apiHelper = null)
$nsIp = gethostbyname($nsName);
if (!filter_var($nsIp, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
$nsIp = "";
$invalidNameServer = true;
logModuleCall('openprovider', 'createNameserversArray', $nsName, "Invalid nameserver name: {$nsName}", null, null);
$invalidGlueNameServers[] = $nsName;
logModuleCall('openprovider', 'createNameserversArray', $nsName, "Could not resolve IP for glue record nameserver: {$nsName}", null, null);
}
}

Expand All @@ -113,11 +135,14 @@ public static function createNameserversArray($params, $apiHelper = null)
}

if (count($nameServers) < 2) {
if($invalidNameServer) {
throw new \Exception('You must enter minimum 2 nameservers. Invalid nameserver found. Please check the module log.');
}else{
throw new \Exception('You must enter minimum 2 nameservers');
}
if (!empty($invalidGlueNameServers)) {
$names = implode(', ', $invalidGlueNameServers);
throw new \Exception(
"Could not resolve IP for glue record nameserver(s): {$names}. "
. "Please register them in OpenProvider before continuing."
);
}
throw new \Exception('You must provide at least 2 nameservers.');
}

return $nameServers;
Expand Down