From 208f2275f47f91ddc21c3bfe18c116ee6cd6bb29 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Thu, 30 Aug 2018 15:41:49 -0700 Subject: [PATCH] [NOJIRA] If attributes object is null, don't try to set anything. Fixed some more unit test stuff. Ugh. --- ...SamlMetadataResolverConstructorHelper.java | 48 ++++++++++--------- .../admin/ui/util/TestObjectGenerator.groovy | 5 +- backend/src/test/resources/conf/520.xml | 5 +- 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverConstructorHelper.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverConstructorHelper.java index b5d787b10..c5a6845e4 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverConstructorHelper.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverConstructorHelper.java @@ -82,31 +82,33 @@ public static void updateOpenSamlMetadataResolverFromReloadableMetadataResolverA ParserPool parserPool) { AbstractReloadingMetadataResolver reloadingMetadataResolver = (AbstractReloadingMetadataResolver) metadataResolver; - if (attributes.getExpirationWarningThreshold() != null) { - reloadingMetadataResolver.setExpirationWarningThreshold(toMillis(attributes.getExpirationWarningThreshold())); - } - if (attributes.getMaxRefreshDelay() != null) { - reloadingMetadataResolver.setMaxRefreshDelay(toMillis(attributes.getMaxRefreshDelay())); - } - if (attributes.getMinRefreshDelay() != null) { - reloadingMetadataResolver.setMinRefreshDelay(toMillis(attributes.getMinRefreshDelay())); - } - - if (attributes.getResolveViaPredicatesOnly() != null) { - reloadingMetadataResolver.setResolveViaPredicatesOnly(attributes.getResolveViaPredicatesOnly()); - } - - if (attributes.getRefreshDelayFactor() != null) { - reloadingMetadataResolver.setRefreshDelayFactor(attributes.getRefreshDelayFactor().floatValue()); - } - - //TODO: This takes a set of MetadataIndex's. We've got an IndexesRef. How to convert? - // reloadingMetadataResolver.setIndexes(); attributes.getIndexesRef(); - //TODO: This takes a ParserPool. We've got a ParserPoolRef in attributes.getParserPoolRef(). Should we use it for anything? reloadingMetadataResolver.setParserPool(parserPool); - //TODO: Where does this get used in OpenSAML land? - // attributes.getTaskTimerRef(); + if (attributes != null) { + if (attributes.getExpirationWarningThreshold() != null) { + reloadingMetadataResolver.setExpirationWarningThreshold(toMillis(attributes.getExpirationWarningThreshold())); + } + if (attributes.getMaxRefreshDelay() != null) { + reloadingMetadataResolver.setMaxRefreshDelay(toMillis(attributes.getMaxRefreshDelay())); + } + if (attributes.getMinRefreshDelay() != null) { + reloadingMetadataResolver.setMinRefreshDelay(toMillis(attributes.getMinRefreshDelay())); + } + + if (attributes.getResolveViaPredicatesOnly() != null) { + reloadingMetadataResolver.setResolveViaPredicatesOnly(attributes.getResolveViaPredicatesOnly()); + } + + if (attributes.getRefreshDelayFactor() != null) { + reloadingMetadataResolver.setRefreshDelayFactor(attributes.getRefreshDelayFactor().floatValue()); + } + + //TODO: This takes a set of MetadataIndex's. We've got an IndexesRef. How to convert? + // reloadingMetadataResolver.setIndexes(); attributes.getIndexesRef(); + + //TODO: Where does this get used in OpenSAML land? + // attributes.getTaskTimerRef(); + } } } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy index 039b170aa..7510f9929 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy @@ -443,12 +443,9 @@ class TestObjectGenerator { new FilesystemMetadataResolver().with { it.name = 'FilesystemMetadata' it.xmlId = 'FilesystemMetadata' - it.metadataFile = 'metadata.xml' + it.metadataFile = 'metadata/metadata.xml' it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes().with { - it.minRefreshDelay = 'PT5M' - it.maxRefreshDelay = 'PT1H' - it.refreshDelayFactor = 0.75 it } it diff --git a/backend/src/test/resources/conf/520.xml b/backend/src/test/resources/conf/520.xml index 428a20efd..50efab7e9 100644 --- a/backend/src/test/resources/conf/520.xml +++ b/backend/src/test/resources/conf/520.xml @@ -6,9 +6,6 @@ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd" xsi:type="ChainingMetadataProvider">