[java-identity-provider] branch master updated: IDP-1176 IDP-1123 Clean Dialog and align Entity ID with non Windows

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=ddf45a33af13fa629db79387cbce685580d1922e

The following commit(s) were added to refs/heads/master by this push:
       new  ddf45a3   IDP-1176 IDP-1123 Clean Dialog and align Entity ID with non Windows
ddf45a3 is described below

commit ddf45a33af13fa629db79387cbce685580d1922e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu May 3 14:52:11 2018 +0100

    IDP-1176 IDP-1123 Clean Dialog and align Entity ID with non Windows
    
    https://issues.shibboleth.net/jira/browse/IDP-1176
    https://issues.shibboleth.net/jira/browse/IDP-1123
---
 idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs  |  4 ++--
 idp-installer/src/main/wix/scripts/shib_write_configs.vbs | 15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs b/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
index c4265e3..a164563 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
@@ -59,10 +59,10 @@
 
                 <Control Id="ConfigureAD" Type="CheckBox" X="185" Y="128" Height="20" Width="150" Property="CONFIGURE_AD" CheckBoxValue="TRUE" Text="Configure for &Active Directory" />
 
-                <Control Id="DescriptionLine4" Type="Text" X="25" Y="158" Height="36" Width="150" Text="Choose the DNS name for this IdP.  It will be used to generate the EntityID, Certificates and Metadata" />
+                <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]" />
 
-                <Control Id="DescriptionLine5" Type="Text" X="25" Y="200" Height="20" Width="150" Text="Choose the scope that this IdP will assert. " />
+                <Control Id="DescriptionLine5" Type="Text" X="25" Y="198" Height="36" Width="150" Text="Choose the scope that this IdP will assert. If present this will be used to create the EntityID " />
                 <Control Id="IdpScope" Type="Edit" X="185" Y="200" Height="17" Width="150" Property="IDP_SCOPE" Text="[IDP_SCOPE]" />
 
                 <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
diff --git a/idp-installer/src/main/wix/scripts/shib_write_configs.vbs b/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
index 271ec54..e2435eb 100644
--- a/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
+++ b/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
@@ -2,7 +2,7 @@
 ' Code taken from the Shib SP install
 '
 Dim FileSystemObj, AntFile, PropsFile, JettyFile, JettyAntFile, LogFile
-Dim CustomData, msiProperties, InstallDir, IdPScope, DebugInstall
+Dim CustomData, msiProperties, InstallDir, IdPScope, DebugInstall, Domain
 Dim ConfigureAd, AdDomain, AdUser, AdPass, AdUseGC, LDAPFile, LDAPPort
 Dim LDAPSearchPath
 
@@ -28,6 +28,11 @@ InstallDirWindows = Replace(InstallDirJava, "/", "\\")
 IdPHostName = LCase(msiProperties(1))
 InstallJetty = LCase(msiProperties(2))
 IdPScope = LCase(msiProperties(3))
+if IdPScope = "" then
+   Domain = IdPHostName
+else
+   Domain = IdPScope
+end if
 DebugInstall = LCase(msiProperties(4))
 ConfigureAd = LCase(msiProperties(5))
 if ConfigureAd = "true" then
@@ -39,6 +44,8 @@ end if
 
 LogFile.WriteLine "Installing to " & InstallDirJava
 LogFile.WriteLine "Host " & IdPHostName
+LogFile.WriteLine "Domain " & Domain
+LogFile.WriteLine "Scope " & IdPScope
 LogFile.WriteLine "IntallJetty" & InstallJetty
 
 KeyStorePassword=left(CreateObject("Scriptlet.TypeLib").Guid, 38)
@@ -52,7 +59,7 @@ if (Err.Number = 0 ) then
     AntFile.WriteLine "#"
     AntFile.WriteLine "idp.noprompt=yes"
     AntFile.WriteLine "idp.host.name=" & IdpHostName
-    AntFile.WriteLine "idp.uri.subject.alt.name=https://" & IdpHostName & "/idp/shibboleth"
+    AntFile.WriteLine "idp.uri.subject.alt.name=https://" & Domain & "/idp"
     AntFile.WriteLine "idp.keystore.password=" & KeyStorePassword
     AntFile.WriteLine "idp.sealer.password=" & SealerPassword
     AntFile.WriteLine "idp.target.dir=" & InstallDirJava 
@@ -79,7 +86,7 @@ if (Err.Number = 0 ) then
     PropsFile.WriteLine "#"
     PropsFile.WriteLine "# File to be merged into idp.properties"
     PropsFile.WriteLine "#"
-    PropsFile.WriteLine "idp.entityID=https://" & IdpHostName & "/idp/shibboleth"
+    PropsFile.WriteLine "idp.entityID=https://" & Domain & "/idp"
     PropsFile.WriteLine "idp.sealer.storePassword=" & SealerPassword
     PropsFile.WriteLine "idp.sealer.keyPassword=" & SealerPassword
     if (IdPScope <> "") then
@@ -99,7 +106,7 @@ if (InstallJetty <> "") then
 	JettyAntFile.WriteLine "jetty.merge.properties="& InstallDirJava & "/jetty.install.replace.properties"
 	JettyAntFile.WriteLine "idp.host.name=" & IdpHostName
 	JettyAntFile.WriteLine "idp.keystore.password=" & SsoStorePassword
-	JettyAntFile.WriteLine "idp.uri.subject.alt.name=https://" & IdpHostName & "/idp/shibboleth"
+	JettyAntFile.WriteLine "idp.uri.subject.alt.name=https://" & Domain & "/idp"
 	JettyAntFile.WriteLine "idp.target.dir=" & InstallDirJava 
         if (DebugInstall <> "") then
 	    JettyAntFile.WriteLine "jetty.no.tidy=true"

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