From a4a1f50881638ad4b3d4ed08fa0d593662419d0d Mon Sep 17 00:00:00 2001
From: Sandeep Thakkar <36132714+sandeep-edb@users.noreply.github.com>
Date: Sat, 30 Nov 2024 18:50:07 +0530
Subject: [PATCH] Update server installer XML: Replace "NT AUTHORITY\SYSTEM"
 with it's SID

The ruleList for "NT AUTHORITY\SYSTEM" doesn't work on Windows
system with non-English languages as they are named differently.
Hence, find and use the Security Identifier (SID) for the local system
account instead which are standard and work on all languages

Also, bump package revision for postgresql server installer

DBP-1019, Sandeep Thakkar, Reviewed by Muralikrishna Bandaru
---
 server/installer.xml.in | 22 ++++++++++++++++++++--
 server/version.txt      |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/server/installer.xml.in b/server/installer.xml.in
index 3653b002..00507164 100755
--- a/server/installer.xml.in
+++ b/server/installer.xml.in
@@ -124,6 +124,24 @@ EOF
                         <compareText logic="equals" text="${platform_name}" value="windows"/>
                     </ruleList>
                 </setInstallerVariableFromScriptOutput>
+                <logMessage>
+                    <text>"whoami: ${whoami}"</text>
+                </logMessage>
+                <!-- Windows: System account SID so that ruleList works for non-English language -->
+                <runProgram>
+                    <program>${env(WINDIR)}\System32\whoami</program>
+                     <programArguments>/USER /nh</programArguments>
+                </runProgram>
+                <setInstallerVariableFromRegEx>
+                    <name>whoami_sid</name>
+                    <pattern>^.*\s+(S-[0-9-]+)\s*$</pattern>
+                    <substitution>\1</substitution>
+                    <text>${program_stdout}</text>
+                </setInstallerVariableFromRegEx>
+                <logMessage>
+                    <text>"whoami_sid: ${whoami_sid}"</text>
+                </logMessage>
+
 		<!-- Use 'whoami' to work with "NT AUTHORITY\SYSTEM" user as 'system_username' not working-->
                 <actionGroup>
                     <actionList>
@@ -144,7 +162,7 @@ EOF
                     </actionList>
                     <ruleList>
                          <compareText logic="equals" text="${platform_name}" value="windows"/>
-			 <compareText logic="equals" text="${whoami}" value="nt authority\system"/>
+			 <compareText logic="equals" text="${whoami_sid}" value="S-1-5-18"/>
                     </ruleList>
                 </actionGroup>
 		<!-- Use 'system_username' to work with local administrator accounts -->
@@ -167,7 +185,7 @@ EOF
                     </actionList>
                     <ruleList>
                          <compareText logic="equals" text="${platform_name}" value="windows"/>
-                         <compareText logic="does_not_equal" text="${whoami}" value="nt authority\system"/>
+                         <compareText logic="does_not_equal" text="${whoami_sid}" value="S-1-5-18"/>
                     </ruleList>
                </actionGroup>
             </actionList>
diff --git a/server/version.txt b/server/version.txt
index 6dbf6e07..bd692468 100644
--- a/server/version.txt
+++ b/server/version.txt
@@ -1,6 +1,6 @@
 pg_major_version=16
 pg_minor_version=6
-package_revision=1
+package_revision=2
 pgadmin4=8.13
 languagepack=4.4-1
 stackbuilder=4.2.2