Revert "Adding temporary classes to resolve NoSuchMethodError for Bas…

…icSignatureSigningConfiguration.setSigningCredentials"

This reverts commit 6abf7e0.

ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ClientCache.java

@@ -131,13 +131,7 @@ public SAML2Client add(
         cfg.setServiceProviderEntityId(spEntityID);
         getSPMetadataPath(spEntityID).ifPresent(cfg::setServiceProviderMetadataResourceFilepath);
 
-        SAML2Client saml2Client = new SAML2Client(cfg) {
-
-            @Override
-            protected void initSignatureSigningParametersProvider() {
-                signatureSigningParametersProvider = new SAML2SP4UISignatureSigningParametersProvider(configuration);
-            }
-        };
+        SAML2Client saml2Client = new SAML2Client(cfg);
         saml2Client.setCallbackUrlResolver(new NoParameterCallbackUrlResolver());
         saml2Client.setCallbackUrl(callbackUrl);
         saml2Client.init();

sra/src/main/java/org/apache/syncope/sra/SecurityConfig.java

@@ -37,7 +37,6 @@
 import org.apache.syncope.sra.security.saml2.SAML2MetadataEndpoint;
 import org.apache.syncope.sra.security.saml2.SAML2SecurityConfigUtils;
 import org.apache.syncope.sra.security.saml2.SAML2WebSsoAuthenticationWebFilter;
-import org.apache.syncope.sra.security.saml2.SRASignatureSigningParametersProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.pac4j.core.http.callback.NoParameterCallbackUrlResolver;
 import org.pac4j.saml.client.SAML2Client;
@@ -294,13 +293,7 @@ public InputStream retrieve() throws Exception {
 
         cfg.setSessionLogoutHandler(new NoOpSessionLogoutHandler());
 
-        SAML2Client saml2Client = new SAML2Client(cfg) {
-
-            @Override
-            protected void initSignatureSigningParametersProvider() {
-                signatureSigningParametersProvider = new SRASignatureSigningParametersProvider(configuration);
-            }
-        };
+        SAML2Client saml2Client = new SAML2Client(cfg);
         saml2Client.setName(SRAProperties.AMType.SAML2.name());
         saml2Client.setCallbackUrl(props.getSaml2().getEntityId()
                 + SAML2WebSsoAuthenticationWebFilter.FILTER_PROCESSES_URI);

wa/starter/pom.xml

@@ -203,10 +203,6 @@ under the License.
       <groupId>org.apereo.cas</groupId>
       <artifactId>cas-server-support-saml-idp-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apereo.cas</groupId>
-      <artifactId>cas-server-support-saml-idp-web</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apereo.cas</groupId>
       <artifactId>cas-server-support-oidc</artifactId>

wa/starter/src/main/java/org/apache/syncope/wa/starter/config/WAContext.java

@@ -63,7 +63,6 @@
 import org.apache.syncope.wa.starter.pac4j.WADelegatedClientFactory;
 import org.apache.syncope.wa.starter.pac4j.saml.WASAML2ClientCustomizer;
 import org.apache.syncope.wa.starter.saml.idp.WASamlIdPCasEventListener;
-import org.apache.syncope.wa.starter.saml.idp.WASamlIdPObjectSigner;
 import org.apache.syncope.wa.starter.saml.idp.metadata.WASamlIdPMetadataGenerator;
 import org.apache.syncope.wa.starter.saml.idp.metadata.WASamlIdPMetadataLocator;
 import org.apache.syncope.wa.starter.services.WAServiceRegistry;
@@ -97,13 +96,11 @@
 import org.apereo.cas.support.saml.idp.metadata.generator.SamlIdPMetadataGeneratorConfigurationContext;
 import org.apereo.cas.support.saml.idp.metadata.locator.SamlIdPMetadataLocator;
 import org.apereo.cas.support.saml.services.idp.metadata.SamlIdPMetadataDocument;
-import org.apereo.cas.support.saml.web.idp.profile.builders.enc.SamlIdPObjectSigner;
 import org.apereo.cas.util.DateTimeUtils;
 import org.apereo.cas.util.LdapUtils;
 import org.apereo.cas.util.crypto.CipherExecutor;
 import org.apereo.cas.webauthn.storage.WebAuthnCredentialRepository;
 import org.ldaptive.ConnectionFactory;
-import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.pac4j.core.client.Client;
 import org.pac4j.core.client.IndirectClient;
 import org.pac4j.saml.store.SAMLMessageStoreFactory;
@@ -304,19 +301,10 @@ public SamlIdPMetadataLocator samlIdPMetadataLocator(
             final Cache<String, SamlIdPMetadataDocument> samlIdPMetadataCache,
             final WARestClient waRestClient) {
 
-        return new WASamlIdPMetadataLocator(cipherExecutor, samlIdPMetadataCache, waRestClient);
-    }
-
-    @Bean
-    @RefreshScope(proxyMode = ScopedProxyMode.DEFAULT)
-    public SamlIdPObjectSigner samlObjectSigner(
-            final CasConfigurationProperties casProperties,
-            @Qualifier("casSamlIdPMetadataResolver")
-            final MetadataResolver casSamlIdPMetadataResolver,
-            @Qualifier("samlIdPMetadataLocator")
-            final SamlIdPMetadataLocator samlIdPMetadataLocator) {
-
-        return new WASamlIdPObjectSigner(casSamlIdPMetadataResolver, casProperties, samlIdPMetadataLocator);
+        return new WASamlIdPMetadataLocator(
+                cipherExecutor,
+                samlIdPMetadataCache,
+                waRestClient);
     }
 
     @Bean