Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Refactor domain IP handling in Domains controller

Browse Source
This commit is contained in:
Andras Bacsai 2024-03-07 11:49:15 +01:00
parent 038f65aae6
commit 7aa8c765f6
1 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/Http/Controllers/Api/Domains.php
View File

@ -22,16 +22,36 @@ class Domains extends Controller
if ($applications->count() > 0) { if ($applications->count() > 0) {
foreach ($applications as $application) { foreach ($applications as $application) {
$ip = $application->destination->server->ip; $ip = $application->destination->server->ip;
if ($ip === 'host.docker.internal') {
$ip = $settings->ipv4 || $settings->ipv6 || 'host.docker.internal';
}
$fqdn = str($application->fqdn)->explode(',')->map(function ($fqdn) { $fqdn = str($application->fqdn)->explode(',')->map(function ($fqdn) {
return str($fqdn)->replace('http://', '')->replace('https://', '')->replace('/', ''); return str($fqdn)->replace('http://', '')->replace('https://', '')->replace('/', '');
}); });
$domains->push([ if ($ip === 'host.docker.internal') {
'domain' => $fqdn, if ($settings->public_ipv4) {
'ip' => $ip, $domains->push([
]); 'domain' => $fqdn,
'ip' => $settings->public_ipv4,
]);
}
if ($settings->public_ipv6) {
$domains->push([
'domain' => $fqdn,
'ip' => $settings->public_ipv6,
]);
}
if (!$settings->public_ipv4 && !$settings->public_ipv6) {
$domains->push([
'domain' => $fqdn,
'ip' => $ip,
]);
}
} else {
if (!$settings->public_ipv4 && !$settings->public_ipv6) {
$domains->push([
'domain' => $fqdn,
'ip' => $ip,
]);
}
}
} }
} }
$services = $projects->pluck('services')->flatten(); $services = $projects->pluck('services')->flatten();
@ -43,10 +63,33 @@ class Domains extends Controller
$fqdn = str($application->fqdn)->explode(',')->map(function ($fqdn) { $fqdn = str($application->fqdn)->explode(',')->map(function ($fqdn) {
return str($fqdn)->replace('http://', '')->replace('https://', '')->replace('/', ''); return str($fqdn)->replace('http://', '')->replace('https://', '')->replace('/', '');
}); });
$domains->push([ if ($ip === 'host.docker.internal') {
'domain' => $fqdn, if ($settings->public_ipv4) {
'ip' => $ip, $domains->push([
]); 'domain' => $fqdn,
'ip' => $settings->public_ipv4,
]);
}
if ($settings->public_ipv6) {
$domains->push([
'domain' => $fqdn,
'ip' => $settings->public_ipv6,
]);
}
if (!$settings->public_ipv4 && !$settings->public_ipv6) {
$domains->push([
'domain' => $fqdn,
'ip' => $ip,
]);
}
} else {
if (!$settings->public_ipv4 && !$settings->public_ipv6) {
$domains->push([
'domain' => $fqdn,
'ip' => $ip,
]);
}
}
} }
} }
} }