fix: use correct JSON property names in SignatureAlgorithmDTO, add dash to digestAlgorithmName already during construction

Signed-off-by: Mart Somermaa <mrts@users.noreply.github.com>

Author: mrts

example/src/main/java/eu/webeid/example/service/SigningService.java

@@ -50,7 +50,6 @@
 import javax.xml.bind.DatatypeConverter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
@@ -103,10 +102,11 @@ public DigestDTO prepareContainer(CertificateDTO certificateDTO, WebEidAuthentic
         LOG.info("Preparing container for signing for file '{}'", containerName);
 
         final DigestAlgorithm signatureDigestAlgorithm = TokenAlgorithmSupport.determineSignatureDigestAlgorithm(certificate);
-        final String digestAlgorithmName = signatureDigestAlgorithm.uri().getRef().toUpperCase();
-        if (!certificateDTO.getSupportedAlgorithmNames().contains(digestAlgorithmName)) {
+        final String digestAlgorithmName = signatureDigestAlgorithm.uri().getRef()
+                .toUpperCase().replace("SHA", "SHA-"); // SHA256 -> SHA-256
+        if (!certificateDTO.getSupportedHashFunctionNames().contains(digestAlgorithmName)) {
             throw new IllegalArgumentException("Determined signature digest algorithm '" + digestAlgorithmName +
-                    "' is not supported. Supported algorithms are: " + String.join(", ", certificateDTO.getSupportedAlgorithmNames()));
+                    "' is not supported. Supported algorithms are: " + String.join(", ", certificateDTO.getSupportedHashFunctionNames()));
         }
 
         DataToSign dataToSign = SignatureBuilder
@@ -125,7 +125,7 @@ public DigestDTO prepareContainer(CertificateDTO certificateDTO, WebEidAuthentic
 
         DigestDTO digestDTO = new DigestDTO();
         digestDTO.setHash(DatatypeConverter.printBase64Binary(digest));
-        digestDTO.setHashFunction(digestAlgorithmName.replace("SHA", "SHA-")); // SHA256 -> SHA-256
+        digestDTO.setHashFunction(digestAlgorithmName);
 
         return digestDTO;
     }

example/src/main/java/eu/webeid/example/service/dto/CertificateDTO.java

@@ -22,8 +22,6 @@
 
 package eu.webeid.example.service.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.security.cert.CertificateException;
@@ -62,10 +60,10 @@ public X509Certificate toX509Certificate() throws CertificateException {
         return (X509Certificate) cf.generateCertificate(inStream);
     }
 
-    public List<String> getSupportedAlgorithmNames() {
+    public List<String> getSupportedHashFunctionNames() {
         return supportedSignatureAlgorithms == null ? new ArrayList<>() : supportedSignatureAlgorithms
                 .stream()
-                .map(SignatureAlgorithmDTO::getHashAlgorithm)
+                .map(SignatureAlgorithmDTO::getHashFunction)
                 .distinct()
                 .collect(Collectors.toList());
     }

example/src/main/java/eu/webeid/example/service/dto/SignatureAlgorithmDTO.java

@@ -22,18 +22,13 @@
 
 package eu.webeid.example.service.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 public class SignatureAlgorithmDTO {
 
-    @JsonProperty("crypto-algo")
     private String cryptoAlgorithm;
 
-    @JsonProperty("hash-algo")
-    private String hashAlgorithm;
+    private String hashFunction;
 
-    @JsonProperty("padding-algo")
-    private String paddingAlgorithm;
+    private String paddingScheme;
 
     public String getCryptoAlgorithm() {
         return cryptoAlgorithm;
@@ -43,19 +38,19 @@ public void setCryptoAlgorithm(String cryptoAlgorithm) {
         this.cryptoAlgorithm = cryptoAlgorithm;
     }
 
-    public String getHashAlgorithm() {
-        return hashAlgorithm;
+    public String getHashFunction() {
+        return hashFunction;
     }
 
-    public void setHashAlgorithm(String hashAlgorithm) {
-        this.hashAlgorithm = hashAlgorithm;
+    public void setHashFunction(String hashFunction) {
+        this.hashFunction = hashFunction;
     }
 
-    public String getPaddingAlgorithm() {
-        return paddingAlgorithm;
+    public String getPaddingScheme() {
+        return paddingScheme;
     }
 
-    public void setPaddingAlgorithm(String paddingAlgorithm) {
-        this.paddingAlgorithm = paddingAlgorithm;
+    public void setPaddingScheme(String paddingScheme) {
+        this.paddingScheme = paddingScheme;
     }
 }

example/src/test/java/eu/webeid/example/testutil/ObjectMother.java

@@ -97,7 +97,7 @@ public static CertificateDTO mockPrepareRequest() {
         CertificateDTO certificateDTO = new CertificateDTO();
         certificateDTO.setCertificate(mockCertificateInBase64());
         final SignatureAlgorithmDTO signatureAlgorithmDTO = new SignatureAlgorithmDTO();
-        signatureAlgorithmDTO.setHashAlgorithm("SHA256");
+        signatureAlgorithmDTO.setHashFunction("SHA-256");
         certificateDTO.setSupportedSignatureAlgorithms(List.of(signatureAlgorithmDTO));
         return certificateDTO;
     }