[cpp-sp] branch main updated: SSPCPP-985 MSI installer issue with localized versions of Windows

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=e1fb228ed6d83c79e540141a7836a8e0f3e64bfb

The following commit(s) were added to refs/heads/main by this push:
     new e1fb228e SSPCPP-985 MSI installer issue with localized versions of Windows
e1fb228e is described below

commit e1fb228ed6d83c79e540141a7836a8e0f3e64bfb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Apr 10 15:36:29 2024 +0100

    SSPCPP-985 MSI installer issue with localized versions of Windows
    
    https://shibboleth.atlassian.net/browse/SSPCPP-985
    
    Based on customer recommendation, use WIX provided properties for account names
    (to overcome Localization issues)
---
 msi/WiX/ShibbolethSP-noarch.wxs     | 14 +++++++++++---
 msi/WiX/ShibbolethSP-properties.wxi |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 0f563183..dff2c4ff 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -22,6 +22,11 @@
     architecture insenstive stuff since some GUIDS may have moved
   -->
   <Fragment>
+    <!-- SPCPP-985 -->
+    <PropertyRef Id="WIX_ACCOUNT_ADMINISTRATORS" />
+    <PropertyRef Id="WIX_ACCOUNT_LOCALSYSTEM" />
+    <PropertyRef Id="WIX_ACCOUNT_USERS" />
+
     <!-- Files First -->
     <!-- Configuration, licenses and documentation -->
 
@@ -29,9 +34,9 @@
       <Component Id="ProtectInstallDir" Guid="{9F695B93-0575-4D91-9E22-35A8D6966F1B}">
         <Condition>NOT WIX_UPGRADE_DETECTED</Condition>
         <CreateFolder>
-          <Permission User="Administrators" GenericAll="yes" />
-          <Permission User="SYSTEM" GenericAll="yes" />
-          <Permission User="USERS" ReadPermission="yes" GenericRead="yes" GenericExecute="yes" Read="yes" />
+          <Permission User="[WIX_ACCOUNT_ADMINISTRATORS]" GenericAll="yes" />
+          <Permission User="[WIX_ACCOUNT_LOCALSYSTEM]" GenericAll="yes" />
+          <Permission User="[WIX_ACCOUNT_USERS]" ReadPermission="yes" GenericRead="yes" GenericExecute="yes" Read="yes" />
           <Permission User="[WEBSERVER_USER]" ReadPermission="yes" GenericRead="yes" GenericExecute="yes" Read="yes" />
         </CreateFolder>
       </Component>
@@ -188,6 +193,8 @@
     <CustomAction Id="KeyGenEncrypt" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" />
     <CustomAction Id="SetKeyGenEncrypt" Property="KeyGenEncrypt" Value=""[INSTALLDIR]etc\shibboleth\keygen.bat" -n sp-encrypt [KEYGEN_EXTRA]" />
 
+    <CustomAction Id="QuerySids" BinaryKey="QueryWindowsWellKnownSIDs" Execute="deferred" Impersonate="no" />
+
     <CustomAction Id="SetSetDisplayName" Property="SetDisplayName" Value=""[WindowsFolder]\System32\sc" config shibd_default DisplayName= "Shibboleth Daemon (Default)""  />
 
     <!-- Inherit the installation dir if one was set -->
@@ -208,6 +215,7 @@
 
     <InstallExecuteSequence>
       <Custom Action="SetEditConfigFiles" Before="CostInitialize">NOT Installed</Custom>
+      <Custom Action="QuerySids" Before="InstallFiles"/>
       <Custom Action="EditConfigFiles" After="InstallFiles">NOT Installed</Custom>
 
       <Custom Action="SetKeyGenSigning" Before="CostInitialize">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index 8207bbab..20651065 100644
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -36,7 +36,8 @@
   <Property Id="ALWAYS_START_SERVICE" Value="TRUE" Secure="yes" />
 
   <!-- Identity to give Read access to -->
-  <Property Id="WEBSERVER_USER" Value="USERS"  Secure="yes" />
+  <PropertyRef Id="WIX_ACCOUNT_USERS" />
+  <Property Id="WEBSERVER_USER" Value="[WIX_ACCOUNT_USERS]"  Secure="yes" />
 
   <!-- UPGRADINGPRODUCTCODE set in the uninstall if this is an upgrade uninstall -->
   <!-- SSPCPP-568 We need a default for InstallDir -->

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.