[java-idp-oidc] branch main updated: Adjust test configs to account for IdP changes.
Scott Cantor
cantor.2 at osu.edu
Mon Sep 21 13:10:33 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=5d23a7d3912ad1af1353586c0adeb6f5db859d46
The following commit(s) were added to refs/heads/main by this push:
new 5d23a7d3 Adjust test configs to account for IdP changes.
5d23a7d3 is described below
commit 5d23a7d3912ad1af1353586c0adeb6f5db859d46
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 21 09:10:30 2020 -0400
Adjust test configs to account for IdP changes.
---
idp-oidc-extension-impl/pom.xml | 4 +---
...aas-authn-config.xml => attribute-registry.xml} | 24 +++++++++++++--------
.../src/test/resources/conf/idp.properties | 25 +++++-----------------
.../src/test/resources/conf/services.xml | 6 ------
4 files changed, 21 insertions(+), 38 deletions(-)
diff --git a/idp-oidc-extension-impl/pom.xml b/idp-oidc-extension-impl/pom.xml
index e928ff34..a4ad47a6 100644
--- a/idp-oidc-extension-impl/pom.xml
+++ b/idp-oidc-extension-impl/pom.xml
@@ -273,8 +273,7 @@
<includeGroupIds>net.shibboleth.idp</includeGroupIds>
<includeArtifactIds>idp-conf</includeArtifactIds>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
- <includes>system/**,conf/**,credentials/ldap-server.crt</includes>
- <excludes>conf/authn/jaas-authn-config.xml</excludes>
+ <includes>conf/**,credentials/ldap-server.crt</includes>
</configuration>
</execution>
</executions>
@@ -288,7 +287,6 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
- <exclude>system/**</exclude>
<exclude>conf/**</exclude>
<exclude>credentials/**</exclude>
</excludes>
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/authn/jaas-authn-config.xml b/idp-oidc-extension-impl/src/test/resources/conf/attribute-registry.xml
similarity index 59%
rename from idp-oidc-extension-impl/src/test/resources/conf/authn/jaas-authn-config.xml
rename to idp-oidc-extension-impl/src/test/resources/conf/attribute-registry.xml
index 7f953a79..1c8c6a9f 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/authn/jaas-authn-config.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/attribute-registry.xml
@@ -11,15 +11,21 @@
default-init-method="initialize"
default-destroy-method="destroy">
+
+ <!--
+ The system comes preconfigured to load rules directly from resource files
+ configured in services.xml so they're monitored for changes.
- <!-- Specify your JAAS config. -->
- <bean id="JAASConfig" class="org.springframework.core.io.ClassPathResource" c:path="%{idp.home}/conf/authn/jaas.config" />
-
- <util:property-path id="shibboleth.authn.JAAS.JAASConfigURI" path="JAASConfig.URI" />
-
- <!-- Specify the application name(s) in the JAAS config. -->
- <util:list id="shibboleth.authn.JAAS.LoginConfigNames">
- <value>ShibUserPassAuth</value>
- </util:list>
+ You can add mappings here, add more XML resource files, or drop property
+ files into the directory noted below, but they won't be monitored for changes
+ themselves.
+ -->
+ <!-- Default directory for custom mappings. -->
+ <!--
+ This doesn't load when idp.home is classpath:
+ <bean parent="shibboleth.TranscodingRuleLoader"
+ c:dir="%{idp.home}/conf/attributes/custom"
+ c:extensions="#{{'.txt', '.props', '.properties', '.rule'}}" />
+ -->
</beans>
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/idp.properties b/idp-oidc-extension-impl/src/test/resources/conf/idp.properties
index 3c15ae45..04f0c653 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/idp.properties
+++ b/idp-oidc-extension-impl/src/test/resources/conf/idp.properties
@@ -1,5 +1,9 @@
+# Auto-load all files matching conf/**/*.properties
+# Disable if you want to manually maintain a list of sources.
+#idp.searchForProperties = false
+
# Load any additional property resources from a comma-delimited list
-idp.additionalProperties = /conf/ldap.properties, /conf/saml-nameid.properties, /conf/services.properties, /conf/authn/duo.properties, /conf/idp-oidc.properties
+idp.additionalProperties = /conf/ldap.properties, /conf/saml-nameid.properties, /conf/services.properties, /conf/admin/admin.properties, /conf/authn/authn.properties, /conf/authn/duo.properties, /conf/idp-oidc.properties, /credentials/secrets.properties
# In most cases (and unless noted in the surrounding comments) the
# commented settings in the distributed files are the default
@@ -119,25 +123,6 @@ idp.session.secondaryServiceIndex = true
# Length of time to track SP sessions
#idp.session.defaultSPlifetime = PT2H
-# Regular expression matching login flows to enable, e.g. IPAddress|Password
-idp.authn.flows = Password
-
-# Default lifetime and timeout of various authentication methods
-#idp.authn.defaultLifetime = PT60M
-#idp.authn.defaultTimeout = PT30M
-
-# Whether to populate relying party user interface information for display
-# during authentication, consent, terms-of-use.
-#idp.authn.rpui = true
-
-# Whether to prioritize "active" results when an SP requests more than
-# one possible matching login method (V2 behavior was to favor them)
-#idp.authn.favorSSO = false
-
-# Whether to fail requests when a user identity after authentication
-# doesn't match the identity in a pre-existing session.
-#idp.authn.identitySwitchIsError = false
-
# Set to "shibboleth.StorageService" or custom bean for alternate storage of consent
#idp.consent.StorageService = shibboleth.ClientPersistentStorageService
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/services.xml b/idp-oidc-extension-impl/src/test/resources/conf/services.xml
index 27de6931..7e96f389 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/services.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/services.xml
@@ -53,18 +53,15 @@
<util:list id="shibboleth.RelyingPartyResolverResources">
<value>%{idp.home}/conf/relying-party.xml</value>
<value>%{idp.home}/conf/credentials.xml</value>
- <value>%{idp.home}/system/conf/relying-party-system.xml</value>
</util:list>
<util:list id="shibboleth.MetadataResolverResources">
<value>%{idp.home}/conf/metadata-providers.xml</value>
- <value>%{idp.home}/system/conf/metadata-providers-system.xml</value>
</util:list>
<!-- This set of resources uses only AttributeEncoders for compatibility. -->
<util:list id ="shibboleth.AttributeRegistryResources">
<value>%{idp.home}/conf/attribute-registry.xml</value>
- <value>%{idp.home}/system/conf/attribute-registry-system.xml</value>
<value>%{idp.home}/conf/attribute-resolver.xml</value>
<!-- <value>%{idp.home}/conf/attributes/default-rules.xml</value> -->
</util:list>
@@ -79,12 +76,10 @@
<util:list id ="shibboleth.NameIdentifierGenerationResources">
<value>%{idp.home}/conf/saml-nameid.xml</value>
- <value>%{idp.home}/system/conf/saml-nameid-system.xml</value>
</util:list>
<util:list id="shibboleth.AccessControlResources">
<value>%{idp.home}/conf/access-control.xml</value>
- <value>%{idp.home}/system/conf/access-control-system.xml</value>
</util:list>
<util:list id="shibboleth.CASServiceRegistryResources">
@@ -98,7 +93,6 @@
-->
<util:list id="shibboleth.MessageSourceResources">
<value>%{idp.home}/messages/messages</value>
- <value>%{idp.home}/system/messages/messages</value>
</util:list>
</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list