changed async processing of files to synchronous

Author: Hirzelts

codeanalysis/lcov.info

@@ -28,15 +28,9 @@ end_of_record
 TN:
 SF:C:\Users\Peter\Documents\Bachelor\javascript-forge-cryptoexamples\src\allinone\ExampleFileEncryption.js
 FN:29,(anonymous_0)
-FN:49,(anonymous_1)
-FN:65,(anonymous_2)
-FN:80,(anonymous_3)
-FNF:4
-FNH:4
+FNF:1
+FNH:1
 FNDA:2,(anonymous_0)
-FNDA:2,(anonymous_1)
-FNDA:2,(anonymous_2)
-FNDA:2,(anonymous_3)
 DA:12,1
 DA:13,1
 DA:14,1
@@ -49,35 +43,34 @@ DA:35,2
 DA:40,2
 DA:41,2
 DA:44,2
+DA:47,2
+DA:48,2
 DA:49,2
-DA:50,2
+DA:51,2
+DA:52,2
 DA:53,2
 DA:54,2
-DA:56,2
+DA:55,2
 DA:57,2
-DA:58,2
-DA:59,2
 DA:60,2
 DA:62,2
-DA:65,2
-DA:67,2
+DA:63,2
 DA:68,2
+DA:69,2
+DA:70,2
+DA:71,2
 DA:73,2
-DA:74,2
 DA:75,2
 DA:76,2
-DA:78,2
-DA:80,2
-DA:81,2
-DA:89,0
-DA:93,1
-DA:96,1
-LF:35
-LH:34
+DA:81,0
+DA:85,1
+DA:88,1
+LF:34
+LH:33
 BRDA:34,0,0,2
 BRDA:34,0,1,0
-BRDA:83,1,0,2
-BRDA:83,1,1,0
+BRDA:78,1,0,2
+BRDA:78,1,1,0
 BRF:4
 BRH:2
 end_of_record

src/allinone/ExampleFileEncryption.js

@@ -43,48 +43,40 @@ const demonstrateFileEncryption = () => {
     //create random initialization vector
     let iv = forge.random.getBytesSync(16);
 
-    // read file and encrypt/decrypt with an ansynchronous control flow
-    let input;
-    let encrypted;
-    fs.readFile("file.txt", (error, data) => {
-      input = data;
+    // ENCRYPT the file
+    let input = fs.readFileSync("file.txt");
+    let cipher = forge.cipher.createCipher("AES-GCM", key);
+    cipher.start({ iv: iv });
+    // node buffer and forge buffer differ, so the node buffer must be converted to a forge Buffer
+    cipher.update(forge.util.createBuffer(input.toString("binary")));
+    cipher.finish();
+    let tag = cipher.mode.tag;
+    encrypted = forge.util.createBuffer();
+    encrypted.putBuffer(cipher.output);
+    // node buffer and forge buffer differ, so the forge buffer must be converted to a node Buffer
+    encrypted = Buffer.from(encrypted.getBytes(), "binary");
 
-      // ENCRYPT the file
-      let cipher = forge.cipher.createCipher("AES-GCM", key);
-      cipher.start({ iv: iv });
-      // node buffer and forge buffer differ, so the node buffer must be converted to a forge Buffer
-      cipher.update(forge.util.createBuffer(data.toString("binary")));
-      cipher.finish();
-      let tag = cipher.mode.tag;
-      encrypted = forge.util.createBuffer();
-      encrypted.putBuffer(cipher.output);
-      // node buffer and forge buffer differ, so the forge buffer must be converted to a node Buffer
-      encrypted = Buffer.from(encrypted.getBytes(), "binary");
-
-      // write encrypted file
-      fs.writeFile("file.enc.txt", encrypted, error => {
-        // DECRYPT the file
-        let decipher = forge.cipher.createDecipher("AES-GCM", key);
-        decipher.start({
-          iv: iv,
-          tag: tag
-        });
-        // node buffer and forge buffer differ, so the node buffer must be converted to a forge Buffer
-        decipher.update(forge.util.createBuffer(encrypted.toString("binary")));
-        decipher.finish();
-        let decrypted = forge.util.createBuffer();
-        decrypted.putBuffer(decipher.output);
-        // node buffer and forge buffer differ, so the forge buffer must be converted to a node Buffer
-        decrypted = Buffer.from(decrypted.getBytes(), "binary");
-
-        fs.writeFile("file.dec.txt", decrypted, error => {
-          logger.info(
-            "Decrypted file content and original file content are the same: %s",
-            Buffer.compare(input, decrypted) === 0 ? "yes" : "no"
-          );
-        });
-      });
+    // write encrypted file
+    fs.writeFileSync("file.enc.txt", encrypted);
+    // DECRYPT the file
+    let decipher = forge.cipher.createDecipher("AES-GCM", key);
+    decipher.start({
+      iv: iv,
+      tag: tag
     });
+    // node buffer and forge buffer differ, so the node buffer must be converted to a forge Buffer
+    decipher.update(forge.util.createBuffer(encrypted.toString("binary")));
+    decipher.finish();
+    let decrypted = forge.util.createBuffer();
+    decrypted.putBuffer(decipher.output);
+    // node buffer and forge buffer differ, so the forge buffer must be converted to a node Buffer
+    decrypted = Buffer.from(decrypted.getBytes(), "binary");
+
+    fs.writeFileSync("file.dec.txt", decrypted);
+    logger.info(
+      "Decrypted file content and original file content are the same: %s",
+      Buffer.compare(input, decrypted) === 0 ? "yes" : "no"
+    );
   } catch (error) {
     logger.error(error.message);
   }

test/allinone/ExampleFileEncryption.test.js

@@ -10,15 +10,16 @@ chai.use(sinonChai);
 describe("ExampleFileEncryption allInOne crypto Test runs", function() {
   beforeEach(function() {
     sinon.spy(testee.logger, "error");
+    sinon.spy(testee.logger, "info");
   });
 
   afterEach(function() {
     testee.logger.error.restore();
+    testee.logger.info.restore();
   });
 
-  it("logger output should confirm that files are the same", function() {
-    testee.demonstrateFileEncryption();
-    chai.expect(testee.logger.error).to.not.be.called;
-    // chai.assert.include(logger.info.getCall(0).args, "yes");
+  it("logger output should confirm that files are the same", async function() {
+    await testee.demonstrateFileEncryption();
+    chai.assert.include(testee.logger.info.getCall(0).args, "yes");
   });
 });