[java-idp-jetty-base] 02/03: IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun
Rod Widdowson
rdw at steadingsoftware.com
Mon Aug 7 13:25:44 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch 10-windows
in repository java-idp-jetty-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=6909acafbc1759740f83e98a433b7332f535a67a
commit 6909acafbc1759740f83e98a433b7332f535a67a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Aug 3 16:16:59 2023 +0100
IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun
https://shibboleth.atlassian.net/browse/IDP-2136
Use the new SetACLs.bat file to lock down the IdP bit of the install
---
src/main/wix/Jetty-User.wxs | 88 +++++++++++----------------------------------
1 file changed, 21 insertions(+), 67 deletions(-)
diff --git a/src/main/wix/Jetty-User.wxs b/src/main/wix/Jetty-User.wxs
index 1851347..a98db65 100644
--- a/src/main/wix/Jetty-User.wxs
+++ b/src/main/wix/Jetty-User.wxs
@@ -108,88 +108,42 @@ icacls "C:\Program Files (x86)\Shibboleth\IdP\conf" /setowner administrators /t
-->
<CustomAction Id="SetIcaclsVerb" Property="IcaclsVerb" Value=""c:\Windows\System32\icacls.exe""/>
- <CustomAction Id="SetIcaclsPost1" Property="IcaclsPost1" Value="/t /setowner Administrators"/>
- <CustomAction Id="SetIcaclsPost2" Property="IcaclsPost2" Value="/t /inheritance:r /grant SYSTEM:F Administrators:F"/>
+ <CustomAction Id="SetIcaclsPost" Property="IcaclsPost" Value="/t /inheritance:r /grant:r SYSTEM:F Administrators:F"/>
<!-- conf -->
- <CustomAction Id="SetACEConf1" Property="QtSetACEConf1" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\conf" [IcaclsPost1]"/>
- <CustomAction Id="SetACEConf2" Property="QtSetACEConf2" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\conf" [IcaclsPost2] [ACE_USER]:(GR,RD,X)" />
- <CustomAction Id="QtSetACEConf1" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtSetACEConf2" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <!-- creds -->
-
- <CustomAction Id="SetACECreds1" Property="QtSetACECreds1" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\credentials" [IcaclsPost1]"/>
- <CustomAction Id="SetACECreds2" Property="QtSetACECreds2" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\credentials" [IcaclsPost2] [ACE_USER]:(GR,RD,X)" />
- <CustomAction Id="QtSetACECreds1" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtSetACECreds2" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <!-- shibd_logs -->
- <CustomAction Id="SetACELogs1" Property="QtSetACELogs1" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\logs" [IcaclsPost1]"/>
- <CustomAction Id="SetACELogs2" Property="QtSetACELogs2" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\logs" [IcaclsPost2] [ACE_USER]:F" />
- <CustomAction Id="QtSetACELogs1" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtSetACELogs2" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <!-- Jetty start -->
- <CustomAction Id="SetACEJettyStart1" Property="QtSetACEJettyStart1" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\jetty-base\start.d" [IcaclsPost1]"/>
- <CustomAction Id="SetACEJettyStart2" Property="QtSetACEJettyStart2" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\jetty-base\start.d" [IcaclsPost2] [ACE_USER]:(GR,RD,X)" />
- <CustomAction Id="QtSetACEJettyStart1" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtSetACEJettyStart2" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="SetACEIdpWith" Property="QtSetACEIdP" Value=""[IDP_INSTALLDIR]\bin\setacl.bat""/>
+ <CustomAction Id="SetACEIdpWithout" Property="QtSetACEIdP" Value=""[IDP_INSTALLDIR]\bin\setacl.bat" [ACE_USER]"/>
+ <CustomAction Id="QtSetACEIdP" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
<!-- Jetty tmp -->
- <CustomAction Id="SetACEJettyTmp1" Property="QtSetACEJettyTmp1" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\jetty-base\tmp" [IcaclsPost1]"/>
- <CustomAction Id="SetACEJettyTmp2" Property="QtSetACEJettyTmp2" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\jetty-base\tmp" [IcaclsPost2] [ACE_USER]:F"/>
- <CustomAction Id="QtSetACEJettyTmp1" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtSetACEJettyTmp2" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="SetACEJettyTmp" Property="QtSetACEJettyTmp" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\jetty-base\tmp" [IcaclsPost] [ACE_USER]:F"/>
+ <CustomAction Id="QtSetACEJettyTmp" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
<!-- Jetty logs -->
- <CustomAction Id="SetACEJettyLogs1" Property="QtSetACEJettyLogs1" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\jetty-base\logs" [IcaclsPost1]"/>
- <CustomAction Id="SetACEJettyLogs2" Property="QtSetACEJettyLogs2" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\jetty-base\logs" [IcaclsPost2] [ACE_USER]:F" />
- <CustomAction Id="QtSetACEJettyLogs1" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtSetACEJettyLogs2" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="SetACEJettyLogs" Property="QtSetACEJettyLogs" Value="[IcaclsVerb] "[IDP_INSTALLDIR]\jetty-base\logs" [IcaclsPost] [ACE_USER]:F" />
+ <CustomAction Id="QtSetACEJettyLogs" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
<!-- Procmon Logs -->
- <CustomAction Id="SetACEProcrunLog1" Property="QtSetACEProcrunLog1" Value="[IcaclsVerb] "[SHIBBOLETHDIR]ProcRun\log" [IcaclsPost1]" />
- <CustomAction Id="SetACEProcrunLog2" Property="QtSetACEProcrunLog2" Value="[IcaclsVerb] "[SHIBBOLETHDIR]ProcRun\log" [IcaclsPost2] [ACE_USER]:F" />
+ <CustomAction Id="SetACEProcrunLog1" Property="QtSetACEProcrunLog1" Value="[IcaclsVerb] "[SHIBBOLETHDIR]ProcRun\log" /t /setowner Administrators" />
+ <CustomAction Id="SetACEProcrunLog2" Property="QtSetACEProcrunLog2" Value="[IcaclsVerb] "[SHIBBOLETHDIR]ProcRun\log" [IcaclsPost] [ACE_USER]:F" />
<CustomAction Id="QtSetACEProcrunLog1" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
<CustomAction Id="QtSetACEProcrunLog2" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
<InstallExecuteSequence>
<!-- Write the ACEs. IdP : conf, creds, logs -->
- <Custom Action="SetIcaclsPost1" Before="InstallFiles"/>
- <Custom Action="SetIcaclsPost2" Before="InstallFiles"/>
+ <Custom Action="SetIcaclsPost" Before="SetIcaclsVerb"/>
<Custom Action="SetIcaclsVerb" Before="InstallFiles"/>
- <Custom Action="SetACEConf1" After="SetIcaclsVerb"/>
- <Custom Action="SetACEConf2" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACEConf1" After="QtFinalizeJetty"/>
- <Custom Action="QtSetACEConf2" After="QtSetACEConf1"/>
-
- <Custom Action="SetACECreds1" After="SetIcaclsVerb"/>
- <Custom Action="SetACECreds2" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACECreds1" After="QtFinalizeJetty"/>
- <Custom Action="QtSetACECreds2" After="QtSetACECreds1"/>
-
- <Custom Action="SetACELogs1" After="SetIcaclsVerb"/>
- <Custom Action="SetACELogs2" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACELogs1" After="QtFinalizeJetty"/>
- <Custom Action="QtSetACELogs2" After="QtSetACELogs1"/>
-
- <!-- Write the ACEs. jetty : start.d, tmp, logs -->
- <Custom Action="SetACEJettyStart1" After="SetIcaclsVerb"/>
- <Custom Action="SetACEJettyStart2" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACEJettyStart1" After="QtFinalizeJetty"/>
- <Custom Action="QtSetACEJettyStart2" After="QtSetACEJettyStart1"/>
-
- <Custom Action="SetACEJettyTmp1" After="SetIcaclsVerb"/>
- <Custom Action="SetACEJettyTmp2" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACEJettyTmp1" After="QtFinalizeJetty"/>
- <Custom Action="QtSetACEJettyTmp2" After="QtSetACEJettyTmp1"/>
-
- <Custom Action="SetACEJettyLogs1" After="SetIcaclsVerb"/>
- <Custom Action="SetACEJettyLogs2" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACEJettyLogs1" After="QtFinalizeJetty"/>
- <Custom Action="QtSetACEJettyLogs2" After="QtSetACEJettyLogs1"/>
+ <Custom Action="SetACEIdpWith" After="InstallFiles">INSTALL_JETTYD_USER</Custom>
+ <Custom Action="SetACEIdpWithout" After="InstallFiles">NOT INSTALL_JETTYD_USER</Custom>
+ <Custom Action="QtSetACEIdP" After="QtFinalizeJetty"/>
+
+ <!-- Write the ACEs. jetty : tmp, logs -->
+ <Custom Action="SetACEJettyTmp" After="SetIcaclsVerb"/>
+ <Custom Action="QtSetACEJettyTmp" After="QtSetACEIdP"/>
+
+ <Custom Action="SetACEJettyLogs" After="SetIcaclsVerb"/>
+ <Custom Action="QtSetACEJettyLogs" After="QtSetACEIdP"/>
<!-- Write the ACEs. Procrun: log -->
<Custom Action="SetACEProcrunLog1" After="SetIcaclsVerb"/>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list