Merge pull request #3113 from cloudfoundry/new-saml-0530-not-in-use

New saml 0530 not in use

Author: duanemay

server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsController.java

@@ -144,7 +144,7 @@ public String acceptInvitePage(@RequestParam String code, Model model, HttpServl
 
                 SamlIdentityProviderDefinition definition = ObjectUtils.castInstance(provider.getConfig(), SamlIdentityProviderDefinition.class);
 
-                String redirect = "redirect:/" + SamlRedirectUtils.getIdpRedirectUrl(definition, spEntityID, IdentityZoneHolder.get());
+                String redirect = "redirect:/" + SamlRedirectUtils.getIdpRedirectUrl(definition);
                 logger.debug(String.format("Redirecting invitation for email:%s, id:%s single SAML IDP URL:%s", codeData.get("email"), codeData.get("user_id"), redirect));
                 return redirect;
             } else if (OIDC10.equals(provider.getType()) || OAUTH20.equals(provider.getType())) {

server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpoint.java

@@ -597,7 +597,7 @@ public String deleteSavedAccount(HttpServletRequest request, HttpServletResponse
     private String redirectToExternalProvider(AbstractIdentityProviderDefinition idpForRedirect, String idpOriginKey, HttpServletRequest request) {
         if (idpForRedirect != null) {
             if (idpForRedirect instanceof SamlIdentityProviderDefinition samlIdentityProviderDefinition) {
-                String url = SamlRedirectUtils.getIdpRedirectUrl(samlIdentityProviderDefinition, entityID, IdentityZoneHolder.get());
+                String url = SamlRedirectUtils.getIdpRedirectUrl(samlIdentityProviderDefinition);
                 return "redirect:/" + url;
             } else if (idpForRedirect instanceof AbstractExternalOAuthIdentityProviderDefinition providerDefinition) {
                 String redirectUrl = getRedirectUrlForExternalOAuthIDP(request, idpOriginKey, providerDefinition);

server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlRedirectUtils.java

@@ -25,7 +25,7 @@ private SamlRedirectUtils() {
         throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }
 
-    public static String getIdpRedirectUrl(SamlIdentityProviderDefinition definition, String entityId, IdentityZone identityZone) {
+    public static String getIdpRedirectUrl(SamlIdentityProviderDefinition definition) {
         String entityIdAlias = definition.getIdpEntityAlias();
         UriComponentsBuilder builder = UriComponentsBuilder.fromPath("saml2/authenticate/%s".formatted(entityIdAlias));
         return builder.build().toUriString();

server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlRedirectUtilsTest.java

@@ -16,7 +16,6 @@
 
 import org.cloudfoundry.identity.uaa.provider.SamlIdentityProviderDefinition;
 import org.cloudfoundry.identity.uaa.zone.IdentityZone;
-import org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,8 +35,7 @@ void getIdpRedirectUrl() {
                         .setLinkText("link text")
                         .setZoneId(IdentityZone.getUaaZoneId());
 
-        String domain = "login.random-made-up-url.com";
-        String url = SamlRedirectUtils.getIdpRedirectUrl(definition, domain, IdentityZoneHolder.get());
+        String url = SamlRedirectUtils.getIdpRedirectUrl(definition);
         assertThat(url).isEqualTo("saml2/authenticate/simplesamlphp-url");
     }
 

server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/TestSaml2X509Credentials.java

@@ -97,10 +97,10 @@ private static PrivateKey privateKey(String key) {
         key = key.replace("-----BEGIN PRIVATE KEY-----", "");
         key = key.replace("-----END PRIVATE KEY-----", "");
         key = key.replaceAll("\\s+", "");
-        return decodePrivateKey(key.getBytes(StandardCharsets.UTF_8), new char[0]);
+        return decodePrivateKey(key.getBytes(StandardCharsets.UTF_8));
     }
 
-    private static PrivateKey decodePrivateKey(byte[] keyBytes, char[] password) {
+    private static PrivateKey decodePrivateKey(byte[] keyBytes) {
         try {
             byte[] pkcs8EncodedBytes = Base64.decode(keyBytes);
             PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(pkcs8EncodedBytes);