[java-identity-provider] 03/06: IDP-1927 Make Jetty run under its own credentials for windows installs
Rod Widdowson
rdw at steadingsoftware.com
Fri Dec 9 14:51:37 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch maint-4
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=b617aea89f62942dc97dca8b7a7d4650c0b71825
commit b617aea89f62942dc97dca8b7a7d4650c0b71825
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Nov 1 10:12:03 2022 +0000
IDP-1927 Make Jetty run under its own credentials for windows installs
https://shibboleth.atlassian.net/browse/IDP-1927
GUI support
---
.../src/main/wix/ShibbolethIdP-install-dlg.wxs | 58 ++++++++++++++++------
.../src/main/wix/ShibbolethIdP-update-dlg.wxs | 37 ++++++++++++++
2 files changed, 81 insertions(+), 14 deletions(-)
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs b/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
index 0afa64d7c..3c5ab8f9e 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
@@ -28,7 +28,7 @@
<!-- This Dialog sets up:
- INSTALLDIR
- INSTALL_JETTY (and as a result turns the jetty feature on or off)
- - CONFIGURE_AD (and as a result selects the AD page or not)
+ - CONFIGURE_AD (and as a result selects the AD page or not)
-->
<Dialog Id="InstallDirDlgShib" Width="370" Height="270" Title="[ProductName] Setup">
@@ -41,22 +41,52 @@
<!-- Buttons to control Shibboleth Setup -->
<Control Id="DescriptionLine1" Type="Text" X="25" Y="51" Height="12" Width="320" Text="The files for [ProductName] will be installed in the following folder." />
- <Control Id="DescriptionLine2" Type="Text" X="25" Y="68" Height="12" Width="320" Text="To install into a different folder, click the Browse button, and select another folder." />
-
- <Control Id="DescriptionLine3" Type="Text" X="25" Y="85" Height="12" Width="320" Text="You can choose not to install [ProductName] by clicking Cancel to exit the installer." />
-
<!-- Where? -->
- <Control Id="Dest" Type="Edit" X="25" Y="102" Width="228" Height="17" Property="INSTALLDIR" Text="[INSTALLDIR]" />
- <Control Id="ChangeFolder" Type="PushButton" X="265" Y="102" Height="17" Width="56" Text="B&rowse...">
+ <Control Id="Dest" Type="Edit" X="25" Y="71" Width="228" Height="17" Property="INSTALLDIR" Text="[INSTALLDIR]" />
+ <Control Id="ChangeFolder" Type="PushButton" X="265" Y="71" Height="17" Width="56" Text="B&rowse...">
<Publish Event="SpawnDialog" Value="BrowseDlg" Order="1">1</Publish>
<Publish Event="[_BrowseProperty]" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
</Control>
<!-- Jetty? -->
- <Control Id="InstallJetty" Type="CheckBox" X="25" Y="128" Height="20" Width="60" Property="INSTALL_JETTY" CheckBoxValue="TRUE" Text="Install &Jetty"/>
- <!-- AD?=" -->
+ <Control Id="InstallJetty" Type="CheckBox" X="25" Y="92" Height="20" Width="60" Property="INSTALL_JETTY" CheckBoxValue="TRUE" Text="Install &Jetty"/>
+ <Control Id="InstallJettyD" Type="CheckBox" X="105" Y="92" Height="20" Width="60"
+ Property="INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" CheckBoxValue="TRUE" Text="Run As &User">
+ <Condition Action="hide">NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTY</Condition>
+ </Control>
+ <!-- AD? -->
+ <Control Id="ConfigureAD" Type="CheckBox" X="200" Y="92" Height="20" Width="150" Property="CONFIGURE_AD" CheckBoxValue="TRUE" Text="Configure for &Active Directory" />
- <Control Id="ConfigureAD" Type="CheckBox" X="185" Y="128" Height="20" Width="150" Property="CONFIGURE_AD" CheckBoxValue="TRUE" Text="Configure for &Active Directory" />
+ <!-- SHIBD_USER -->
+ <Control Id="DescriptionLine3A" Type="Text" X="25" Y="115" Height="20" Width="60" Text="User Domain">
+ <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
+ </Control>
+ <Control Id="Shibd_Domain" Type="Edit" X="85" Y="111" Height="17" Width="80"
+ Property="JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Text="[JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]">
+ <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
+ </Control>
+
+ <Control Id="DescriptionLine3B" Type="Text" X="25" Y="135" Height="20" Width="60" Text="Username">
+ <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
+ </Control>
+ <Control Id="Shibd_User" Type="Edit" X="85" Y="133" Height="17" Width="80"
+ Property="JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Text="[JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]">
+ <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
+ </Control>
+ <Control Id="DescriptionLine3C" Type="Text" X="180" Y="135" Height="20" Width="60" Text="Password">
+ <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
+ </Control>
+ <Control Id="Shibd_Pass" Type="Edit" X="250" Y="133" Height="17" Width="80"
+ Property="JETTYD_PASSWORD.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Password="yes">
+ <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
+ </Control>
<Control Id="DescriptionLine4" Type="Text" X="25" Y="158" Height="36" Width="150" Text="Choose the hostname (including domain) for this IdP. It will be used to generate the Certificates and Metadata" />
<Control Id="DnsName" Type="Edit" X="185" Y="160" Height="17" Width="150" Property="DNSNAME" Text="[DNSNAME]" />
@@ -81,14 +111,14 @@
NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"
</Publish>
<Publish Event="NewDialog" Value="VerifyReadyDlg">
- (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE" AND (INSTALL_JETTY OR (INSTALLDIR=DefaultInstallDir))
- </Publish>
+ (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE" AND (INSTALL_JETTY OR (INSTALLDIR=DefaultInstallDir))
+ </Publish>
<Publish Event="NewDialog" Value="WarnDirDlgShib">
(WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE" AND NOT (INSTALL_JETTY OR (INSTALLDIR=DefaultInstallDir))
- </Publish>
+ </Publish>
<Publish Event="NewDialog" Value="ConfigADDlg">
(WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD="TRUE"
- </Publish>
+ </Publish>
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs b/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs
index 7108ddf90..4667bd72a 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs
@@ -34,6 +34,43 @@
<!-- Jetty? -->
<Control Id="UpdateJetty" Type="CheckBox" X="25" Y="80" Height="17" Width="60" CheckBoxPropertyRef="INSTALL_JETTY" CheckBoxValue="TRUE" Text="Install Jetty"/>
+ <Control Id="UpdateDaemon" Type="CheckBox" X="105" Y="80" Height="20" Width="60"
+ CheckBoxPropertyRef="INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" CheckBoxValue="TRUE" Text="Run As &User">
+ <Condition Action="hide">NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTY</Condition>
+ </Control>
+
+ <!-- SHIBD_USER -->
+ <Control Id="UpdateDescriptionLine3A" Type="Text" X="25" Y="103" Height="20" Width="60" Text="User Domain">
+ <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
+ </Control>
+ <Control Id="UpdateShibd_Domain" Type="Edit" X="85" Y="99" Height="17" Width="80"
+ Property="JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Text="[JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]">
+ <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
+ </Control>
+
+ <Control Id="UpdateDescriptionLine3B" Type="Text" X="25" Y="123" Height="20" Width="60" Text="Username">
+ <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
+ </Control>
+ <Control Id="UpdateShibd_User" Type="Edit" X="85" Y="121" Height="17" Width="80"
+ Property="JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Text="[JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]">
+ <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
+ </Control>
+ <Control Id="UpdateDescriptionLine3C" Type="Text" X="180" Y="123" Height="20" Width="60" Text="Password">
+ <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
+ </Control>
+ <Control Id="UpdateShibd_Pass" Type="Edit" X="250" Y="121" Height="17" Width="80"
+ Property="JETTYD_PASSWORD.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Password="yes">
+ <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
+ <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
+ </Control>
+
+
<!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list