Merge pull request #17 from 3KeyCompany/release/1.2.0

Release version 1.2.0

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.czertainly</groupId>
     <artifactId>software-cryptography-provider</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
     <name>CZERTAINLY-Software-Cryptography-Provider</name>
 
     <properties>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.czertainly</groupId>
             <artifactId>interfaces</artifactId>
-            <version>2.7.0</version>
+            <version>2.8.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->

src/main/java/com/czertainly/cp/soft/api/CallbackController.java

@@ -3,9 +3,9 @@
 import com.czertainly.api.model.common.attribute.v2.BaseAttribute;
 import com.czertainly.api.model.common.attribute.v2.content.BaseAttributeContent;
 import com.czertainly.api.model.common.attribute.v2.content.StringAttributeContent;
+import com.czertainly.api.model.common.enums.cryptography.KeyAlgorithm;
 import com.czertainly.api.model.connector.cryptography.token.TokenInstanceDto;
 import com.czertainly.cp.soft.attribute.*;
-import com.czertainly.cp.soft.collection.KeyAlgorithm;
 import com.czertainly.cp.soft.exception.NotSupportedException;
 import com.czertainly.cp.soft.service.TokenInstanceService;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/czertainly/cp/soft/api/CryptographicOperationsControllerImpl.java

@@ -34,12 +34,12 @@ public void setAttributeService(AttributeService attributeService) {
 
     @Override
     public EncryptDataResponseDto encryptData(String uuid, String keyUuid, CipherDataRequestDto request) throws NotFoundException {
-        throw new NotSupportedException("Cipher not supported.");
+        return cryptographicOperationsService.encryptData(UUID.fromString(uuid), UUID.fromString(keyUuid), request);
     }
 
     @Override
     public DecryptDataResponseDto decryptData(String uuid, String keyUuid, CipherDataRequestDto request) throws NotFoundException {
-        throw new NotSupportedException("Cipher not supported.");
+        return cryptographicOperationsService.decryptData(UUID.fromString(uuid), UUID.fromString(keyUuid), request);
     }
 
     @Override

src/main/java/com/czertainly/cp/soft/attribute/KeyAttributes.java

@@ -8,11 +8,13 @@
 import com.czertainly.api.model.common.attribute.v2.content.StringAttributeContent;
 import com.czertainly.api.model.common.attribute.v2.properties.DataAttributeProperties;
 import com.czertainly.api.model.common.attribute.v2.properties.MetadataAttributeProperties;
-import com.czertainly.cp.soft.collection.KeyAlgorithm;
+import com.czertainly.api.model.common.enums.cryptography.KeyAlgorithm;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class KeyAttributes {
 
@@ -83,7 +85,11 @@ public static BaseAttribute buildDataKeyAlgorithmSelect() {
         attributeProperties.setReadOnly(false);
         attribute.setProperties(attributeProperties);
         // set content
-        attribute.setContent(KeyAlgorithm.asStringAttributeContentList());
+        attribute.setContent(
+                Stream.of(KeyAlgorithm.values())
+                        .map(item -> new StringAttributeContent(item.getLabel(), item.getCode()))
+                        .collect(Collectors.toList())
+        );
 
         return attribute;
     }

src/main/java/com/czertainly/cp/soft/attribute/RsaCipherAttributes.java

@@ -0,0 +1,7 @@
+package com.czertainly.cp.soft.attribute;
+
+public class RsaCipherAttributes {
+    public static final String ATTRIBUTE_DATA_RSA_ENC_SCHEME_NAME = "data_rsaEncScheme";
+    public static final String ATTRIBUTE_DATA_RSA_OAEP_HASH_NAME = "data_rsaOaepHash";
+    public static final String ATTRIBUTE_DATA_RSA_OAEP_USE_MGF_NAME = "data_rsaOaepMgf";
+}

src/main/java/com/czertainly/cp/soft/config/WebAppConfig.java

@@ -0,0 +1,22 @@
+package com.czertainly.cp.soft.config;
+
+import com.czertainly.api.model.common.enums.cryptography.KeyAlgorithm;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebAppConfig implements WebMvcConfigurer {
+    @Override
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addConverter(new Converter<String, KeyAlgorithm>() {
+            @Override
+            public KeyAlgorithm convert(String source) {
+                return KeyAlgorithm.findByCode(source);
+            }
+        });
+    }
+}

src/main/java/com/czertainly/cp/soft/dao/converter/KeyAlgorithmConverter.java

@@ -0,0 +1,26 @@
+package com.czertainly.cp.soft.dao.converter;
+
+import com.czertainly.api.model.common.enums.cryptography.KeyAlgorithm;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class KeyAlgorithmConverter implements AttributeConverter<KeyAlgorithm, String> {
+
+    @Override
+    public String convertToDatabaseColumn(KeyAlgorithm keyAlgorithm) {
+        if (keyAlgorithm == null) {
+            return null;
+        }
+        return keyAlgorithm.name();
+    }
+
+    @Override
+    public KeyAlgorithm convertToEntityAttribute(String keyAlgorithm) {
+        if (keyAlgorithm == null) {
+            return null;
+        }
+        return KeyAlgorithm.valueOf(keyAlgorithm);
+    }
+
+}

src/main/java/com/czertainly/cp/soft/dao/converter/KeyFormatConverter.java

@@ -1,6 +1,6 @@
 package com.czertainly.cp.soft.dao.converter;
 
-import com.czertainly.api.model.connector.cryptography.enums.KeyFormat;
+import com.czertainly.api.model.common.enums.cryptography.KeyFormat;
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
 

src/main/java/com/czertainly/cp/soft/dao/converter/KeyTypeConverter.java

@@ -1,6 +1,6 @@
 package com.czertainly.cp.soft.dao.converter;
 
-import com.czertainly.api.model.connector.cryptography.enums.KeyType;
+import com.czertainly.api.model.common.enums.cryptography.KeyType;
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
 

src/main/java/com/czertainly/cp/soft/dao/entity/KeyData.java

@@ -1,9 +1,9 @@
 package com.czertainly.cp.soft.dao.entity;
 
 import com.czertainly.api.model.common.attribute.v2.MetadataAttribute;
-import com.czertainly.api.model.connector.cryptography.enums.CryptographicAlgorithm;
-import com.czertainly.api.model.connector.cryptography.enums.KeyFormat;
-import com.czertainly.api.model.connector.cryptography.enums.KeyType;
+import com.czertainly.api.model.common.enums.cryptography.KeyAlgorithm;
+import com.czertainly.api.model.common.enums.cryptography.KeyFormat;
+import com.czertainly.api.model.common.enums.cryptography.KeyType;
 import com.czertainly.api.model.connector.cryptography.key.KeyDataResponseDto;
 import com.czertainly.api.model.connector.cryptography.key.value.*;
 import com.czertainly.core.util.AttributeDefinitionUtils;
@@ -29,7 +29,7 @@ public class KeyData extends UniquelyIdentified {
     private KeyType type;
 
     @Column(name = "algorithm")
-    private CryptographicAlgorithm algorithm;
+    private KeyAlgorithm algorithm;
 
     @Column(name = "format")
     private KeyFormat format;
@@ -74,11 +74,11 @@ public void setType(KeyType type) {
         this.type = type;
     }
 
-    public CryptographicAlgorithm getAlgorithm() {
+    public KeyAlgorithm getAlgorithm() {
         return algorithm;
     }
 
-    public void setAlgorithm(CryptographicAlgorithm algorithm) {
+    public void setAlgorithm(KeyAlgorithm algorithm) {
         this.algorithm = algorithm;
     }
 

src/main/java/com/czertainly/cp/soft/service/CryptographicOperationsService.java

@@ -13,4 +13,7 @@ public interface CryptographicOperationsService {
 
     RandomDataResponseDto randomData(String uuid, RandomDataRequestDto request);
 
+    DecryptDataResponseDto decryptData(UUID uuid, UUID keyUuid, CipherDataRequestDto request) throws NotFoundException;
+
+    EncryptDataResponseDto encryptData(UUID uuid, UUID keyUuid, CipherDataRequestDto request) throws NotFoundException;
 }

src/main/java/com/czertainly/cp/soft/service/impl/CryptographicOperationsServiceImpl.java

@@ -1,7 +1,7 @@
 package com.czertainly.cp.soft.service.impl;
 
 import com.czertainly.api.exception.NotFoundException;
-import com.czertainly.api.model.connector.cryptography.enums.KeyType;
+import com.czertainly.api.model.common.enums.cryptography.KeyType;
 import com.czertainly.api.model.connector.cryptography.operations.*;
 import com.czertainly.api.model.connector.cryptography.operations.data.SignatureRequestData;
 import com.czertainly.api.model.connector.cryptography.operations.data.SignatureResponseData;
@@ -10,6 +10,7 @@
 import com.czertainly.cp.soft.exception.CryptographicOperationException;
 import com.czertainly.cp.soft.service.CryptographicOperationsService;
 import com.czertainly.cp.soft.service.KeyManagementService;
+import com.czertainly.cp.soft.util.CipherUtil;
 import com.czertainly.cp.soft.util.SecureRandomUtil;
 import com.czertainly.cp.soft.util.SignatureUtil;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -126,4 +127,16 @@ public RandomDataResponseDto randomData(String uuid, RandomDataRequestDto reques
         response.setData(bytes);
         return response;
     }
+
+    @Override
+    public DecryptDataResponseDto decryptData(UUID uuid, UUID keyUuid, CipherDataRequestDto request) throws NotFoundException {
+        KeyData key = keyManagementService.getKeyEntity(uuid, keyUuid);
+        return CipherUtil.decrypt(request, key);
+    }
+
+    @Override
+    public EncryptDataResponseDto encryptData(UUID uuid, UUID keyUuid, CipherDataRequestDto request) throws NotFoundException {
+        KeyData key = keyManagementService.getKeyEntity(uuid, keyUuid);
+        return CipherUtil.encrypt(request, key);
+    }
 }