Compare commits

..

No commits in common. "f89f301a7c4427be15a9aec7ba51ac206a4372c2" and "da270686c0339de66b85f504f3aa88ef657190bc" have entirely different histories.

2 changed files with 7 additions and 19 deletions

View File

@ -312,9 +312,6 @@ Greenlock.create = function (gl) {
if (!gl.approveDomains) { if (!gl.approveDomains) {
gl.approvedDomains = gl.approvedDomains || []; gl.approvedDomains = gl.approvedDomains || [];
gl.approveDomains = function (lexOpts, certs, cb) { gl.approveDomains = function (lexOpts, certs, cb) {
var err;
var emsg;
if (!gl.email) { if (!gl.email) {
throw new Error("le-sni-auto is not properly configured. Missing email"); throw new Error("le-sni-auto is not properly configured. Missing email");
} }
@ -333,12 +330,8 @@ Greenlock.create = function (gl) {
lexOpts.communityMember = lexOpts.communityMember; lexOpts.communityMember = lexOpts.communityMember;
return cb(null, { options: lexOpts, certs: certs }); return cb(null, { options: lexOpts, certs: certs });
} }
log(gl.debug, 'unapproved domain', lexOpts.domains, gl.approvedDomains);
emsg = "tls SNI for '" + lexOpts.domains.join(',') + "' rejected: not in list '" + gl.approvedDomains + "'"; cb(new Error("unapproved domain"));
log(gl.debug, emsg, lexOpts.domains, gl.approvedDomains);
err = new Error(emsg);
err.code = 'E_REJECT_SNI';
cb(err);
}; };
} }
@ -351,13 +344,10 @@ Greenlock.create = function (gl) {
gl.approveDomains(opts, certs, function (_err, results) { gl.approveDomains(opts, certs, function (_err, results) {
if (_err) { if (_err) {
if (false !== gl.logRejectedDomains) { if (false !== gl.logRejectedDomains) {
console.error("[Error] approveDomains rejected tls sni '" + domain + "'"); console.error("logRejectedDomains: tls sni '" + domain + "' was rejected.");
console.error("[Error] (see https://git.coolaj86.com/coolaj86/greenlock.js/issues/11)"); console.error("See details at https://git.coolaj86.com/coolaj86/greenlock.js/issues/11.");
if ('E_REJECT_SNI' !== _err.code) { logRejectedDomains
console.error("[Error] This is the rejection message:"); console.error(_err);
console.error(_err.message);
}
console.error("");
} }
cb(_err); cb(_err);
return; return;
@ -373,7 +363,6 @@ Greenlock.create = function (gl) {
, function (e) { , function (e) {
console.debug("Error renewing certificate for '" + domain + "':"); console.debug("Error renewing certificate for '" + domain + "':");
console.debug(e); console.debug(e);
console.error("");
cb(e); cb(e);
} }
);; );;
@ -385,7 +374,6 @@ Greenlock.create = function (gl) {
, function (e) { , function (e) {
console.debug("Error loading/registering certificate for '" + domain + "':"); console.debug("Error loading/registering certificate for '" + domain + "':");
console.debug(e); console.debug(e);
console.error("");
cb(e); cb(e);
} }
); );

View File

@ -1,6 +1,6 @@
{ {
"name": "greenlock", "name": "greenlock",
"version": "2.2.16", "version": "2.2.15",
"description": "Let's Encrypt for node.js on npm", "description": "Let's Encrypt for node.js on npm",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {