[cpp-sp] branch main updated: Remove some dead config files.

Scott Cantor cantor.2 at osu.edu
Fri Nov 1 16:46:40 UTC 2024


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

scantor pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=8e535cd4eeb4e9c28fb17229593e64ff315769f7

The following commit(s) were added to refs/heads/main by this push:
     new 8e535cd4 Remove some dead config files.
8e535cd4 is described below

commit 8e535cd4eeb4e9c28fb17229593e64ff315769f7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Nov 1 12:46:36 2024 -0400

    Remove some dead config files.
---
 Projects/vc15/Shibboleth.sln    | 14 --------
 configs/Makefile.am             |  3 --
 configs/attribute-policy.xml    | 77 -----------------------------------------
 configs/example-shibboleth2.xml |  9 -----
 configs/protocols.xml           | 57 ------------------------------
 configs/security-policy.xml     | 44 -----------------------
 configs/shibboleth2.xml         |  9 -----
 configs/win-shibboleth2.xml     |  9 -----
 8 files changed, 222 deletions(-)

diff --git a/Projects/vc15/Shibboleth.sln b/Projects/vc15/Shibboleth.sln
index 75872056..d4d191b6 100644
--- a/Projects/vc15/Shibboleth.sln
+++ b/Projects/vc15/Shibboleth.sln
@@ -33,21 +33,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schemas", "Schemas", "{0F17
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{2543BCFE-B3D7-4D08-AAA5-2E284903890E}"
 	ProjectSection(SolutionItems) = preProject
-		..\..\configs\apache.config.in = ..\..\configs\apache.config.in
-		..\..\configs\apache2.config.in = ..\..\configs\apache2.config.in
-		..\..\configs\apache22.config.in = ..\..\configs\apache22.config.in
 		..\..\configs\apache24.config.in = ..\..\configs\apache24.config.in
 		..\..\configs\attrChecker.html = ..\..\configs\attrChecker.html
 		..\..\configs\attribute-map.xml = ..\..\configs\attribute-map.xml
-		..\..\configs\attribute-policy.xml = ..\..\configs\attribute-policy.xml
 		..\..\configs\bindingTemplate.html = ..\..\configs\bindingTemplate.html
 		..\..\configs\console.logger = ..\..\configs\console.logger
 		..\..\configs\discoveryTemplate.html = ..\..\configs\discoveryTemplate.html
 		..\..\configs\example-metadata.xml = ..\..\configs\example-metadata.xml
 		..\..\configs\example-shibboleth2.xml = ..\..\configs\example-shibboleth2.xml
 		..\..\configs\globalLogout.html = ..\..\configs\globalLogout.html
-		..\..\configs\keygen.bat = ..\..\configs\keygen.bat
-		..\..\configs\keygen.sh = ..\..\configs\keygen.sh
 		..\..\configs\localLogout.html = ..\..\configs\localLogout.html
 		..\..\configs\Makefile.am = ..\..\configs\Makefile.am
 		..\..\configs\metadataError.html = ..\..\configs\metadataError.html
@@ -55,16 +49,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{2543BC
 		..\..\configs\native.logger = ..\..\configs\native.logger
 		..\..\configs\partialLogout.html = ..\..\configs\partialLogout.html
 		..\..\configs\postTemplate.html = ..\..\configs\postTemplate.html
-		..\..\configs\protocols.xml = ..\..\configs\protocols.xml
 		..\..\configs\seckeygen.bat = ..\..\configs\seckeygen.bat
 		..\..\configs\seckeygen.sh = ..\..\configs\seckeygen.sh
-		..\..\configs\security-policy.xml = ..\..\configs\security-policy.xml
 		..\..\configs\shibboleth2.xml = ..\..\configs\shibboleth2.xml
-		..\..\configs\shibd-debian.in = ..\..\configs\shibd-debian.in
-		..\..\configs\shibd-osx.plist.in = ..\..\configs\shibd-osx.plist.in
-		..\..\configs\shibd-redhat.in = ..\..\configs\shibd-redhat.in
-		..\..\configs\shibd-suse.in = ..\..\configs\shibd-suse.in
-		..\..\configs\shibd.logger.in = ..\..\configs\shibd.logger.in
 		..\..\configs\sslError.html = ..\..\configs\sslError.html
 		..\..\configs\win-native.logger = ..\..\configs\win-native.logger
 		..\..\configs\win-shibboleth2.xml = ..\..\configs\win-shibboleth2.xml
@@ -81,7 +68,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{31B171C1-E
 		..\..\doxygen.cfg = ..\..\doxygen.cfg
 		..\..\m4\doxygen.m4 = ..\..\m4\doxygen.m4
 		..\..\Makefile.am = ..\..\Makefile.am
-		..\..\shibboleth.spec.in = ..\..\shibboleth.spec.in
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{6ED5E3E7-1B0E-43FB-A8D1-77A0FCAE9AC8}"
diff --git a/configs/Makefile.am b/configs/Makefile.am
index 512c407b..f8626421 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -23,9 +23,6 @@ BUILTCONFIGFILES = \
 CONFIGFILES = \
 	shibboleth2.xml \
 	attribute-map.xml \
-	attribute-policy.xml \
-	protocols.xml \
-	security-policy.xml \
 	example-shibboleth2.xml \
 	console.logger \
 	native.logger \
diff --git a/configs/attribute-policy.xml b/configs/attribute-policy.xml
deleted file mode 100644
index 64274a93..00000000
--- a/configs/attribute-policy.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<AttributeFilterPolicyGroup
-    xmlns="urn:mace:shibboleth:2.0:afp"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <!-- Shared rule for affiliation values. -->
-    <PermitValueRule id="eduPersonAffiliationValues" xsi:type="OR">
-        <Rule xsi:type="Value" value="faculty"/>
-        <Rule xsi:type="Value" value="student"/>
-        <Rule xsi:type="Value" value="staff"/>
-        <Rule xsi:type="Value" value="alum"/>
-        <Rule xsi:type="Value" value="member"/>
-        <Rule xsi:type="Value" value="affiliate"/>
-        <Rule xsi:type="Value" value="employee"/>
-        <Rule xsi:type="Value" value="library-walk-in"/>
-    </PermitValueRule>
-    
-    <!--
-    Shared rule for all "scoped" attributes, but you'll have to manually apply it inside
-    an AttributeRule for each attribute you want to check.
-    -->
-    <PermitValueRule id="ScopingRules" xsi:type="AND">
-        <Rule xsi:type="NOT">
-            <Rule xsi:type="ValueRegex" regex="@"/>
-        </Rule>
-        <Rule xsi:type="ScopeMatchesShibMDScope"/>
-    </PermitValueRule>
-
-    <AttributeFilterPolicy>
-        <!-- This policy is in effect in all cases. -->
-        <PolicyRequirementRule xsi:type="ANY"/>
-
-        <!-- Filter out undefined affiliations and ensure only one primary. -->
-        <AttributeRule attributeID="affiliation">
-            <PermitValueRule xsi:type="AND">
-                <RuleReference ref="eduPersonAffiliationValues"/>
-                <RuleReference ref="ScopingRules"/>
-            </PermitValueRule>
-        </AttributeRule>
-        <AttributeRule attributeID="unscoped-affiliation">
-            <PermitValueRuleReference ref="eduPersonAffiliationValues"/>
-        </AttributeRule>
-        <AttributeRule attributeID="primary-affiliation">
-            <PermitValueRuleReference ref="eduPersonAffiliationValues"/>
-        </AttributeRule>
-
-        <AttributeRule attributeID="subject-id">
-            <PermitValueRuleReference ref="ScopingRules"/>
-        </AttributeRule>
-
-        <AttributeRule attributeID="pairwise-id">
-            <PermitValueRuleReference ref="ScopingRules"/>
-        </AttributeRule>
-        
-        <AttributeRule attributeID="eppn">
-            <PermitValueRuleReference ref="ScopingRules"/>
-        </AttributeRule>
-
-        <AttributeRule attributeID="targeted-id">
-            <PermitValueRuleReference ref="ScopingRules"/>
-        </AttributeRule>
-
-        <!-- Require NameQualifier/SPNameQualifier match IdP and SP entityID respectively. -->
-        <AttributeRule attributeID="persistent-id">
-            <PermitValueRule xsi:type="NameIDQualifierString"/>
-        </AttributeRule>
-        
-        <!-- Enforce that the values of schacHomeOrganization are a valid Scope. -->
-        <AttributeRule attributeID="schacHomeOrganization">
-            <PermitValueRule xsi:type="ValueMatchesShibMDScope" />
-        </AttributeRule>
-
-        <!-- Catch-all that passes everything else through unmolested. -->
-        <AttributeRule attributeID="*" permitAny="true"/>
-        
-    </AttributeFilterPolicy>
-
-</AttributeFilterPolicyGroup>
diff --git a/configs/example-shibboleth2.xml b/configs/example-shibboleth2.xml
index 71ebebd5..a79d9fbc 100644
--- a/configs/example-shibboleth2.xml
+++ b/configs/example-shibboleth2.xml
@@ -264,9 +264,6 @@
         <!-- Use a SAML query if no attributes are supplied during SSO. -->
         <AttributeResolver type="Query" subjectMatch="true"/>
 
-        <!-- Default filtering policy for recognized attributes, lets other data pass. -->
-        <AttributeFilter type="XML" validate="true" path="attribute-policy.xml"/>
-
         <!-- Simple file-based resolvers for separate signing/encryption keys. -->
         <CredentialResolver type="File" use="signing"
             key="sp-signing-key.pem" certificate="sp-signing-cert.pem"/>
@@ -290,10 +287,4 @@
         -->
     </ApplicationDefaults>
     
-    <!-- Policies that determine how to process and authenticate runtime messages. -->
-    <SecurityPolicyProvider type="XML" validate="true" path="security-policy.xml"/>
-
-    <!-- Low-level configuration about protocols and bindings available for use. -->
-    <ProtocolProvider type="XML" validate="true" reloadChanges="false" path="protocols.xml"/>
-
 </SPConfig>
diff --git a/configs/protocols.xml b/configs/protocols.xml
deleted file mode 100644
index 648bcbc3..00000000
--- a/configs/protocols.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<Protocols xmlns="urn:mace:shibboleth:2.0:native:sp:protocols">
-  
-  <!-- SAML 2.0 -->
-  <Protocol id="SAML2">
-    <Service id="SSO">
-      <Initiator id="SAML2" />
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" path="/SAML2/POST" />
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" path="/SAML2/POST-SimpleSign" />
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" path="/SAML2/Artifact" />
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" path="/SAML2/ECP" />
-    </Service>
-    <Service id="Logout">
-      <Initiator id="SAML2" />
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" path="/SLO/SOAP" />
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" path="/SLO/Redirect" />
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" path="/SLO/POST" />
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" path="/SLO/Artifact" />
-    </Service>
-    <Service id="NameIDMgmt">
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" path="/NIM/SOAP" />
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" path="/NIM/Redirect" />
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" path="/NIM/POST" />
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" path="/NIM/Artifact" />
-    </Service>
-    <Service id="ArtifactResolution">
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" path="/Artifact/SOAP" />
-    </Service>
-  </Protocol>
-
-  <!-- SAML 1.1 and SAML 1.0 -->
-  <Protocol id="SAML1">
-    <Service id="SSO">
-      <Initiator id="Shib1" />
-      <Binding id="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" path="/SAML/POST" />
-      <Binding id="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" path="/SAML/Artifact" />
-    </Service>
-  </Protocol>
-
-  <!-- ADFSv1 / WS-Federation -->
-  <Protocol id="ADFS">
-    <Service id="SSO">
-      <Initiator id="ADFS" />
-      <Binding id="http://schemas.xmlsoap.org/ws/2003/07/secext" path="/ADFS" />
-    </Service>
-    <Service id="Logout">
-      <Initiator id="ADFS" />
-    </Service>
-  </Protocol>
-
-  <!-- Local Logout -->
-  <Protocol id="Local">
-    <Service id="Logout">
-      <Initiator id="Local" />
-    </Service>
-  </Protocol>
-  
-</Protocols>
diff --git a/configs/security-policy.xml b/configs/security-policy.xml
deleted file mode 100644
index f8eaacda..00000000
--- a/configs/security-policy.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<SecurityPolicies xmlns="urn:mace:shibboleth:3.0:native:sp:config">
-
-    <!-- Each policy defines a set of rules to use to secure messages. -->
-
-    <!--
-    The predefined policy enforces replay/freshness, standard
-    condition processing, and permits signing and client TLS.
-    -->
-    <Policy id="default" validate="false">
-        <PolicyRule type="MessageFlow" checkReplay="true" expires="60"/>
-        <PolicyRule type="Conditions">
-            <PolicyRule type="Audience"/>
-            <!-- Enable Delegation rule to permit delegated access. -->
-            <!-- <PolicyRule type="Delegation"/> -->
-        </PolicyRule>
-        <PolicyRule type="ClientCertAuth" errorFatal="true"/>
-        <PolicyRule type="XMLSigning" errorFatal="true"/>
-        <PolicyRule type="SimpleSigning" errorFatal="true"/>
-    </Policy>
-
-    <Policy id="blockUnsolicited" validate="false">
-        <PolicyRule type="MessageFlow" blockUnsolicited="true" checkReplay="true" expires="60"/>
-        <PolicyRule type="Conditions">
-            <PolicyRule type="Audience"/>
-        </PolicyRule>
-        <PolicyRule type="ClientCertAuth" errorFatal="true"/>
-        <PolicyRule type="XMLSigning" errorFatal="true"/>
-        <PolicyRule type="SimpleSigning" errorFatal="true"/>
-        <PolicyRule type="Bearer" blockUnsolicited="true"/>
-    </Policy>
-
-  <!--
-    This policy is a place-holder for use of assertions in metadata
-    as a way of attaching signed information about particular IdPs.
-    -->
-    <Policy id="entity-attributes">
-        <PolicyRule type="Conditions"/>
-        <PolicyRule type="XMLSigning" errorFatal="true"/>
-    </Policy>
-    
-    <!-- Disables known weak algorithms. -->
-    <ExcludedAlgorithms excludeDefaults="true"/>
-
-</SecurityPolicies>
diff --git a/configs/shibboleth2.xml b/configs/shibboleth2.xml
index ddfb98aa..50ec978c 100644
--- a/configs/shibboleth2.xml
+++ b/configs/shibboleth2.xml
@@ -95,9 +95,6 @@
         <!-- Map to extract attributes from SAML assertions. -->
         <AttributeExtractor type="XML" validate="true" reloadChanges="false" path="attribute-map.xml"/>
 
-        <!-- Default filtering policy for recognized attributes, lets other data pass. -->
-        <AttributeFilter type="XML" validate="true" path="attribute-policy.xml"/>
-
         <!-- Simple file-based resolvers for separate signing/encryption keys. -->
         <CredentialResolver type="File" use="signing"
             key="sp-signing-key.pem" certificate="sp-signing-cert.pem"/>
@@ -106,10 +103,4 @@
         
     </ApplicationDefaults>
     
-    <!-- Policies that determine how to process and authenticate runtime messages. -->
-    <SecurityPolicyProvider type="XML" validate="true" path="security-policy.xml"/>
-
-    <!-- Low-level configuration about protocols and bindings available for use. -->
-    <ProtocolProvider type="XML" validate="true" reloadChanges="false" path="protocols.xml"/>
-
 </SPConfig>
diff --git a/configs/win-shibboleth2.xml b/configs/win-shibboleth2.xml
index 6b4514a1..28f24810 100644
--- a/configs/win-shibboleth2.xml
+++ b/configs/win-shibboleth2.xml
@@ -144,9 +144,6 @@
       <!-- Map to extract attributes from SAML assertions. -->
         <AttributeExtractor type="XML" validate="true" reloadChanges="false" path="attribute-map.xml"/>
         
-        <!-- Default filtering policy for recognized attributes, lets other data pass. -->
-        <AttributeFilter type="XML" validate="true" path="attribute-policy.xml"/>
-
         <!-- Simple file-based resolvers for separate signing/encryption keys. -->
         <CredentialResolver type="File" use="signing"
             key="sp-signing-key.pem" certificate="sp-signing-cert.pem"/>
@@ -154,11 +151,5 @@
             key="sp-encrypt-key.pem" certificate="sp-encrypt-cert.pem"/>
         
     </ApplicationDefaults>
-    
-    <!-- Policies that determine how to process and authenticate runtime messages. -->
-    <SecurityPolicyProvider type="XML" validate="true" path="security-policy.xml"/>
-
-    <!-- Low-level configuration about protocols and bindings available for use. -->
-    <ProtocolProvider type="XML" validate="true" reloadChanges="false" path="protocols.xml"/>
 
 </SPConfig>

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


More information about the commits mailing list