update tests

apereo · Sep 5, 2024 · 44aa77b · 44aa77b
1 parent 2595fde
commit 44aa77b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 31 deletions.
diff --git a/...rg/apereo/cas/support/saml/idp/metadata/generator/FileSystemSamlIdPMetadataGenerator.java b/...rg/apereo/cas/support/saml/idp/metadata/generator/FileSystemSamlIdPMetadataGenerator.java
@@ -58,7 +58,8 @@ public Pair<String, String> buildSelfSignedSigningCert(final Optional<SamlRegist
 
     @Override
     protected String writeMetadata(final String metadata, final Optional<SamlRegisteredService> registeredService) throws Throwable {
-        val metadataFile = getConfigurationContext().getSamlIdPMetadataLocator().resolveMetadata(registeredService).getFile();
+        val metadataResource = getConfigurationContext().getSamlIdPMetadataLocator().resolveMetadata(registeredService);
+        val metadataFile = metadataResource.getFile();
         LOGGER.info("Writing SAML2 metadata to [{}]", metadataFile);
 
         val mdProps = getConfigurationContext().getCasProperties().getAuthn().getSamlIdp().getMetadata();

diff --git a/...ml-idp/src/test/java/org/apereo/cas/support/saml/services/SamlRegisteredServiceTests.java b/...ml-idp/src/test/java/org/apereo/cas/support/saml/services/SamlRegisteredServiceTests.java
@@ -25,6 +25,7 @@
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
+import org.springframework.test.context.TestPropertySource;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -40,6 +41,7 @@
  * @since 5.0.0
  */
 @Tag("SAML2")
+@TestPropertySource(properties = "cas.authn.saml-idp.metadata.file-system.location=${#systemProperties['java.io.tmpdir']}/saml33182")
 class SamlRegisteredServiceTests extends BaseSamlIdPConfigurationTests {
 
     private static final ObjectMapper MAPPER = JacksonObjectMapperFactory.builder()

diff --git a/...pport/saml/web/idp/profile/builders/enc/encoder/sso/SamlResponseArtifactEncoderTests.java b/...pport/saml/web/idp/profile/builders/enc/encoder/sso/SamlResponseArtifactEncoderTests.java
@@ -26,7 +26,10 @@
  * @since 6.3.0
  */
 @Tag("SAML2")
-@TestPropertySource(properties = "cas.tgc.crypto.enabled=false")
+@TestPropertySource(properties = {
+    "cas.authn.saml-idp.metadata.file-system.location=${#systemProperties['java.io.tmpdir']}/saml22182",
+    "cas.tgc.crypto.enabled=false"
+})
 class SamlResponseArtifactEncoderTests extends BaseSamlIdPConfigurationTests {
     @Test
     void verifyOperation() throws Throwable {

diff --git a/...erver-support-saml-idp/src/test/java/org/apereo/cas/web/flow/BaseSamlIdPWebflowTests.java b/...erver-support-saml-idp/src/test/java/org/apereo/cas/web/flow/BaseSamlIdPWebflowTests.java
@@ -3,18 +3,12 @@
 import org.apereo.cas.config.CasCoreSamlAutoConfiguration;
 import org.apereo.cas.config.CasSamlIdPAutoConfiguration;
 import org.apereo.cas.support.saml.OpenSamlConfigBean;
-import org.apereo.cas.support.saml.idp.metadata.locator.FileSystemSamlIdPMetadataLocator;
-import org.apereo.cas.support.saml.idp.metadata.locator.SamlIdPMetadataLocator;
 import org.apereo.cas.support.saml.services.SamlRegisteredService;
-import org.apereo.cas.support.saml.services.idp.metadata.SamlIdPMetadataDocument;
 import org.apereo.cas.support.saml.services.idp.metadata.SamlRegisteredServiceMetadataAdaptor;
 import org.apereo.cas.support.saml.services.idp.metadata.cache.SamlRegisteredServiceCachingMetadataResolver;
 import org.apereo.cas.support.saml.web.idp.profile.builders.enc.SamlIdPObjectSigner;
 import org.apereo.cas.test.CasTestExtension;
-import org.apereo.cas.util.crypto.CipherExecutor;
-import com.github.benmanes.caffeine.cache.Cache;
 import lombok.val;
-import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.saml.common.xml.SAMLConstants;
@@ -24,11 +18,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.io.FileSystemResource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.UUID;
@@ -40,7 +29,6 @@
  * @author Misagh Moayyed
  * @since 6.2.0
  */
-@Import(BaseSamlIdPWebflowTests.SamlIdPMetadataTestConfiguration.class)
 @ImportAutoConfiguration({
     CasCoreSamlAutoConfiguration.class,
     CasSamlIdPAutoConfiguration.class
@@ -82,22 +70,6 @@ protected static AuthnRequest getAuthnRequestFor(final String service) {
         when(authnRequest.getIssuer()).thenReturn(issuer);
         return authnRequest;
     }
-
-    @TestConfiguration(value = "SamlIdPMetadataTestConfiguration", proxyBeanMethods = false)
-    static class SamlIdPMetadataTestConfiguration {
-        @Autowired
-        @Qualifier("samlIdPMetadataCache")
-        private Cache<String, SamlIdPMetadataDocument> samlIdPMetadataCache;
-
-        @Bean
-        public SamlIdPMetadataLocator samlIdPMetadataLocator(
-            final ConfigurableApplicationContext applicationContext) throws Exception {
-            return new FileSystemSamlIdPMetadataLocator(
-                CipherExecutor.noOpOfStringToString(),
-                new FileSystemResource(FileUtils.getTempDirectory()),
-                samlIdPMetadataCache, applicationContext);
-        }
-    }
 }
 
 
diff --git a/...st/java/org/apereo/cas/web/flow/SamlIdPConsentSingleSignOnParticipationStrategyTests.java b/...st/java/org/apereo/cas/web/flow/SamlIdPConsentSingleSignOnParticipationStrategyTests.java
@@ -19,6 +19,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.test.context.TestPropertySource;
 import java.util.List;
 import java.util.UUID;
 import static org.junit.jupiter.api.Assertions.*;
@@ -31,6 +32,7 @@
  */
 @Tag("SAML2")
 @ImportAutoConfiguration(CasConsentCoreAutoConfiguration.class)
+@TestPropertySource(properties = "cas.authn.saml-idp.metadata.file-system.location=${#systemProperties['java.io.tmpdir']}/saml12182")
 class SamlIdPConsentSingleSignOnParticipationStrategyTests extends BaseSamlIdPWebflowTests {
 
     @Autowired

diff --git a/webapp/cas-server-webapp-resources/src/main/resources/application.properties b/webapp/cas-server-webapp-resources/src/main/resources/application.properties
@@ -70,7 +70,7 @@ server.jetty.threads.min=20
 server.jetty.connection-idle-timeout=15000
 server.jetty.accesslog.enabled=true
 server.jetty.accesslog.file-date-format=yyyy-MM-dd
-server.jetty.accesslog.filename=build/jetty-requests.log
+server.jetty.accesslog.filename=jetty-requests.log
 server.jetty.accesslog.retention-period=2
 
 ##