Now pks/add accepts files as entries

lib/jpgp.js

@@ -56,19 +56,25 @@ function JPGP() {
   }
 
   function command(c, args, callback) {
-    var argsStr = "-" + c;
+    var argsStr = "";
     for (var i = 0; i < args.length; i++) {
       argsStr += " -" + args[i].opt;
       if(args[i].value){
         argsStr += " " + args[i].value;
       }
     }
-    call(argsStr, callback);
+    call(c, argsStr, callback);
   }
 
-  function call(args, callback) {
-    var cmd = 'java -jar '+ JPGP_JAR + ' ' + args;
-    exec(cmd, callback);
+  function call(c, args, callback) {
+    var cmd = 'java -jar '+ JPGP_JAR + ' -' + c + args;
+    var start = new Date();
+    exec(cmd, function (err, stdout, stderr) {
+      var end = new Date();
+      var diff = end.getTime() - start.getTime();
+      console.log("jpgp -" + c, diff + " ms");
+      callback(err, stdout, stderr);
+    });
   }
 }
 

lib/pks.js

@@ -57,21 +57,83 @@ module.exports.add.get = function (req, res) {
   res.render('../views/pks/add.ejs');
 };
 
-module.exports.add.post = function (req, res) {
-  if(req.body && req.body.keytext && req.body.keysign){
-    var extractPK = req.body.keytext.trim().match(/(-----BEGIN PGP[\s\S]*-----END PGP.*-----)/);
-    var extractSIG = req.body.keysign.trim().match(/(-----BEGIN PGP[\s\S]*-----END PGP.*-----)/);
-    if(extractPK && extractPK.length > 1 && extractSIG && extractSIG.length > 1){
+function getAAMessage(keytext, callback) {
+  if(keytext){
+    var extractPK = keytext.trim().match(/(-----BEGIN PGP[\s\S]*-----END PGP.*-----)/);
+    if(extractPK && extractPK.length > 1){
       var asciiArmored = extractPK[1];
-      var signature = extractSIG[1];
+      callback(null, asciiArmored);
+    }
+    else{
+      callback("Not a PGP message.");
+    }
+  }
+  else{
+    callback("keytext HTTP param is null.");
+  }
+}
+
+function getAsciiArmoredMessages(body, files, callback) {
+  console.log(JSON.stringify(body), JSON.stringify(files));
+  var keytext = body.keytext || (files ? files.keytext : "");
+  var keysign = body.keysign || (files ? files.keysign : "");
+  var aaPubkey, aaSignature;
+  async.parallel({
+      one: function(done){
+        if(keytext && keytext.path){
+          fs.readFile(keytext.path, {encoding: "utf8"}, function (err, data) {
+            keytext = data;
+            done(err);
+          });
+        }
+        else done();
+      },
+      two: function(done){
+        if(keysign && keysign.path){
+          fs.readFile(keysign.path, {encoding: "utf8"}, function (err, data) {
+            keysign = data;
+            done(err);
+          });
+        }
+        else done();
+      }
+  },
+  function(err) {
+    if(err){
+      callback(err);
+      return;
+    }
+    async.parallel({
+        one: function(done){
+          getAAMessage(keytext, function (err, data) {
+            aaPubkey = data;
+            done(err);
+          });
+        },
+        two: function(done){
+          getAAMessage(keysign, function (err, data) {
+            aaSignature = data;
+            done(err);
+          });
+        }
+    },
+    function(err) {
+      callback(err, aaPubkey, aaSignature);
+    });
+  });
+}
+
+module.exports.add.post = function (req, res) {
+  getAsciiArmoredMessages(req.body, req.files, function (err, aaPubkey, aaSignature) {
+    if(!err){
       var PublicKey = req.models.PublicKey;
       var pubKeys = [];
-      PublicKey.verify(asciiArmored, signature, function (err) {
+      PublicKey.verify(aaPubkey, aaSignature, function (err) {
         if(!err){
-          pubKeys.push(new PublicKey({ raw: asciiArmored }));
+          pubKeys.push(new PublicKey({ raw: aaPubkey }));
           async.each(pubKeys, processRawKey, function (err) {
             if(!err){
-              // Now has entity from asciiArmored
+              // Now has entity from aaPubkey
               async.each(pubKeys, function (pubkey, done) {
                 var now = new Date();
                 PublicKey.count({fingerprint: pubkey.fingerprint}, function (err, count) {
@@ -125,9 +187,6 @@ module.exports.add.post = function (req, res) {
       });
     }
     else
-      res.send(400, 'Not a OpenPGP key.');
-  }
-  else{
-    res.send(400, 'No data sent.');
-  }
+      res.send(400, 'Not a OpenPGP data: ' + err);
+  });
 };
\ No newline at end of file

views/pks/add.ejs

@@ -12,5 +12,10 @@
       <textarea name="keysign" id="keysign" cols="80" rows="45"></textarea>
       <input type="submit">
     </form>
+    <form action="/pks/add" method="POST" enctype="multipart/form-data">
+      <input type="file" name="keytext">
+      <input type="file" name="keysign">
+      <input type="submit">
+    </form>
   </body>
 </html>
\ No newline at end of file