From dd797d7490c6d587d89c6b5ac4e87b4428efa544 Mon Sep 17 00:00:00 2001
From: Gonzalo Gomez Gracia <gonzalog@vmware.com>
Date: Wed, 21 Feb 2024 16:30:17 +0100
Subject: [PATCH] [bitnami/bncert] Add support for IPv6

Signed-off-by: Gonzalo Gomez Gracia <gonzalog@vmware.com>
---
 LEGO_VERSION                             |  2 +-
 VERSION                                  |  2 +-
 project/base-functions.xml               |  3 +-
 project/bncert-functions.xml             | 49 ------------------------
 project/bncert-letsencrypt-functions.xml |  3 +-
 project/bncert.xml                       | 23 -----------
 project/vmtools-functions.xml            | 34 ----------------
 7 files changed, 6 insertions(+), 110 deletions(-)

diff --git a/LEGO_VERSION b/LEGO_VERSION
index 5b341fd..5c517bf 100644
--- a/LEGO_VERSION
+++ b/LEGO_VERSION
@@ -1 +1 @@
-4.9.1
+4.15.0
diff --git a/VERSION b/VERSION
index 524cb55..227cea2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.1
+2.0.0
diff --git a/project/base-functions.xml b/project/base-functions.xml
index 322a0ef..a4c60eb 100644
--- a/project/base-functions.xml
+++ b/project/base-functions.xml
@@ -81,7 +81,8 @@ Copyrighted by BitRock
                                     <variable>timestamp</variable>
                                 </createTimeStamp>
                                 <setInstallerVariable name="installer_http_code" value="0"/>
-                                <httpGet url="${url}" filename="${system_temp_directory}/http_get_${timestamp}.txt" abortOnError="0" showMessageOnError="0"/>
+                                <!-- httpGet can't handle IPv6 connections -->
+                                <runProgram program="curl" programArguments="-L '${url}' -o '${system_temp_directory}/http_get_${timestamp}.txt'" abortOnError="0" showMessageOnError="0"/>
                                 <setInstallerVariable name="valid_url" value="0">
                                     <ruleList>
                                         <compareText text="${installer_http_code}" logic="does_not_equal" value="200"/>
diff --git a/project/bncert-functions.xml b/project/bncert-functions.xml
index dba31e5..f4fb7fd 100644
--- a/project/bncert-functions.xml
+++ b/project/bncert-functions.xml
@@ -84,55 +84,6 @@
                 </actionGroup>
             </actionList>
         </actionDefinition>
-        <actionDefinition name="bncertValidateDomain">
-            <parameterList>
-                <stringParameter name="domain"/>
-            </parameterList>
-            <actionList>
-                <setInstallerVariable name="ignore_public_ip_warning" value="no"/>
-                <!-- Obtain public IP address, but only once -->
-                <actionGroup>
-                    <actionList>
-                        <getPublicIpAddress variable="machine_public_ipaddr" progressText="Determining machine public IP address"/>
-                        <actionGroup>
-                            <actionList>
-                                <showQuestion title="Could not detect public IP address" text="&#xA;The public IP address for this machine could not be detected. A public IP address will be required for Let's Encrypt to verify that your domains point to this machine. Do you want to proceed anyways?" variable="ignore_public_ip_warning" default="no"/>
-                                <throwError text="Please check public IP configuration for this machine. For more info see: https://docs.bitnami.com/general/faq/configuration/configure-static-address/">
-                                    <ruleList>
-                                        <isFalse value="${ignore_public_ip_warning}"/>
-                                    </ruleList>
-                                </throwError>
-                            </actionList>
-                            <ruleList>
-                                <stringTest text="${machine_public_ipaddr}" type="empty"/>
-                            </ruleList>
-                        </actionGroup>
-                    </actionList>
-                    <ruleList>
-                        <isTrue value="${perform_public_ip_validation}"/>
-                        <stringTest text="${machine_public_ipaddr}" type="empty"/>
-                        <isFalse value="${ignore_public_ip_warning}"/>
-                    </ruleList>
-                </actionGroup>
-                <!-- Now validate the domain DNS and ensure the IP matches -->
-                <if>
-                    <conditionRuleList>
-                        <hostValidation host="${domain}" type="hostname" condition="is_not_valid"/>
-                    </conditionRuleList>
-                    <actionList>
-                        <throwError text="The domain '${domain}' does not resolve, please fix its DNS entries or remove it."/>
-                    </actionList>
-                    <elseActionList>
-                        <throwError text="The domain '${domain}' resolves to a different IP address than the one detected for this machine, which is '${machine_public_ipaddr}'. Please fix its DNS entries or remove it. For more info see: https://docs.bitnami.com/general/faq/configuration/configure-custom-domain/">
-                            <ruleList>
-                                <validateDomainIpAddressResolution domain="${domain}" ipAddress="${machine_public_ipaddr}" negate="1"/>
-                                <isTrue value="${perform_public_ip_validation}"/>
-                            </ruleList>
-                        </throwError>
-                    </elseActionList>
-                </if>
-            </actionList>
-        </actionDefinition>
         <!-- Parameters for updating metadata -->
         <actionDefinition name="bncertDetectMissingDomains">
             <parameterList>
diff --git a/project/bncert-letsencrypt-functions.xml b/project/bncert-letsencrypt-functions.xml
index 1c74e48..6ff427b 100644
--- a/project/bncert-letsencrypt-functions.xml
+++ b/project/bncert-letsencrypt-functions.xml
@@ -427,7 +427,8 @@ Please check our documentation and support forums, we'll be happy to help!
                 <writeFile path="${lego_app_dir}/.well-known/${tmpFile}" text="${randomString}"/>
                 <foreach variables="domain" values="${domains}">
                     <actionList>
-                        <httpGet abortOnError="0" showMessageOnError="0" url="https://${domain}/.well-known/${tmpFile}" filename="${system_temp_directory}/${tmpFile}"/>
+                        <!-- httpGet can't handle IPv6 connections -->
+                        <runProgram abortOnError="0" showMessageOnError="1" program="curl" programArguments="-L 'https://${domain}/.well-known/${tmpFile}' -o '${system_temp_directory}/${tmpFile}'"/>
                         <readFile abortOnError="0" showMessageOnError="0" path="${system_temp_directory}/${tmpFile}" name="result"/>
                         <actionGroup>
                             <actionList>
diff --git a/project/bncert.xml b/project/bncert.xml
index d89a19d..977ebff 100644
--- a/project/bncert.xml
+++ b/project/bncert.xml
@@ -223,19 +223,6 @@
                         <regExMatch pattern="[a-z0-9.-]{64}" logic="matches" text="${domains}"/>
                     </ruleList>
                 </throwError>
-                <showProgressDialog title="Validating domains">
-                    <actionList>
-                        <!-- Validate domain DNS entries -->
-                        <foreach variables="domain" values="${domains}">
-                            <actionList>
-                                <bncertValidateDomain domain="${domain}" progressText="Validating domain '${domain}'"/>
-                            </actionList>
-                            <ruleList>
-                                <isTrue value="${perform_dns_validation}"/>
-                            </ruleList>
-                        </foreach>
-                    </actionList>
-                </showProgressDialog>
             </validationActionList>
         </parameterGroup>
         <!-- The below parameter is skipped, but we will return to it if the user rejects the list of proposed changes -->
@@ -306,16 +293,6 @@
             <validationActionList>
                 <showProgressDialog title="Performing validations">
                     <actionList>
-                        <!-- Validate domain DNS entries -->
-                        <!-- This time we also validate automatically added domains (e.g. www.example.com if only example.com was added) -->
-                        <foreach variables="domain" values="${domains}">
-                            <actionList>
-                                <bncertValidateDomain domain="${domain}" progressText="Validating domain '${domain}'"/>
-                            </actionList>
-                            <ruleList>
-                                <isTrue value="${perform_dns_validation}"/>
-                            </ruleList>
-                        </foreach>
                         <!-- We stop the web server at this point, in order to verify we can proceed with the setup -->
                         <bncertStopWebServer webServerName="${web_server_name}" progressText="Stopping web server">
                             <ruleList>
diff --git a/project/vmtools-functions.xml b/project/vmtools-functions.xml
index 821225e..cacc47d 100644
--- a/project/vmtools-functions.xml
+++ b/project/vmtools-functions.xml
@@ -561,40 +561,6 @@ ${targetDir}/${project.shortName}-tool ${installer_command_line_arguments}
                 <isServiceRunning service="varnish"/>
             </ruleList>
         </ruleDefinition>
-        <ruleDefinition name="validateDomainIpAddressResolution">
-            <parameterList>
-                <stringParameter name="domain"/>
-                <stringParameter name="ipAddress"/>
-            </parameterList>
-            <actionList>
-                <setInstallerVariable name="detected_ip_address" value=""/>
-                <runProgram program="getent" programArguments="hosts ${domain}" abortOnError="0" showMessageOnError="0"/>
-                <setInstallerVariableFromRegEx name="detected_ip_address" pattern="^([0-9.]+)\s.*$" substitution="\1" text="${program_stdout}">
-                    <ruleList>
-                        <regExMatch text="${program_stdout}" logic="matches" pattern="^([0-9.]+)\s.*$"/>
-                        <compareText text="${program_exit_code}" logic="equals" value="0"/>
-                    </ruleList>
-                </setInstallerVariableFromRegEx>
-            </actionList>
-            <ruleList>
-                <compareText text="${detected_ip_address}" logic="equals" value="${ipAddress}"/>
-            </ruleList>
-        </ruleDefinition>
-        <actionDefinition name="getPublicIpAddress">
-            <parameterList>
-                <stringParameter name="variable"/>
-            </parameterList>
-            <actionList>
-                <!-- Get the public IP from myip.bitnami.com -->
-                <globalVariables names="${variable}"/>
-                <generateRandomValue length="10" variable="suffix"/>
-                <setInstallerVariable name="filename" value="${system_temp_directory}/myip${suffix}.tmp"/>
-                <httpGet url="http://myip.bitnami.com" filename="${filename}" abortOnError="0" showMessageOnError="0"/>
-                <readFile path="${filename}" name="${variable}"/>
-                <deleteFile path="${filename}"/>
-                <logMessage text="Detected public IP address: '${${variable}}'"/>
-            </actionList>
-        </actionDefinition>
         <actionDefinition name="grepText">
             <parameterList>
                 <stringParameter name="text"/>