From fbaba8d40fd95c8e71bdfc536c906f29744a266d Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Wed, 12 Feb 2025 09:04:48 -0600
Subject: [PATCH 1/2] Inhibit management of share config.php file when
 mpf_disable_mission_portal_docroot_sync_from_share_gui is defined

In preparation for possibly removing the share/GUI folder entirely.

Ticket: ENT-12658
Changelog: title
---
 cfe_internal/enterprise/CFE_hub_specific.cf | 49 +++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/cfe_internal/enterprise/CFE_hub_specific.cf b/cfe_internal/enterprise/CFE_hub_specific.cf
index 22e0782a82..7817b76a6f 100644
--- a/cfe_internal/enterprise/CFE_hub_specific.cf
+++ b/cfe_internal/enterprise/CFE_hub_specific.cf
@@ -40,6 +40,14 @@ bundle common cfe_internal_hub_vars
 
     policy_server::
 
+      "http_port" -> { "ENT-12151" }
+        string => ifelse( isvariable("cfe_internal_hub_vars.http_port"), "$(cfe_internal_hub_vars.http_port)", "80" ),
+        comment => "Mission portal's webserver HTTP port. Default 80";
+
+      "https_port" -> { "ENT-12151" }
+        string => ifelse( isvariable("cfe_internal_hub_vars.https_port"), "$(cfe_internal_hub_vars.https_port)", "443" ),
+        comment => "Mission portal's webserver HTTPS port. Default 443";
+
       "docroot" string => "$(sys.workdir)/httpd/htdocs",
         comment => "Root directory of Enterprise Web interface",
         handle => "cfe_internal_hub_vars_docroot";
@@ -91,6 +99,47 @@ bundle common cfe_internal_hub_vars
 
 }
 
+##################################################################
+#
+# update_cli_rest_server_url_config
+#  - updates REST server URL port of Mission Portal WebGUI when
+#    cfe_internal_hub_vars.https_port is changed
+#
+##################################################################
+bundle agent update_cli_rest_server_url_config
+{
+  vars:
+    # Both share and live versions must be changed at once since httpd will be restarted later in the same agent run.
+    "mp_config_file" string => "$(cfe_internal_hub_vars.docroot)/application/config/config.php";
+    "mp_share_config_file" string => "$(sys.workdir)/share/GUI/application/config/config.php";
+    "regex_test_pattern" string => ".*localhost:$(cfe_internal_hub_vars.https_port).*";
+
+  files:
+    !mpf_disable_mission_portal_docroot_sync_from_share_gui::
+      "$(mp_share_config_file)"
+         edit_line => change_cli_rest_server_url_port,
+         if => and(
+           fileexists("$(mp_share_config_file)"),
+           islessthan(countlinesmatching("$(regex_test_pattern)", "$(mp_share_config_file)"), 1)
+           );
+
+    any::
+      "$(mp_config_file)"
+        edit_line => change_cli_rest_server_url_port,
+        if => and(
+          fileexists("$(mp_config_file)"),
+          islessthan(countlinesmatching("$(regex_test_pattern)", "$(mp_config_file)"), 1)
+          );
+}
+
+bundle edit_line change_cli_rest_server_url_port
+{
+  replace_patterns:
+  "^\s*\$config\['cli_rest_server_url'\]\s*=\s*\"https://localhost(?::(?!$(cfe_internal_hub_vars.https_port))\d{1,5})?/api/\";\s*$"
+      replace_with => value("    $config['cli_rest_server_url'] = \"https://localhost:$(cfe_internal_hub_vars.https_port)/api/\";"),
+      comment => "Change port CLI REST server URL port";
+}
+
 ##################################################################
 #
 # cfe_internal_update_folders

From dd20e734abdab77805a3978855862e54bf1e3123 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Thu, 13 Feb 2025 12:11:27 -0600
Subject: [PATCH 2/2] bumped upload-artifact github action to v4

https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md

Ticket: none
Changelog: none
(cherry picked from commit c219971cbdf22a0708319010a80d8f4f2d4a2258)
---
 .github/workflows/tests.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5d880c5f2a..8182b01d51 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -31,6 +31,13 @@ jobs:
           cd masterfiles
           ./autogen.sh --prefix=$INSTDIR > autogen.log 2>&1
           cd ..
+      - name: Prepare Artifacts for Uploading
+        run: tar -zcvf /tmp/workspace.tgz ./ && mv /tmp/workspace.tgz ./
+      - name: Upload The Workspace as Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: workspace
+          path: workspace.tgz
       - name: Install Masterfiles
         run: make -C masterfiles install
       - name: Validate policy with cf-promises