v1.5.3: merge fix for #11

node.js

@@ -148,6 +148,7 @@ ACME._registerAccount = function (me, options) {
         , contact: contact
         };
         if (options.externalAccount) {
+          // TODO is this really done by HMAC or is it arbitrary?
           body.externalAccountBinding = me.RSA.signJws(
             options.externalAccount.secret
           , undefined
@@ -637,6 +638,13 @@ ACME._getCertificate = function (me, options) {
               return results.challenges.some(function (ch) {
                 return ch.type === chType;
               });
+            }).sort(function (aType, bType) {
+              var a = results.challenges.filter(function (ch) { return ch.type === aType; })[0];
+              var b = results.challenges.filter(function (ch) { return ch.type === bType; })[0];
+
+              if ('valid' === a.status) { return 1; }
+              if ('valid' === b.status) { return -1; }
+              return 0;
             })[0];
 
             var challenge = results.challenges.filter(function (ch) {
@@ -651,6 +659,10 @@ ACME._getCertificate = function (me, options) {
               ));
             }
 
+            if ("valid" === challenge.status) {
+              return;
+            }
+
             return ACME._postChallenge(me, options, results.identifier, challenge);
           }).then(function () {
             return next();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "acme-v2",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Free SSL. A framework for building Let's Encrypt v2 clients, and other ACME v2 (draft 11) clients. Successor to le-acme-core.js",
   "homepage": "https://git.coolaj86.com/coolaj86/acme-v2.js",
   "main": "node.js",