[cpp-sp] branch master updated: SSPCPP-778 - Fork configuration and address backward compatibility
Scott Cantor
cantor.2 at osu.edu
Wed Feb 14 17:15:20 EST 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=f0ab158cef722dec8a11bd97a8337aa34c169110
The following commit(s) were added to refs/heads/master by this push:
new f0ab158 SSPCPP-778 - Fork configuration and address backward compatibility
f0ab158 is described below
commit f0ab158cef722dec8a11bd97a8337aa34c169110
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 14 17:14:07 2018 -0500
SSPCPP-778 - Fork configuration and address backward compatibility
https://issues.shibboleth.net/jira/browse/SSPCPP-778
Rename of default configuration file.
---
configs/Makefile.am | 4 ++--
...xample-shibboleth2.xml => example-shibboleth3.xml} | 4 ++--
configs/{shibboleth2.xml => shibboleth3.xml} | 7 +++----
configs/{win-shibboleth2.xml => win-shibboleth3.xml} | 4 ++--
msi/WiX/MergeModules/Shibboleth-schemas.wxs | 3 +++
msi/WiX/ShibbolethSP-defs-x86.wxi | 4 ++--
msi/WiX/ShibbolethSP-noarch.wxs | 8 ++++----
msi/WiX/ShibbolethSP-properties.wxi | 4 ++--
msi/WiX/ShibbolethSP-registry-x64.wxs | 2 +-
msi/WiX/ShibbolethSP-registry-x86.wxs | 2 +-
msi/scripts/shib_edit_config_files.vbs-wix | 6 ++++--
shibboleth.spec.in | 19 ++++++++++++++++---
12 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/configs/Makefile.am b/configs/Makefile.am
index c5dcce0..906e107 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -35,13 +35,13 @@ BUILTCONFIGFILES = \
# While BUILTCONFIGFILES are processed, these are not; so we should pull
# them from SRCDIR.
CONFIGFILES = \
- shibboleth2.xml \
+ shibboleth3.xml \
attribute-map.xml \
attribute-policy.xml \
protocols.xml \
security-policy.xml \
example-metadata.xml \
- example-shibboleth2.xml \
+ example-shibboleth3.xml \
console.logger \
syslog.logger \
accessError.html \
diff --git a/configs/example-shibboleth2.xml b/configs/example-shibboleth3.xml
similarity index 99%
rename from configs/example-shibboleth2.xml
rename to configs/example-shibboleth3.xml
index 48d65c4..27f7ee4 100644
--- a/configs/example-shibboleth2.xml
+++ b/configs/example-shibboleth3.xml
@@ -1,5 +1,5 @@
-<SPConfig xmlns="urn:mace:shibboleth:2.0:native:sp:config"
- xmlns:conf="urn:mace:shibboleth:2.0:native:sp:config"
+<SPConfig xmlns="urn:mace:shibboleth:3.0:native:sp:config"
+ xmlns:conf="urn:mace:shibboleth:3.0:native:sp:config"
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
diff --git a/configs/shibboleth2.xml b/configs/shibboleth3.xml
similarity index 96%
rename from configs/shibboleth2.xml
rename to configs/shibboleth3.xml
index d1b0bf4..5e3f473 100644
--- a/configs/shibboleth2.xml
+++ b/configs/shibboleth3.xml
@@ -1,5 +1,5 @@
-<SPConfig xmlns="urn:mace:shibboleth:2.0:native:sp:config"
- xmlns:conf="urn:mace:shibboleth:2.0:native:sp:config"
+<SPConfig xmlns="urn:mace:shibboleth:3.0:native:sp:config"
+ xmlns:conf="urn:mace:shibboleth:3.0:native:sp:config"
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
@@ -21,8 +21,7 @@
<!-- The ApplicationDefaults element is where most of Shibboleth's SAML bits are defined. -->
<ApplicationDefaults entityID="https://sp.example.org/shibboleth"
- REMOTE_USER="eppn persistent-id targeted-id"
- cipherSuites="ECDHE+AESGCM:ECDHE:!aNULL:!eNULL:!LOW:!EXPORT:!RC4:!SHA:!SSLv2">
+ REMOTE_USER="eppn persistent-id targeted-id"">
<!--
Controls session lifetimes, address checks, cookie handling, and the protocol handlers.
diff --git a/configs/win-shibboleth2.xml b/configs/win-shibboleth3.xml
similarity index 98%
rename from configs/win-shibboleth2.xml
rename to configs/win-shibboleth3.xml
index 66fcafd..f6166b0 100644
--- a/configs/win-shibboleth2.xml
+++ b/configs/win-shibboleth3.xml
@@ -1,5 +1,5 @@
-<SPConfig xmlns="urn:mace:shibboleth:2.0:native:sp:config"
- xmlns:conf="urn:mace:shibboleth:2.0:native:sp:config"
+<SPConfig xmlns="urn:mace:shibboleth:3.0:native:sp:config"
+ xmlns:conf="urn:mace:shibboleth:3.0:native:sp:config"
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
index 37f7131..6b6e6ac 100644
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -57,6 +57,9 @@
<Component Id='native_sp_config.xsd' Guid='{5514B435-94AB-4A92-9737-0BEB78C146C8}'>
<File KeyPath='yes' Id='native_sp_config.xsd' Name='shibboleth-2.0-native-sp-config.xsd' />
</Component>
+ <Component Id='native_sp3_config.xsd' Guid='{88E6E195-F004-4104-B6B3-62317BF75E5C}'>
+ <File KeyPath='yes' Id='native_sp3_config.xsd' Name='shibboleth-3.0-native-sp-config.xsd' />
+ </Component>
<Component Id='native_sp_protocols.xsd' Guid='{AE42FFFB-1A59-4F1D-9935-15D727B99929}'>
<File KeyPath='yes' Id='native_sp_protocols.xsd' Name='shibboleth-2.0-native-sp-protocols.xsd' />
</Component>
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 9cc9ab1..1c2ea12 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -10,7 +10,7 @@
<ComponentRef Id="RELEASE.txt" />
<ComponentRef Id="example_metadata.xml" />
- <ComponentRef Id="example_shibboleth2.xml" />
+ <ComponentRef Id="example_shibboleth3.xml" />
<ComponentRef Id="keygen.bat" />
<ComponentRef Id="attrChecker.html" />
<ComponentRef Id="sslError.html" />
@@ -19,7 +19,7 @@
<ComponentRef Id="localLogout.html" />
<ComponentRef Id="attribute_map.xml" />
<ComponentRef Id="attribute_policy.xml" />
- <ComponentRef Id="shibboleth2.xml" />
+ <ComponentRef Id="shibboleth3.xml" />
<ComponentRef Id="console.logger" />
<ComponentRef Id="discoveryTemplate.html" />
<ComponentRef Id="postTemplate.html" />
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index c48ca3c..c70fc5a 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -53,8 +53,8 @@
<Component Id='example_metadata.xml' Guid='{D9852008-249D-405D-8059-5DAD307D2723}' Permanent='yes'>
<File KeyPath='yes' Name='example-metadata.xml' />
</Component>
- <Component Id='example_shibboleth2.xml' Guid='{85415A41-2B4E-406F-9CFC-63CFC360A9C7}' Permanent='yes'>
- <File KeyPath='yes' Name='example-shibboleth2.xml' />
+ <Component Id='example_shibboleth3.xml' Guid='{BD582026-0DB4-4664-A36F-0AC646596641}' Permanent='yes'>
+ <File KeyPath='yes' Name='example-shibboleth3.xml' />
</Component>
<Component Id='keygen.bat' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'>
<File KeyPath='yes' Name='keygen.bat'/>
@@ -90,8 +90,8 @@
<Component Id='attribute_policy.xml' Guid='{55B88F7B-E2EA-4B70-87B7-33C566B9F992}'>
<File KeyPath='yes' Name='attribute-policy.xml'/>
</Component>
- <Component Id='shibboleth2.xml' Guid='{E520FEDE-3F0E-47C6-9345-47223B82825A}'>
- <File KeyPath='yes' Name='shibboleth2.xml' Source='$(var.SPBuildDirectory)\cpp-sp\configs\win-shibboleth2.xml' />
+ <Component Id='shibboleth3.xml' Guid='{E7AA9D74-4A67-4FED-BEAB-6DCD2B2EB9FA}'>
+ <File KeyPath='yes' Name='shibboleth3.xml' Source='$(var.SPBuildDirectory)\cpp-sp\configs\win-shibboleth3.xml' />
</Component>
<Component Id='console.logger' Guid='{8AC85980-32B9-4EA2-9245-167FB1AB2570}'>
<File KeyPath='yes' Name='console.logger' />
diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index 0834701..99e4820 100644
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -28,8 +28,8 @@
<!-- Information for the properties page of the msi -->
<Property Id='ARPCONTACT' Value='contact at shibboleth.net' />
- <Property Id='ARPHELPLINK' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/Installation+and+Configuration' />
- <Property Id='ARPURLUPDATEINFO' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPWindowsUpgrade' />
+ <Property Id='ARPHELPLINK' Value='https://wiki.shibboleth.net/confluence/display/SP3/' />
+ <Property Id='ARPURLUPDATEINFO' Value='https://wiki.shibboleth.net/confluence/display/SP3/' />
<Property Id='ARPURLINFOABOUT' Value='http://shibboleth.net/' />
<!-- Do we want to force the ServiceStart to happen? -->
diff --git a/msi/WiX/ShibbolethSP-registry-x64.wxs b/msi/WiX/ShibbolethSP-registry-x64.wxs
index 51e6068..60d5561 100644
--- a/msi/WiX/ShibbolethSP-registry-x64.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x64.wxs
@@ -20,7 +20,7 @@
<!--
This is where we put all the architecture neutral bits of the
Shibboleth install. It turns out that it may not be all the
- architecture insenstive stuff since some GUIDS may have moved
+ architecture insensitive stuff since some GUIDS may have moved
-->
<Fragment>
diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
index c7c1a43..6d24435 100644
--- a/msi/WiX/ShibbolethSP-registry-x86.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x86.wxs
@@ -20,7 +20,7 @@
<!--
This is where we put all the architecture neutral bits of the
Shibboleth install. It turns out that it may not be all the
- architecture insenstive stuff since some GUIDS may have moved
+ architecture insensitive stuff since some GUIDS may have moved
-->
<Fragment>
<!-- Previous version search -->
diff --git a/msi/scripts/shib_edit_config_files.vbs-wix b/msi/scripts/shib_edit_config_files.vbs-wix
index d4feb11..bf8c8b3 100644
--- a/msi/scripts/shib_edit_config_files.vbs-wix
+++ b/msi/scripts/shib_edit_config_files.vbs-wix
@@ -144,8 +144,10 @@ if (Err = 0) then
'Now just copy the other non-edited files over as well (if possible)
- If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth2.xml")) then
- FileSystemObj.CopyFile DistDir & "shibboleth2.xml", ConfigDir, false
+ If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth3.xml")) then
+ If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth2.xml")) then
+ FileSystemObj.CopyFile DistDir & "shibboleth3.xml", ConfigDir, false
+ End If
End If
If (NOT FileSystemObj.FileExists(ConfigDir & "accessError.html")) then
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index a6fb4c8..11e5833 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -287,8 +287,15 @@ fi
# Fix ownership of log files (even on new installs, if they're left from an older one).
%{__chown} %{runuser}:%{runuser} %{_localstatedir}/log/shibboleth/* 2>/dev/null || :
+# On upgrades, check for shibboleth2.xml and remove shibboleth3.xml for compatibility.
+if [ $1 -gt 1 ] ; then
+ if [ -f %{_sysconfdir}/shibboleth/shibboleth2.xml ] ; then
+ %{__rm} %{_sysconfdir}/shibboleth/shibboleth3.xml
+ fi
+fi
+
%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
- if [ $1 -gt 1 ] ; then
+if [ $1 -gt 1 ] ; then
# On Red Hat with shib.conf installed, clean up old Alias commands
# by pointing them at new version-independent /usr/share/share tree.
# Any Aliases we didn't create we assume are custom files.
@@ -363,7 +370,7 @@ exit 0
/sbin/ldconfig
%endif
%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
- # On upgrade, restart components if they're already running.
+# On upgrade, restart components if they're already running.
%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
%systemd_postun_with_restart shibd.service
%else
@@ -427,7 +434,12 @@ exit 0
%dir %{_datadir}/shibboleth
%{_datadir}/shibboleth/*
%dir %{_sysconfdir}/shibboleth
-%config(noreplace) %{_sysconfdir}/shibboleth/*.xml
+%config(missingok, noreplace) %{_sysconfdir}/shibboleth/shibboleth3.xml
+%config(noreplace) %{_sysconfdir}/shibboleth/attribute-map.xml
+%config(noreplace) %{_sysconfdir}/shibboleth/attribute-policy.xml
+%config(noreplace) %{_sysconfdir}/shibboleth/example-metadata.xml
+%config(noreplace) %{_sysconfdir}/shibboleth/protocols.xml
+%config(noreplace) %{_sysconfdir}/shibboleth/security-policy.xml
%config(noreplace) %{_sysconfdir}/shibboleth/*.html
%config(noreplace) %{_sysconfdir}/shibboleth/*.logger
%if "%{_vendor}" == "redhat"
@@ -465,6 +477,7 @@ exit 0
* Tue Nov 21 2017 Scott Cantor <cantor.2 at osu.edu> - 3.0.0-1
- Bump dependency versions
- Require Xerces 3.2 as shipped by me on all platforms
+- Add logic to remove new config if upgrading with old config
* Tue May 03 2016 Scott Cantor <cantor.2 at osu.edu> - 2.6.0-1
- Bump opensaml dependency version
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list