From c0c8bc2b928f5a04b67b16dfac194755bb48f03c Mon Sep 17 00:00:00 2001
From: vichansson <vhansson@opennebula.io>
Date: Thu, 26 Sep 2024 16:59:57 +0300
Subject: [PATCH] M #-: Add RSunstone patch files (#6738)

Signed-off-by: Victor Hansson <vhansson@opennebula.io>
---
 src/sunstone/patches/SunstoneViews.patch   | 28 ++++++++++++++++++++++
 src/sunstone/patches/sunstone-server.patch | 28 ++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 src/sunstone/patches/SunstoneViews.patch
 create mode 100644 src/sunstone/patches/sunstone-server.patch

diff --git a/src/sunstone/patches/SunstoneViews.patch b/src/sunstone/patches/SunstoneViews.patch
new file mode 100644
index 00000000000..e7e8f12fad3
--- /dev/null
+++ b/src/sunstone/patches/SunstoneViews.patch
@@ -0,0 +1,28 @@
+--- SunstoneViews.rb	2024-09-05 17:07:42.000000000 +0300
++++ SunstoneViews.rb	2024-09-23 17:34:54.248170982 +0300
+@@ -35,7 +35,11 @@
+ 
+         raise "Sunstone configuration file does not contain default view mode, aborting" if mode.nil?
+ 
+-        @views_config = YAML.load_file(VIEWS_CONFIGURATION_FILE)
++        if Psych::VERSION > '4.0'
++            @views_config = YAML.load_file(VIEWS_CONFIGURATION_FILE, aliases: true)
++        else
++            @views_config = YAML.load_file(VIEWS_CONFIGURATION_FILE)
++        end
+ 
+         base_path = SUNSTONE_ROOT_DIR+'/public/js/'
+ 
+@@ -49,7 +53,11 @@
+             reg = VIEWS_CONFIGURATION_DIR + mode + '/'
+             m = p_path.match(/^#{reg}(.*).yaml$/)
+             if m && m[1]
+-                @views[m[1]] = YAML.load_file(p_path)
++                if Psych::VERSION > '4.0'
++                    @views[m[1]] = YAML.load_file(p_path, aliases: true)
++                else
++                    @views[m[1]] = YAML.load_file(p_path)
++                end
+             end
+         end
+     end
diff --git a/src/sunstone/patches/sunstone-server.patch b/src/sunstone/patches/sunstone-server.patch
new file mode 100644
index 00000000000..42b98e2a3be
--- /dev/null
+++ b/src/sunstone/patches/sunstone-server.patch
@@ -0,0 +1,28 @@
+--- sunstone-server.rb 17:00:40.261753994 +0300
++++ sunstone-server.rb 17:29:04.665081589 +0300
+@@ -158,7 +158,11 @@
+ ##############################################################################
+ 
+ begin
+-    $conf = YAML.load_file(CONFIGURATION_FILE)
++    if Psych::VERSION > '4.0'
++        $conf = YAML.load_file(CONFIGURATION_FILE, aliases: true)
++    else
++        $conf = YAML.load_file(CONFIGURATION_FILE)
++    end
+ rescue Exception => e
+     STDERR.puts "Error parsing config file #{CONFIGURATION_FILE}: #{e.message}"
+     exit 1
+@@ -359,7 +363,11 @@
+     def build_conf_locals
+         logos_conf = nil
+         begin
+-            logos_conf = YAML.load_file(LOGOS_CONFIGURATION_FILE)
++            if Psych::VERSION > '4.0'
++                logos_conf = YAML.load_file(LOGOS_CONFIGURATION_FILE, aliases: true)
++            else
++                logos_conf = YAML.load_file(LOGOS_CONFIGURATION_FILE)
++            end
+         rescue Exception => e
+             logger.error { "Error parsing config file #{LOGOS_CONFIGURATION_FILE}: #{e.message}" }
+             error 500, ""