[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=181a9eb535994a012a7852f9e333379e07434ed3

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

commit 181a9eb535994a012a7852f9e333379e07434ed3
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Apr 13 15:40:14 2024 +0100

    SSPCPP-985 MSI installer issue with localized versions of Windows
    
    https://shibboleth.atlassian.net/browse/SSPCPP-985
    
    Fix previous.
      1) Git automagically calls the required action (WixQueryOsWellKnownSID)
      2) Add explicit defaulting of WEBSERVER_USER
---
 msi/WiX/ShibbolethSP-noarch.wxs     | 11 ++++++++---
 msi/WiX/ShibbolethSP-properties.wxi |  4 ----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index dff2c4ff..c825ed4f 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -193,14 +193,17 @@
     <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 -->
     <CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />
     <CustomAction Id="InheritInstallDir64" Property="INSTALLDIR" Value="[OLD_INSTALLDIR64]" />
 
+    <!-- Identity to give Read access to -->
+    <Property Id="WEBSERVER_USER"/>
+
+    <CustomAction Id="DefaultWebServerUser" Property="WEBSERVER_USER" Value="[WIX_ACCOUNT_USERS]" />
+
     <InstallUISequence>
       <!-- All we need to sequence here is setting up inherited INSTALLDIR -->
 
@@ -215,7 +218,6 @@
 
     <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>
@@ -243,6 +245,9 @@
       <StartServices>(NOT Installed) AND (ALWAYS_START_SERVICE = "TRUE")</StartServices>
       <DeleteServices>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</DeleteServices>
 
+      <!-- Setup the WEBUSER -->
+      <Custom Action="DefaultWebServerUser" After="InstallInitialize">WEBSERVER_USER = ""</Custom>
+
     </InstallExecuteSequence>
   </Fragment>
 </Wix>
diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index 20651065..4b1f9bf4 100644
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -35,10 +35,6 @@
   <!-- Do we want to force the ServiceStart to happen? -->
   <Property Id="ALWAYS_START_SERVICE" Value="TRUE" Secure="yes" />
 
-  <!-- Identity to give Read access to -->
-  <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 -->
   <Property Id="INSTALLDIR" Value="C:\opt\shibboleth-sp\" />

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