fix: trim application certificate before compare

gravitee-io · Nov 22, 2024 · a5d44f9 · a5d44f9
1 parent bc806d8
commit a5d44f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...t-api-service/src/main/java/io/gravitee/rest/api/service/impl/ApplicationServiceImpl.java b/...t-api-service/src/main/java/io/gravitee/rest/api/service/impl/ApplicationServiceImpl.java
@@ -729,8 +729,9 @@ public ApplicationEntity update(
                 String existingCertificate = applicationToUpdate.getMetadata().get(METADATA_CLIENT_CERTIFICATE);
                 metadata.put(METADATA_CLIENT_CERTIFICATE, existingCertificate);
                 String newCertificate = updateApplicationEntity.getSettings().getTls().getClientCertificate();
-                existingCertificate = existingCertificate != null ? new String(Base64.getDecoder().decode(existingCertificate)) : null;
-                if (newCertificate != null && !newCertificate.equals(existingCertificate)) {
+                existingCertificate =
+                    existingCertificate != null ? new String(Base64.getDecoder().decode(existingCertificate)).trim() : null;
+                if (newCertificate != null && !newCertificate.trim().equals(existingCertificate)) {
                     throw new ClientCertificateChangeNotAllowedException();
                 }
             }

diff --git a/...ervice/src/test/java/io/gravitee/rest/api/service/impl/ApplicationService_UpdateTest.java b/...ervice/src/test/java/io/gravitee/rest/api/service/impl/ApplicationService_UpdateTest.java
@@ -993,5 +993,6 @@ public void should_not_update_client_id_of_subscriptions_with_null_client_id() t
            vVJj7N1kwlzS2KIysLrefl7PUMikuuEopTH6Xmi9obDZfywPoK2LxUdnN3m8KmUe
            FPeI4PKEw5AUf97H
            -----END CERTIFICATE-----
+           
            """;
 }