Encryption and decryption now works

Author: zubairov

lib/actions/publish.js

@@ -33,6 +33,7 @@ function processAction(msg, cfg) {
       body: msg.body.payload || msg.body,
       attachments: msg.attachments
     });
+    console.log(encryptedData, encryptor.decryptMessageContent(encryptedData));
     channel.publish(amqpExchange, 'foo', encryptedData, {
       contentType: "application/octet-stream",
       messageId: msg.id
@@ -42,6 +43,10 @@ function processAction(msg, cfg) {
     console.log('Message publishing confirmed id=%s', msg.id);
     this.emit('data', msg);
     this.emit('end');
+    console.log('Closing the channel');
+    yield channel.close();
+    console.log('Closing the connnection');
+    yield conn.close();
   }.bind(this)).catch(err => {
     console.log('Error occurred', err.stack || err);
     this.emit('error', err);

lib/cipher.js

@@ -34,12 +34,9 @@ function encryptIV(rawData) {
 function decryptIV(encData) {
     debug('About to decrypt:', encData);
 
-    if (!_.isString(encData)) {
-        throw new Error('RabbitMQ message cipher.decryptIV() accepts only string as parameter.');
-    }
-
     if (!PASSWORD) {
-        return encData;
+      console.log('Decryption will be skipped as ELASTICIO_MESSAGE_CRYPTO_PASSWORD env is empty');
+      return encData;
     }
 
     if (!VECTOR) {

lib/encryptor.js

@@ -7,12 +7,12 @@ function encryptMessageContent(messagePayload) {
     return cipher.encrypt(JSON.stringify(messagePayload));
 }
 
-function decryptMessageContent(messagePayload, messageHeaders) {
-    if (!messagePayload || messagePayload.toString().length === 0) {
-        return null;
+function decryptMessageContent(messagePayload) {
+    if (!messagePayload || ! Buffer.isBuffer(messagePayload)) {
+        throw new Error("Message payload supplied for decryption is either empty or not a Buffer");
     }
     try {
-        return JSON.parse(cipher.decrypt(messagePayload.toString()));
+        return JSON.parse(cipher.decrypt(messagePayload));
     } catch (err) {
         console.error(err.stack);
         throw Error('Failed to decrypt message: ' + err.message);