[shibboleth-sp2] 11/89: Remove long outdated style sheet for config migration.
Ferenc Wágner
wferi at moszumanska.debian.org
Thu Sep 1 09:24:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
wferi pushed a commit to branch master
in repository shibboleth-sp2.
commit 813ecb58c6e39ee28797cdc4842f9d091011db0b
Author: Scott Cantor <cantor.2 at osu.edu>
Date: Tue May 3 14:34:01 2016 -0400
Remove long outdated style sheet for config migration.
---
Projects/vc10/Shibboleth.sln | 14 +-
configs/Makefile.am | 5 +-
configs/upgrade.xsl | 461 ----------------------------------------
configs/xsltproc.js | 45 ----
msi/WiX/ShibbolethSP-noarch.wxs | 6 -
5 files changed, 8 insertions(+), 523 deletions(-)
diff --git a/Projects/vc10/Shibboleth.sln b/Projects/vc10/Shibboleth.sln
index f30dd9d..9c6a4ba 100644
--- a/Projects/vc10/Shibboleth.sln
+++ b/Projects/vc10/Shibboleth.sln
@@ -1,5 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2010
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server Modules", "Server Modules", "{26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}"
@@ -68,9 +70,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{2543BC
..\..\configs\shibd.logger.in = ..\..\configs\shibd.logger.in
..\..\configs\sslError.html = ..\..\configs\sslError.html
..\..\configs\syslog.logger = ..\..\configs\syslog.logger
- ..\..\configs\upgrade.xsl = ..\..\configs\upgrade.xsl
..\..\configs\win-shibboleth2.xml = ..\..\configs\win-shibboleth2.xml
- ..\..\configs\xsltproc.js = ..\..\configs\xsltproc.js
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{31B171C1-E06C-464F-A541-38724AB52D79}"
@@ -350,17 +350,17 @@ Global
{68E9568B-476C-4289-B93C-893432378ADC} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
{1396D80A-8672-4224-9B02-95F3F4207CDB} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
{B44C0852-83B8-4FB2-A86E-097C9C8256D0} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
- {B44C0852-83B8-4FB2-A86E-097C9C8256D1} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
{666A63A7-983F-4C19-8411-207F24305197} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
{26D4FABF-ACDE-4947-9C4A-7AE1B50CD83A} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
{26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
- {666A63A7-983F-4C19-8411-207F24305198} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
- {A2140D6E-C2C6-4329-84E3-2F530CEBE445} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
- {A2140D6E-C2C6-4329-84E3-2F530CEBE442} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
{F13141B6-6C87-40BB-8D4E-5CC56EBB4C5A} = {FED80230-119E-4B2F-9F53-D2660A5F022B}
{F13141B6-6C87-40BB-8D4E-5CC56EBB4C59} = {FED80230-119E-4B2F-9F53-D2660A5F022B}
{8CF7DDFA-EAA0-416E-853E-3DCB210C4AE0} = {8E1AF2CF-24E1-4983-8681-394D89DF9AD2}
{B2423DCE-048D-4BAA-9AB9-F5D1FCDD3D25} = {8E1AF2CF-24E1-4983-8681-394D89DF9AD2}
+ {666A63A7-983F-4C19-8411-207F24305198} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
+ {A2140D6E-C2C6-4329-84E3-2F530CEBE445} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
+ {B44C0852-83B8-4FB2-A86E-097C9C8256D1} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
+ {A2140D6E-C2C6-4329-84E3-2F530CEBE442} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
{EFF65B5B-85AB-4FD5-A217-7E6CA4219951} = {BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}
{C2B1BB79-C88B-42B4-9AEC-170F91910F70} = {BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}
EndGlobalSection
diff --git a/configs/Makefile.am b/configs/Makefile.am
index 31154b1..c5dcce0 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -22,8 +22,7 @@ pkgsysconf_DATA = \
apache22.config \
apache24.config \
keygen.sh \
- metagen.sh \
- upgrade.xsl
+ metagen.sh
# The config files are installed "special". Unlike the entries in
# pkgsysconf_DATA, these files are installed as "foo.dist" and only
@@ -173,6 +172,4 @@ EXTRA_DIST = \
metagen.sh \
SetService32.bat \
SetService64.bat \
- upgrade.xsl \
- xsltproc.js \
$(CONFIGFILES)
diff --git a/configs/upgrade.xsl b/configs/upgrade.xsl
deleted file mode 100644
index a5d8ad6..0000000
--- a/configs/upgrade.xsl
+++ /dev/null
@@ -1,461 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
- xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:oldconf="urn:mace:shibboleth:target:config:1.0"
- xmlns:cred="urn:mace:shibboleth:credentials:1.0"
- xmlns:conf="urn:mace:shibboleth:2.0:native:sp:config"
- xmlns="urn:mace:shibboleth:2.0:native:sp:config"
- exclude-result-prefixes="oldconf cred">
-
- <xsl:param name="idp"/>
-
- <!--Force UTF-8 encoding for the output.-->
- <xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8"/>
-
- <xsl:variable name="spaces" select="string(' ')"/>
-
- <xsl:template match="/">
- <xsl:apply-templates/>
- </xsl:template>
-
- <xsl:template match="oldconf:SPConfig">
- <xsl:text>
</xsl:text>
- <SPConfig logger="{@logger}" clockSkew="{@clockSkew}">
- <xsl:text>
</xsl:text>
- <xsl:comment>
- <xsl:text> Generated by upgrade utility: check carefully before deploying. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <xsl:apply-templates select="oldconf:Global"/>
- <xsl:text>
</xsl:text>
- <xsl:apply-templates select="oldconf:Local"/>
- <xsl:text>
</xsl:text>
- <xsl:apply-templates select="oldconf:Global/oldconf:UnixListener"/>
- <xsl:apply-templates select="oldconf:Global/oldconf:TCPListener"/>
- <xsl:text>
</xsl:text>
- <xsl:comment>
- <xsl:text> This set of components stores sessions and other persistent data in daemon memory. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <StorageService type="Memory" id="mem" cleanupInterval="900"/>
- <xsl:text>
</xsl:text>
- <SessionCache type="StorageService" StorageService="mem" cacheTimeout="{oldconf:Global/oldconf:MemorySessionCache/@cacheTimeout}" inprocTimeout="900" cleanupInterval="900"/>
- <xsl:text>
</xsl:text>
- <ReplayCache StorageService="mem"/>
- <xsl:text>
</xsl:text>
- <ArtifactMap artifactTTL="180"/>
- <xsl:text>
</xsl:text>
- <xsl:comment>
- <xsl:text> This set of components stores sessions and other persistent data in an ODBC database. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <xsl:comment>
- <xsl:text>
- <StorageService type="ODBC" id="db" cleanupInterval="900">
- <ConnectionString>DRIVER=drivername;SERVER=dbserver;UID=shibboleth;PWD=password;DATABASE=shibboleth;APP=Shibboleth</ConnectionString>
- </StorageService>
- <SessionCache type="StorageService" StorageService="db" cacheTimeout="3600" inprocTimeout="900" cleanupInterval="900"/>
- <ReplayCache StorageService="db"/>
- <ArtifactMap StorageService="db" artifactTTL="180"/>
- </xsl:text>
- </xsl:comment>
- <xsl:apply-templates select="oldconf:Local/oldconf:RequestMapProvider"/>
- <xsl:apply-templates select="oldconf:Applications"/>
-
- <xsl:text>
</xsl:text>
- <xsl:comment>
- <xsl:text> Policies that determine how to process and authenticate runtime messages. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <SecurityPolicyProvider type="XML" validate="true" path="security-policy.xml"/>
- <xsl:text>
</xsl:text>
- </SPConfig>
- </xsl:template>
-
- <!-- Turn <Global> into <OutOfProcess> with the ODBC extension commented out. -->
- <xsl:template match="oldconf:Global">
- <xsl:text>
</xsl:text>
- <OutOfProcess logger="{@logger}">
- <xsl:text>
</xsl:text>
- <xsl:comment>
- <xsl:text>
- <Extensions>
- <Library path="odbc-store.so" fatal="true"/>
- </Extensions>
- </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- </OutOfProcess>
- <xsl:text>
</xsl:text>
- </xsl:template>
-
- <!-- Turn <Local> into <InProcess> with the <ISAPI> element up a level. -->
- <xsl:template match="oldconf:Local">
- <xsl:text>
</xsl:text>
- <InProcess logger="{@logger}">
- <xsl:if test="@unsetHeaderValue">
- <xsl:attribute name="unsetHeaderValue"><xsl:value-of select="@unsetHeaderValue"/></xsl:attribute>
- </xsl:if>
- <xsl:apply-templates select="oldconf:Implementation/oldconf:ISAPI"/>
- <xsl:text>
</xsl:text>
- </InProcess>
- <xsl:text>
</xsl:text>
- </xsl:template>
- <xsl:template match="oldconf:ISAPI">
- <xsl:text>
</xsl:text>
- <ISAPI>
- <xsl:apply-templates select="@*"/>
- <xsl:for-each select="oldconf:Site">
- <xsl:text>
</xsl:text>
- <Site>
- <xsl:apply-templates select="@*"/>
- <xsl:for-each select="oldconf:Alias">
- <xsl:text>
</xsl:text>
- <Alias><xsl:value-of select="text()"/></Alias>
- </xsl:for-each>
- <xsl:text>
</xsl:text>
- </Site>
- </xsl:for-each>
- <xsl:text>
</xsl:text>
- </ISAPI>
- </xsl:template>
-
- <!-- Pull in listeners up to the top level. -->
- <xsl:template match="oldconf:UnixListener">
- <xsl:text>
</xsl:text>
- <UnixListener address="shibd.sock"/>
- <xsl:text>
</xsl:text>
- </xsl:template>
- <xsl:template match="oldconf:TCPListener">
- <xsl:text>
</xsl:text>
- <TCPListener address="{@address}" port="{@port}" acl="{@acl}"/>
- <xsl:text>
</xsl:text>
- </xsl:template>
-
- <!-- Transplant old RequestMap into the new namespace, but just copy all the settings. -->
- <xsl:template match="oldconf:RequestMapProvider">
- <xsl:text>
</xsl:text>
- <RequestMapper type="Native">
- <xsl:text>
</xsl:text>
- <xsl:apply-templates select="./*">
- <xsl:with-param name="indent">8</xsl:with-param>
- </xsl:apply-templates>
- <xsl:text> </xsl:text>
- </RequestMapper>
- <xsl:text>
</xsl:text>
- </xsl:template>
-
- <xsl:template match="oldconf:Applications">
- <xsl:text>
</xsl:text>
- <ApplicationDefaults id="{@id}" policyId="default" entityID="{@providerId}" homeURL="{@homeURL}" REMOTE_USER="eppn persistent-id targeted-id" signing="false" encryption="false">
- <xsl:attribute name="timeout"><xsl:value-of select="../oldconf:Global/oldconf:MemorySessionCache/@AATimeout"/></xsl:attribute>
- <xsl:attribute name="connectTimeout"><xsl:value-of select="../oldconf:Global/oldconf:MemorySessionCache/@AAConnectTimeout"/></xsl:attribute>
- <xsl:if test="oldconf:CredentialUse/@TLS!=../oldconf:CredentialsProvider/cred:Credentials/cred:FileResolver[1]/@Id">
- <xsl:attribute name="keyName"><xsl:value-of select="oldconf:CredentialUse/@TLS"/></xsl:attribute>
- </xsl:if>
- <xsl:if test="oldconf:CredentialUse/@signedAssertions">
- <xsl:attribute name="requireSignedAssertions"><xsl:value-of select="oldconf:CredentialUse/@signedAssertions"/></xsl:attribute>
- </xsl:if>
- <xsl:text>
</xsl:text>
- <xsl:apply-templates select="oldconf:Sessions"/>
- <xsl:apply-templates select="oldconf:Errors"/>
- <xsl:apply-templates select="oldconf:CredentialUse"/>
- <xsl:text>
</xsl:text>
- <MetadataProvider type="Chaining">
- <xsl:for-each select="oldconf:MetadataProvider|oldconf:FederationProvider">
- <xsl:text>
</xsl:text>
- <MetadataProvider type="XML" file="{@uri}"/>
- </xsl:for-each>
- <xsl:text>
</xsl:text>
- </MetadataProvider>
- <xsl:text>
</xsl:text>
- <xsl:comment>
- <xsl:text> Chain the two built-in trust engines together. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <TrustEngine type="Chaining">
- <xsl:text>
</xsl:text>
- <TrustEngine type="ExplicitKey"/>
- <xsl:text>
</xsl:text>
- <TrustEngine type="PKIX"/>
- <xsl:text>
</xsl:text>
- </TrustEngine>
- <xsl:text>
</xsl:text>
- <xsl:comment>
- <xsl:text> Map to extract attributes from SAML assertions. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <AttributeExtractor type="XML" path="attribute-map.xml"/>
- <xsl:text>
</xsl:text>
- <xsl:comment>
- <xsl:text> Use a SAML query if no attributes are supplied during SSO. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <AttributeResolver type="Query"/>
- <xsl:text>
</xsl:text>
- <xsl:comment>
- <xsl:text> Default filtering policy for recognized attributes, lets other data pass. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <AttributeFilter type="XML" path="attribute-policy.xml"/>
- <xsl:text>
</xsl:text>
-
- <!-- Step up and pull in credentials from the top level. -->
- <xsl:apply-templates select="../oldconf:CredentialsProvider"/>
-
- <xsl:for-each select="oldconf:Application">
- <xsl:text>
</xsl:text>
- <ApplicationOverride id="{@id}" entityID="{@providerId}" homeURL="{@homeURL}">
- <xsl:apply-templates select="oldconf:Sessions"/>
- <xsl:apply-templates select="oldconf:Errors"/>
- <xsl:apply-templates select="oldconf:CredentialUse"/>
- <xsl:if test="count(oldconf:MetadataProvider) + count(oldconf:FederationProvider) > 0">
- <xsl:text>
</xsl:text>
- <MetadataProvider type="Chaining">
- <xsl:for-each select="oldconf:MetadataProvider|oldconf:FederationProvider">
- <xsl:text>
</xsl:text>
- <MetadataProvider type="XML" file="{@uri}"/>
- </xsl:for-each>
- <xsl:text>
</xsl:text>
- </MetadataProvider>
- </xsl:if>
- <xsl:text>
</xsl:text>
- </ApplicationOverride>
- </xsl:for-each>
-
- <xsl:text>
</xsl:text>
- </ApplicationDefaults>
- </xsl:template>
-
- <xsl:template match="oldconf:Sessions">
- <xsl:text>
</xsl:text>
- <Sessions exportLocation="http://localhost/{@handlerURL}/GetAssertion">
- <xsl:apply-templates select="@*"/>
- <xsl:text>
</xsl:text>
- <xsl:comment>
- <xsl:text>
- SessionInitiators handle session requests and relay them to a Discovery page,
- or to an IdP if possible. Automatic session setup will use the default or first
- element (or requireSessionWith can specify a specific one to use).
- </xsl:text>
- </xsl:comment>
- <xsl:for-each select="oldconf:SessionInitiator">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- <xsl:text>
</xsl:text>
- <xsl:comment>
- <xsl:text>
- md:AssertionConsumerService locations handle specific SSO protocol bindings,
- such as SAML 2.0 POST or SAML 1.1 Artifact. The isDefault and index attributes
- are used when sessions are initiated to determine how to tell the IdP where and
- how to return the response.
- </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <md:AssertionConsumerService Location="/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
- <xsl:text>
</xsl:text>
- <md:AssertionConsumerService Location="/SAML2/POST-SimpleSign" index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"/>
- <xsl:text>
</xsl:text>
- <md:AssertionConsumerService Location="/SAML2/Artifact" index="3" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"/>
- <xsl:text>
</xsl:text>
- <md:AssertionConsumerService Location="/SAML2/ECP" index="4" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"/>
- <xsl:text>
</xsl:text>
- <md:AssertionConsumerService Location="/SAML/POST" index="5" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"/>
- <xsl:text>
</xsl:text>
- <md:AssertionConsumerService Location="/SAML/Artifact" index="6" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"/>
- <xsl:text>
</xsl:text>
-
- <!-- Turn the old local SLO location into the new LogoutInitiator location. -->
- <xsl:variable name="LogoutLocation">
- <xsl:choose>
- <xsl:when test="md:SingleLogoutService[1]">
- <xsl:value-of select="md:SingleLogoutService[1]/@Location"/>
- </xsl:when>
- <xsl:otherwise>/Logout</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:comment>
- <xsl:text> LogoutInitiators enable SP-initiated local or global/single logout of sessions. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <LogoutInitiator type="Chaining" Location="{$LogoutLocation}" relayState="cookie">
- <xsl:text>
</xsl:text>
- <LogoutInitiator type="SAML2" template="bindingTemplate.html"/>
- <xsl:text>
</xsl:text>
- <LogoutInitiator type="Local"/>
- <xsl:text>
</xsl:text>
- </LogoutInitiator>
- <xsl:text>
</xsl:text>
-
- <xsl:comment>
- <xsl:text> md:SingleLogoutService locations handle single logout (SLO) protocol messages. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <md:SingleLogoutService Location="/SLO/SOAP" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"/>
- <xsl:text>
</xsl:text>
- <md:SingleLogoutService Location="/SLO/Redirect" conf:template="bindingTemplate.html" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
- <xsl:text>
</xsl:text>
- <md:SingleLogoutService Location="/SLO/POST" conf:template="bindingTemplate.html" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
- <xsl:text>
</xsl:text>
- <md:SingleLogoutService Location="/SLO/Artifact" conf:template="bindingTemplate.html" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"/>
- <xsl:text>
</xsl:text>
-
- <xsl:comment>
- <xsl:text> md:ManageNameIDService locations handle NameID management (NIM) protocol messages. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <md:ManageNameIDService Location="/NIM/SOAP" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"/>
- <xsl:text>
</xsl:text>
- <md:ManageNameIDService Location="/NIM/Redirect" conf:template="bindingTemplate.html" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
- <xsl:text>
</xsl:text>
- <md:ManageNameIDService Location="/NIM/POST" conf:template="bindingTemplate.html" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
- <xsl:text>
</xsl:text>
- <md:ManageNameIDService Location="/NIM/Artifact" conf:template="bindingTemplate.html" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"/>
- <xsl:text>
</xsl:text>
-
- <xsl:comment>
- <xsl:text>
- md:ArtifactResolutionService locations resolve artifacts issued when using the
- SAML 2.0 HTTP-Artifact binding on outgoing messages, generally uses SOAP.
- </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <md:ArtifactResolutionService Location="/Artifact/SOAP" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"/>
- <xsl:text>
</xsl:text>
-
- <xsl:comment>
- <xsl:text> Extension service that generates "approximate" metadata based on SP configuration. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <Handler type="MetadataGenerator" Location="/Metadata" signing="false"/>
- <xsl:text>
</xsl:text>
-
- <xsl:comment>
- <xsl:text> Status reporting service. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <Handler type="Status" Location="Status" acl="127.0.0.1"/>
- <xsl:text>
</xsl:text>
-
- <xsl:comment>
- <xsl:text> Session diagnostic service. </xsl:text>
- </xsl:comment>
- <xsl:text>
</xsl:text>
- <Handler type="Session" Location="/Session"/>
- <xsl:text>
</xsl:text>
- </Sessions>
- <xsl:text>
</xsl:text>
- </xsl:template>
-
- <xsl:template match="oldconf:SessionInitiator">
- <xsl:text>
</xsl:text>
- <SessionInitiator type="Chaining" Location="{@Location}" acsByIndex="false" relayState="cookie">
- <xsl:if test="@id">
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
- </xsl:if>
- <xsl:if test="@isDefault">
- <xsl:attribute name="isDefault"><xsl:value-of select="@isDefault"/></xsl:attribute>
- </xsl:if>
- <xsl:if test="@Location=../oldconf:SessionInitiator[1]/@Location">
- <xsl:if test="$idp">
- <xsl:attribute name="entityID"><xsl:value-of select="$idp"/></xsl:attribute>
- </xsl:if>
- </xsl:if>
- <xsl:text>
</xsl:text>
- <SessionInitiator type="SAML2" acsIndex="1" ECP="true" template="bindingTemplate.html"/>
- <xsl:text>
</xsl:text>
- <SessionInitiator type="Shib1" acsIndex="5"/>
- <xsl:if test="@wayfURL">
- <xsl:if test="@wayfBinding='urn:mace:shibboleth:1.0:profiles:AuthnRequest'">
- <xsl:text>
</xsl:text>
- <SessionInitiator type="WAYF" URL="{@wayfURL}"/>
- </xsl:if>
- </xsl:if>
- <xsl:text>
</xsl:text>
- </SessionInitiator>
- </xsl:template>
-
- <!-- Map <Errors> element across, adding logout templates. -->
- <xsl:template match="oldconf:Errors">
- <xsl:text>
</xsl:text>
- <Errors>
- <xsl:apply-templates select="@*"/>
- <xsl:text>
</xsl:text>
- </Errors>
- <xsl:text>
</xsl:text>
- </xsl:template>
-
- <!-- Map <CredentialUse> element content into relying party overrides. -->
- <xsl:template match="oldconf:CredentialUse">
- <xsl:for-each select="oldconf:RelyingParty">
- <xsl:if test="@TLS">
- <xsl:text>
</xsl:text>
- <RelyingParty Name="{@Name}" keyName="{@TLS}"/>
- </xsl:if>
- </xsl:for-each>
- </xsl:template>
-
- <!-- Map legacy <FileResolver> elements to CredentialResolver plugins. -->
- <xsl:template match="oldconf:CredentialsProvider">
- <xsl:choose>
- <xsl:when test="count(//cred:FileResolver) > 1">
- <xsl:text> </xsl:text>
- <CredentialResolver type="Chaining">
- <xsl:text>
</xsl:text>
- <xsl:apply-templates select="//cred:FileResolver">
- <xsl:with-param name="indent">12</xsl:with-param>
- </xsl:apply-templates>
- <xsl:text> </xsl:text>
- </CredentialResolver>
- <xsl:text>
</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="//cred:FileResolver">
- <xsl:with-param name="indent">8</xsl:with-param>
- </xsl:apply-templates>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <xsl:template match="cred:FileResolver">
- <xsl:param name="indent"/>
- <xsl:value-of select="substring($spaces,0,$indent+1)"/>
- <CredentialResolver type="File" key="{cred:Key/cred:Path/text()}" certificate="{cred:Certificate/cred:Path/text()}" keyName="{@Id}"/>
- <xsl:text>
</xsl:text>
- </xsl:template>
-
- <!-- Generic rule to pass through all element node content while converting the namespace. -->
- <xsl:template match="oldconf:RequestMap|oldconf:Host|oldconf:HostRegex|oldconf:Path|oldconf:PathRegex|oldconf:htaccess|oldconf:AccessControl|oldconf:AND|oldconf:OR|oldconf:NOT">
- <xsl:param name="indent"/>
- <xsl:value-of select="substring($spaces,0,$indent+1)"/>
- <xsl:element name="{name()}">
- <xsl:apply-templates select="@*"/>
- <xsl:text>
</xsl:text>
- <xsl:apply-templates select="./*">
- <xsl:with-param name="indent" select="$indent + 4"/>
- </xsl:apply-templates>
- <xsl:value-of select="substring($spaces,0,$indent+1)"/>
- </xsl:element>
- <xsl:text>
</xsl:text>
- </xsl:template>
-
- <!-- Generic rule to pass through all attributes plus text content while converting the namespace. -->
- <xsl:template match="oldconf:Rule">
- <xsl:param name="indent"/>
- <xsl:value-of select="substring($spaces,0,$indent+1)"/>
- <xsl:element name="{name()}">
- <xsl:apply-templates select="@*"/>
- <xsl:value-of select="text()"/>
- </xsl:element>
- <xsl:text>
</xsl:text>
- </xsl:template>
-
- <!-- Generic rule to pass through an attribute unmodified. -->
- <xsl:template match="@*">
- <xsl:attribute name="{name()}"><xsl:value-of select="."/></xsl:attribute>
- </xsl:template>
-
- <!-- Strips additional text nodes out of document. -->
- <xsl:template match="text()"/>
-
-</xsl:stylesheet>
diff --git a/configs/xsltproc.js b/configs/xsltproc.js
deleted file mode 100644
index d6a9b75..0000000
--- a/configs/xsltproc.js
+++ /dev/null
@@ -1,45 +0,0 @@
-var oArgs = WScript.Arguments;
-
-if (oArgs.length < 2) {
- WScript.Echo("usage: cscript xsltproc.js xml xsl");
- WScript.Quit();
-}
-
-xslFile = oArgs(0);
-xmlFile = oArgs(1);
-
-var xml = new ActiveXObject("MSXML2.DOMDocument.5.0");
-var xsl = new ActiveXObject("MSXML2.FreeThreadedDOMDocument.5.0");
-var xslTemplate = new ActiveXObject("MSXML2.XSLTemplate.5.0");
-
-xml.validateOnParse = false;
-xml.async = false;
-xml.load(xmlFile);
-
-if (xml.parseError.errorCode != 0)
- WScript.Echo("XML Parse Error: " + xml.parseError.reason);
-
-xsl.async = false;
-xsl.load(xslFile);
-
-if (xsl.parseError.errorCode != 0)
- WScript.Echo("XSL Parse Error: " + xsl.parseError.reason);
-
-xslTemplate.stylesheet = xsl;
-var xslProcessor = xslTemplate.createProcessor();
-xslProcessor.input = xml;
-
-try {
- var writer = new ActiveXObject("MSXML2.MXXMLWriter.5.0");
- xslProcessor.output = writer;
-
- for (i=2; i<oArgs.length; i=i+2) {
- xslProcessor.addParameter(oArgs(i), oArgs(i+1));
- }
-
- xslProcessor.transform();
- WScript.Echo(writer.output);
-}
-catch(err) {
- WScript.Echo("Transformation Error: " + err.number + "*" + err.description);
-}
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 4d746fb..406a173 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -50,9 +50,6 @@
</Directory><!-- doc -->
<Directory Id='etc' Name='etc' >
<Directory Id='etc_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>
- <Component Id='upgrade.xsl' Guid='{D8D1270C-2F85-4465-8EC0-F5F30A2B3EDD}'>
- <File KeyPath='yes' Name='upgrade.xsl' />
- </Component>
<Component Id='example_metadata.xml' Guid='{D9852008-249D-405D-8059-5DAD307D2723}' Permanent='yes'>
<File KeyPath='yes' Name='example-metadata.xml' />
</Component>
@@ -62,9 +59,6 @@
<Component Id='keygen.bat' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'>
<File KeyPath='yes' Name='keygen.bat'/>
</Component>
- <Component Id='xsltproc.js' Guid='{B87F4A53-3C37-45DA-BE6F-C46790FA7C2D}'>
- <File KeyPath='yes' Name='xsltproc.js' />
- </Component>
<Directory Id='etc_shibboleth_dist' Name='dist' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>
<Component Id='apache.config.in' Guid='{AF4EB2B1-2489-4E39-A89E-1CA7AC2B7483}'>
<File KeyPath='yes' Name='apache.config.in' />
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list