Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: docker/shib-idp-conftree
base: 3.4-default
Choose a base ref
...
head repository: docker/shib-idp-conftree
compare: 3.3release
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Jan 20, 2017

  1. initial add, copy of 33test

    pcaskey committed Jan 20, 2017
    Copy the full SHA
    189b362 View commit details
  2. remove credentials folder

    pcaskey committed Jan 20, 2017
    Copy the full SHA
    7f462f2 View commit details
  3. Copy the full SHA
    be5ca7f View commit details

Commits on Feb 3, 2017

  1. add credentials folder

    pcaskey committed Feb 3, 2017
    Copy the full SHA
    a03e10e View commit details
  2. Copy the full SHA
    6427895 View commit details
  3. update .gitattributes

    pcaskey committed Feb 3, 2017
    Copy the full SHA
    dc10b76 View commit details

Commits on Feb 10, 2017

  1. add sealer.kver

    pcaskey committed Feb 10, 2017
    Copy the full SHA
    f5b2731 View commit details
  2. add correct allowed IP range to Shibb's access control config so that…

    … shibb status pages will work from VM
    pcaskey committed Feb 10, 2017
    Copy the full SHA
    3612bce View commit details

Commits on Feb 11, 2017

  1. Copy the full SHA
    3afe341 View commit details

Commits on Feb 12, 2017

  1. Copy the full SHA
    c70db51 View commit details
  2. Copy the full SHA
    d3d57d9 View commit details
  3. Copy the full SHA
    872f3ce View commit details
  4. Copy the full SHA
    866baf9 View commit details

Commits on Feb 13, 2017

  1. Copy the full SHA
    317a9fe View commit details
  2. Copy the full SHA
    71f29fb View commit details
  3. Copy the full SHA
    6b446a5 View commit details
  4. fixups to resolver config

    pcaskey committed Feb 13, 2017
    Copy the full SHA
    adc78e7 View commit details
  5. Copy the full SHA
    6e80a0e View commit details

Commits on Feb 14, 2017

  1. Copy the full SHA
    e9bec7a View commit details

Commits on Feb 15, 2017

  1. Copy the full SHA
    237f9b5 View commit details

Commits on Apr 6, 2017

  1. Copy the full SHA
    0ef5000 View commit details

Commits on Apr 7, 2017

  1. Copy the full SHA
    14108c4 View commit details
  2. minor formatting fixes

    pcaskey committed Apr 7, 2017
    Copy the full SHA
    66cbd87 View commit details
  3. formatting tweak

    pcaskey committed Apr 7, 2017
    Copy the full SHA
    9ffa26a View commit details
  4. formatting fixes

    pcaskey committed Apr 7, 2017
    Copy the full SHA
    e50ceee View commit details

Commits on Apr 11, 2017

  1. minor config cleanup

    pcaskey committed Apr 11, 2017
    Copy the full SHA
    6317f30 View commit details

Commits on Jun 7, 2017

  1. Copy the full SHA
    4531c9d View commit details

Commits on Jul 17, 2017

  1. Update access-control.xml

    pcaskey committed Jul 17, 2017
    Copy the full SHA
    332cd3a View commit details

Commits on Oct 1, 2018

  1. Copy the full SHA
    da501e9 View commit details
Showing with 521,180 additions and 0 deletions.
  1. +2 −0 .gitattributes
  2. +68 −0 conf/access-control.xml
  3. +53 −0 conf/admin/general-admin.xml
  4. +129 −0 conf/admin/metrics.xml
  5. +100 −0 conf/attribute-filter.xml
  6. +96 −0 conf/attribute-resolver-default.xml
  7. +292 −0 conf/attribute-resolver-full.xml
  8. +94 −0 conf/attribute-resolver-ldap.xml
  9. +279 −0 conf/attribute-resolver.xml
  10. +32 −0 conf/audit.xml
  11. +77 −0 conf/authn/authn-comparison.xml
  12. +18 −0 conf/authn/authn-events-flow.xml
  13. +25 −0 conf/authn/duo-authn-config.xml
  14. +9 −0 conf/authn/duo.properties
  15. +70 −0 conf/authn/external-authn-config.xml
  16. +156 −0 conf/authn/general-authn.xml
  17. +37 −0 conf/authn/ipaddress-authn-config.xml
  18. +27 −0 conf/authn/jaas-authn-config.xml
  19. +11 −0 conf/authn/jaas.config
  20. +31 −0 conf/authn/krb5-authn-config.xml
  21. +135 −0 conf/authn/ldap-authn-config.xml
  22. +94 −0 conf/authn/mfa-authn-config.xml
  23. +121 −0 conf/authn/password-authn-config.xml
  24. +75 −0 conf/authn/remoteuser-authn-config.xml
  25. +63 −0 conf/authn/remoteuser-internal-authn-config.xml
  26. +74 −0 conf/authn/spnego-authn-config.xml
  27. +44 −0 conf/authn/x509-authn-config.xml
  28. +21 −0 conf/authn/x509-internal-authn-config.xml
  29. +44 −0 conf/c14n/attribute-sourced-subject-c14n-config.xml
  30. +27 −0 conf/c14n/simple-subject-c14n-config.xml
  31. +18 −0 conf/c14n/subject-c14n-events-flow.xml
  32. +109 −0 conf/c14n/subject-c14n.xml
  33. +37 −0 conf/c14n/x500-subject-c14n-config.xml
  34. +84 −0 conf/cas-protocol.xml
  35. +65 −0 conf/credentials.xml
  36. +120 −0 conf/errors.xml
  37. +53 −0 conf/global.xml
  38. +195 −0 conf/idp.properties
  39. +136 −0 conf/intercept/consent-intercept-config.xml
  40. +42 −0 conf/intercept/context-check-intercept-config.xml
  41. +37 −0 conf/intercept/expiring-password-intercept-config.xml
  42. +18 −0 conf/intercept/intercept-events-flow.xml
  43. +54 −0 conf/intercept/profile-intercept.xml
  44. +63 −0 conf/ldap.properties
  45. +186 −0 conf/logback.xml
  46. +83 −0 conf/metadata-providers.xml
  47. +23 −0 conf/mvc-beans.xml
  48. +72 −0 conf/relying-party.xml
  49. +35 −0 conf/saml-nameid.properties
  50. +62 −0 conf/saml-nameid.xml
  51. +65 −0 conf/services.properties
  52. +144 −0 conf/services.xml
  53. +45 −0 conf/session-manager.xml
  54. +21 −0 credentials/inc-md-cert.pem
  55. +1 −0 credentials/sealer.kver
  56. +150 −0 edit-webapp/css/consent.css
  57. +12 −0 edit-webapp/css/logout.css
  58. +163 −0 edit-webapp/css/main.css
  59. BIN edit-webapp/images/dummylogo-mobile.png
  60. BIN edit-webapp/images/dummylogo.png
  61. BIN edit-webapp/images/failure-32x32.png
  62. BIN edit-webapp/images/success-32x32.png
  63. +240 −0 messages/messages.properties
  64. +228 −0 metadata/idp-metadata.xml
  65. +515,249 −0 metadata/localCopyFromInCommon.xml
  66. +53 −0 views/client-storage/client-storage-read.vm
  67. +53 −0 views/client-storage/client-storage-write.vm
  68. +83 −0 views/duo.vm
  69. +72 −0 views/error.vm
  70. +158 −0 views/intercept/attribute-release.vm
  71. +54 −0 views/intercept/expiring-password.vm
  72. +67 −0 views/intercept/terms-of-use.vm
  73. +24 −0 views/login-error.vm
  74. +140 −0 views/login.vm
  75. +59 −0 views/logout-complete.vm
  76. +58 −0 views/logout-propagate.vm
  77. +91 −0 views/logout.vm
  78. +49 −0 views/spnego-unavailable.vm
  79. +45 −0 views/user-prefs.js
  80. +60 −0 views/user-prefs.vm
2 changes: 2 additions & 0 deletions .gitattributes
@@ -0,0 +1,2 @@
.gitattributes export-ignore
README.md export-ignore
68 changes: 68 additions & 0 deletions conf/access-control.xml
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:c="http://www.springframework.org/schema/c"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"

default-init-method="initialize"
default-destroy-method="destroy">

<!--
Map of access control policies used to limit access to administrative functions.
The purpose of the map is to label policies with a key/name so they can be reused.
-->

<!--
Use the "shibboleth.IPRangeAccessControl" parent bean for IP-based access control.
The ranges provided MUST be CIDR network expressions. To specify a single address,
add "/32" or "/128" for IPv4 or IPv6 respectively.
The additional examples below demonstrate how to control access by username
and by attribute(s), in the case of authenticated access to admin functions.
-->

<util:map id="shibboleth.AccessControlPolicies">

<entry key="AccessByIPAddress">
<bean id="AccessByIPAddress" parent="shibboleth.IPRangeAccessControl"
p:allowedRanges="#{ {'127.0.0.1/32', '::1/128', '172.17.0.0/24', '172.18.0.0/24', '10.255.0.0/16'} }" />
</entry>

<!--
<entry key="AccessByUser">
<bean parent="shibboleth.PredicateAccessControl">
<constructor-arg>
<bean parent="shibboleth.Conditions.SubjectName" c:collection="#{'jdoe'}" />
</constructor-arg>
</bean>
</entry>
-->

<!--
<entry key="AccessByAttribute">
<bean parent="shibboleth.PredicateAccessControl">
<constructor-arg>
<bean class="net.shibboleth.idp.profile.logic.SimpleAttributePredicate">
<property name="attributeValueMap">
<map>
<entry key="eduPersonEntitlement">
<list>
<value>https://example.org/entitlement/idpadmin</value>
</list>
</entry>
</map>
</property>
</bean>
</constructor-arg>
</bean>
</entry>
-->

</util:map>

</beans>
53 changes: 53 additions & 0 deletions conf/admin/general-admin.xml
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"

default-init-method="initialize"
default-destroy-method="destroy">

<util:list id="shibboleth.AvailableAdminFlows">

<!-- Status Page -->
<bean parent="shibboleth.AdminFlow"
c:id="http://shibboleth.net/ns/profiles/status"
p:loggingId="%{idp.service.logging.status:Status}"
p:policyName="%{idp.status.accessPolicy:AccessByIPAddress}" />

<!-- Service Reload -->
<bean parent="shibboleth.AdminFlow"
c:id="http://shibboleth.net/ns/profiles/reload-service-configuration"
p:loggingId="%{idp.service.logging.serviceReload:Reload}"
p:policyName="%{idp.reload.accessPolicy:AccessByIPAddress}" />

<!-- MetadataResolver Reload -->
<bean parent="shibboleth.AdminFlow"
c:id="http://shibboleth.net/ns/profiles/reload-metadata"
p:loggingId="%{idp.service.logging.serviceReload:Reload}"
p:policyName="%{idp.reload.accessPolicy:AccessByIPAddress}" />

<!-- AttributeResolver Debugging -->
<bean parent="shibboleth.AdminFlow"
c:id="http://shibboleth.net/ns/profiles/resolvertest"
p:loggingId="%{idp.service.logging.resolvertest:ResolverTest}"
p:policyName="%{idp.resolvertest.accessPolicy:AccessByIPAddress}" />

<!-- REST StorageService Access -->
<bean parent="shibboleth.AdminFlow"
c:id="http://shibboleth.net/ns/profiles/storage"
p:loggingId="Storage"
p:policyName="AccessByIPAddress" />

<!-- REST Interface to Metrics -->
<bean parent="shibboleth.AdminFlow"
c:id="http://shibboleth.net/ns/profiles/metrics"
p:loggingId="Metrics"
p:policyNameLookupStrategy-ref="shibboleth.metrics.AccessPolicyStrategy" />

</util:list>

</beans>
129 changes: 129 additions & 0 deletions conf/admin/metrics.xml
@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"

default-init-method="initialize"
default-destroy-method="destroy">

<!-- Metrics enablement / activation. -->

<!--
Register one or more of the built-in system metric sets available.
-->

<bean parent="shibboleth.metrics.RegisterMetricSets">
<property name="arguments">
<list>
<ref bean="shibboleth.metrics.CoreGaugeSet" />
<ref bean="shibboleth.metrics.IdPGaugeSet" />
<ref bean="shibboleth.metrics.LoggingGaugeSet" />
<ref bean="shibboleth.metrics.AccessControlGaugeSet" />
<ref bean="shibboleth.metrics.MetadataGaugeSet" />
<ref bean="shibboleth.metrics.NameIdentifierGaugeSet" />
<ref bean="shibboleth.metrics.RelyingPartyGaugeSet" />
<ref bean="shibboleth.metrics.AttributeResolverGaugeSet" />
<ref bean="shibboleth.metrics.AttributeFilterGaugeSet" />

<!--
<bean class="com.codahale.metrics.jvm.CachedThreadStatesGaugeSet"
c:_0="1" c:_1="#{T(java.util.concurrent.TimeUnit).MINUTES}" />
<bean class="com.codahale.metrics.jvm.ClassLoadingGaugeSet" />
<bean class="com.codahale.metrics.jvm.GarbageCollectorMetricSet" />
<bean class="com.codahale.metrics.jvm.MemoryUsageGaugeSet" />
-->
</list>
</property>
</bean>

<!-- Metrics REST API Configuration -->

<!--
The global metric set is available by default at /idp/profile/admin/metrics
Any pathinfo after that is assumed to identify specific named metrics. You can
create mappings here between a logical "group" name and an implementation of the
com.codahale.metrics.MetricFilter interface to specify which metrics to include.
-->
<util:map id="shibboleth.metrics.MetricGroups">
<entry key="core" value-ref="shibboleth.metrics.CoreGaugeSet" />
<entry key="idp" value-ref="shibboleth.metrics.IdPGaugeSet" />
<entry key="logging" value-ref="shibboleth.metrics.LoggingGaugeSet" />
<entry key="access" value-ref="shibboleth.metrics.AccessControlGaugeSet" />
<entry key="metadata" value-ref="shibboleth.metrics.MetadataGaugeSet" />
<entry key="nameid" value-ref="shibboleth.metrics.NameIdentifierGaugeSet" />
<entry key="relyingparty" value-ref="shibboleth.metrics.RelyingPartyGaugeSet" />
<entry key="resolver" value-ref="shibboleth.metrics.AttributeResolverGaugeSet" />
<entry key="filter" value-ref="shibboleth.metrics.AttributeFilterGaugeSet" />
</util:map>

<!-- If you don't specify an alternate access policy, this named policy will be enforced. -->
<bean id="shibboleth.metrics.DefaultAccessPolicy" class="java.lang.String" c:_0="AccessByIPAddress" />

<!--
To override the default access policy, map a metric name or
mapped group above to an alternative policy name.
-->
<util:map id="shibboleth.metrics.AccessPolicyMap">

</util:map>

<!--
In addition to the "pull" REST API for accessing metrics, a "push" reporter is also
available to upload a JSON feed to a URL. The example shown relies on standard JVM
trust configuration for TLS server verification.
The "start" method triggers the timer thread; the example pushes every 30 minutes.
-->
<!--
<bean id="PushReporter" parent="shibboleth.metrics.HTTPReporter" c:name="MyCollector"
p:collectorURL="https://log.example.org/cgi-bin/collector.cgi" />
<bean class="org.springframework.beans.factory.config.MethodInvokingBean"
p:targetObject-ref="PushReporter"
p:targetMethod="start">
<property name="arguments">
<list>
<value>30</value>
<util:constant static-field="java.util.concurrent.TimeUnit.MINUTES" />
</list>
</property>
</bean>
-->

<!-- IdP Metrics Configuration -->

<!--
A bean named shibboleth.metrics.MetricStrategy of type Function<ProfileRequestContext,Boolean>
can be defined to add timers and counters to a large range of objects in the system. Each timer is
defined by a triple (timer name, start object, stop object). Counters are just object/counter pairs.
The most common example is to start a timer when a particular flow action bean starts and
stop it when the same or different action bean stops, to measure how long the execution takes.
If you want to leave a timer in place but disabled to prevent overhead, you can turn off a
logging category named "metrics.<timername>" in your logging configuration.
-->
<!--
<bean id="shibboleth.metrics.MetricStrategy" parent="shibboleth.ContextFunctions.Scripted"
factory-method="inlineScript">
<constructor-arg>
<value>
<![CDATA[
metricCtx = input.getSubcontext("org.opensaml.profile.context.MetricContext");
metricCtx.addTimer("idp.attribute.resolution",
"ResolveAttributes",
"FilterAttributes"
);
true; // Signals success.
]]>
</value>
</constructor-arg>
</bean>
-->

</beans>
100 changes: 100 additions & 0 deletions conf/attribute-filter.xml
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This file is an EXAMPLE policy file. While the policy presented in this
example file is illustrative of some simple cases, it relies on the names of
non-existent example services and the example attributes demonstrated in the
default attribute-resolver.xml file.
Deployers should refer to the documentation for a complete list of components
and their options.
-->
<AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
xmlns="urn:mace:shibboleth:2.0:afp"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">

<!-- EXAMPLES -->
<!-- Release some attributes to an SP. -->
<!--
<AttributeFilterPolicy id="example1">
<PolicyRequirementRule xsi:type="Requester" value="https://sp.example.org" />
<AttributeRule attributeID="eduPersonPrincipalName">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
<AttributeRule attributeID="uid">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
<AttributeRule attributeID="mail">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
</AttributeFilterPolicy>
-->
<!-- Release eduPersonAffiliation to two specific SPs. -->
<!--
<AttributeFilterPolicy id="example2">
<PolicyRequirementRule xsi:type="OR">
<Rule xsi:type="Requester" value="https://sp.example.org" />
<Rule xsi:type="Requester" value="https://another.example.org/shibboleth" />
</PolicyRequirementRule>
<AttributeRule attributeID="eduPersonScopedAffiliation">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
</AttributeFilterPolicy>
-->

<!-- Attribute release for all SPs (global) tagged as 'Research and Scholarship' -->
<AttributeFilterPolicy id="releaseRandSAttributeBundle">
<PolicyRequirementRule xsi:type="EntityAttributeExactMatch"
attributeName="http://macedir.org/entity-category"
attributeValue="http://refeds.org/category/research-and-scholarship"/>
<AttributeRule attributeID="eduPersonPrincipalName">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
<AttributeRule attributeID="eduPersonScopedAffiliation">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
<AttributeRule attributeID="givenName">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
<AttributeRule attributeID="surname">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
<AttributeRule attributeID="displayName">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
<AttributeRule attributeID="mail">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
</AttributeFilterPolicy>


<!-- Attribute release for all InCommon SPs -->
<AttributeFilterPolicy id="releaseToInCommon">
<PolicyRequirementRule xsi:type="EntityAttributeExactMatch"
attributeName="http://macedir.org/entity-category"
attributeValue="http://id.incommon.org/category/registered-by-incommon"/>
<AttributeRule attributeID="eduPersonPrincipalName">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
<AttributeRule attributeID="eduPersonScopedAffiliation">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
<AttributeRule attributeID="givenName">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
<AttributeRule attributeID="surname">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
<AttributeRule attributeID="displayName">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
<AttributeRule attributeID="mail">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
</AttributeFilterPolicy>

</AttributeFilterPolicyGroup>