From 7aa8c765f6563b781db0baa22bdbf39fcee1931c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Mar 2024 11:49:15 +0100
Subject: [PATCH] Refactor domain IP handling in Domains controller

---
 app/Http/Controllers/Api/Domains.php | 65 +++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Api/Domains.php b/app/Http/Controllers/Api/Domains.php
index f96765397..4b8a026fb 100644
--- a/app/Http/Controllers/Api/Domains.php
+++ b/app/Http/Controllers/Api/Domains.php
@@ -22,16 +22,36 @@ class Domains extends Controller
         if ($applications->count() > 0) {
             foreach ($applications as $application) {
                 $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) {
                     return str($fqdn)->replace('http://', '')->replace('https://', '')->replace('/', '');
                 });
-                $domains->push([
-                    'domain' => $fqdn,
-                    'ip' => $ip,
-                ]);
+                if ($ip === 'host.docker.internal') {
+                    if ($settings->public_ipv4) {
+                        $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();
@@ -43,10 +63,33 @@ class Domains extends Controller
                         $fqdn = str($application->fqdn)->explode(',')->map(function ($fqdn) {
                             return str($fqdn)->replace('http://', '')->replace('https://', '')->replace('/', '');
                         });
-                        $domains->push([
-                            'domain' => $fqdn,
-                            'ip' => $ip,
-                        ]);
+                        if ($ip === 'host.docker.internal') {
+                            if ($settings->public_ipv4) {
+                                $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,
+                                ]);
+                            }
+                        }
                     }
                 }
             }