added encryption

manager/Dockerfile

@@ -5,6 +5,7 @@ CMD jar -xf manager-3.0.0.jar BOOT-INF/classes/application.properties && \
     sed -ie "s#^message.broker.host=.*#message.broker.host=$RABBITMQ_HOST#" BOOT-INF/classes/application.properties && \ 
     sed -ie "s#^db.host=.*#db.host=$MONGO_HOST#" BOOT-INF/classes/application.properties && \ 
     sed -ie "s#^sure-tosca.base.path=.*#sure-tosca.base.path=$SURE_TOSCA_BASE_PATH#" BOOT-INF/classes/application.properties && \
+    echo "credential.secret=$CREDENTIAL_SECRET" >> application.properties && \
     cat BOOT-INF/classes/application.properties && \
     jar -uf manager-3.0.0.jar BOOT-INF/classes/application.properties && \
     java -jar manager-3.0.0.jar

manager/src/main/java/nl/uva/sne/drip/api/CredentialApiController.java

@@ -3,6 +3,9 @@ package nl.uva.sne.drip.api;
 import nl.uva.sne.drip.model.tosca.Credential;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.*;
+import java.io.UnsupportedEncodingException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -12,6 +15,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import javax.validation.Valid;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.logging.Level;
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
 import nl.uva.sne.drip.service.CredentialService;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -41,8 +48,12 @@ public class CredentialApiController implements CredentialApi {
             @Valid @RequestBody Credential body) {
         String accept = request.getHeader("Accept");
         if (accept != null && accept.contains("application/json")) {
-            String id = credentialService.save(body);
-            return new ResponseEntity<>(id, HttpStatus.OK);
+            try {
+                String id = credentialService.save(body);
+                return new ResponseEntity<>(id, HttpStatus.OK);
+            } catch (UnsupportedEncodingException | NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | IllegalBlockSizeException | BadPaddingException ex) {
+                return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+            }
         } else {
             return new ResponseEntity<>(HttpStatus.NOT_ACCEPTABLE);
         }

manager/src/main/java/nl/uva/sne/drip/service/CredentialService.java

@@ -5,7 +5,6 @@
  */
 package nl.uva.sne.drip.service;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import java.io.UnsupportedEncodingException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -38,7 +37,7 @@ public class CredentialService {
 
     public String save(Credential document) throws UnsupportedEncodingException, NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
 
-        dao.save(encryptCredential(document));
+        dao.save(Converter.encryptCredential(document,credentialSecret));
         return document.getId();
     }
 
@@ -68,21 +67,6 @@ public class CredentialService {
         return dao.findBycloudProviderName(provider);
     }
 
-    private Credential encryptCredential(Credential credential) throws UnsupportedEncodingException, NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
 
-        Map<String, String> credKeys = credential.getKeys();
-        Set<String> keySet = credKeys.keySet();
-        for (String key : keySet) {
-            String credKey = credKeys.get(key);
-            if (credKey != null) {
-                credKeys.put(key, Converter.encryptString(credKey, credentialSecret));
-            }
-        }
-        String token = credential.getToken();
-        if (token != null) {
-            credential.setToken(Converter.encryptString(token, credentialSecret));
-        }
-        return credential;
-    }
 
 }