Malin/domnitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update WhoisService.php

Browse Source
This commit is contained in:
Hosteroid
2025-10-21 15:02:15 +03:00
parent 685a641873
commit 221e0b83f0
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Services/WhoisService.php
View File

@@ -54,6 +54,27 @@ class WhoisService
if ($rdapUrl) {
$rdapData = $this->queryRDAPGeneric($domain, $rdapUrl);
if ($rdapData) {
// If RDAP succeeded but is missing expiration date, try WHOIS as fallback
if (empty($rdapData['expiration_date']) && $whoisServer) {
$whoisData = $this->queryWhois($domain, $whoisServer);
if ($whoisData) {
// Check if we got a referral to another WHOIS server
$referralServer = $this->extractReferralServer($whoisData);
if ($referralServer && $referralServer !== $whoisServer) {
$whoisData = $this->queryWhois($domain, $referralServer);
}
if ($whoisData) {
// Parse WHOIS data to get expiration date
$whoisInfo = $this->parseWhoisData($domain, $whoisData, $referralServer ?? $whoisServer);
// Merge expiration date from WHOIS into RDAP data
if (!empty($whoisInfo['expiration_date'])) {
$rdapData['expiration_date'] = $whoisInfo['expiration_date'];
}
}
}
}
return $rdapData;
}
// If RDAP failed, fall through to WHOIS
@@ -696,6 +717,14 @@ class WhoisService
return 'available';
}
// If domain has "active" status but no expiration date, consider it active
// This handles TLDs like .nl that don't provide expiration dates
foreach ($statusArray as $status) {
if (stripos($status, 'active') !== false) {
return 'active';
}
}
$days = $this->daysUntilExpiration($expirationDate);
if ($days === null) {