From 98ca31256b9ce59dd3c109161423849eac376d3f Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 2 Apr 2019 23:11:05 -0600 Subject: [PATCH] v2.7.0: updates for wildcards and upcoming v3 --- package-lock.json | 148 +++++++++++++++++++++------------------------- package.json | 8 ++- 2 files changed, 74 insertions(+), 82 deletions(-) diff --git a/package-lock.json b/package-lock.json index 467e602..1992a57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "greenlock-express", - "version": "2.6.8", + "version": "2.6.9", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -20,31 +20,20 @@ } }, "acme": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/acme/-/acme-1.2.0.tgz", - "integrity": "sha512-lG9Wq0Ol2OLpVrusq5OQ+KCT06rXaGjbHcDhKtNO6Hr3J3swISaCYi0slwLpEA9DGV+QhDkAnZ6qsXAo86SM5Q==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/acme/-/acme-1.3.0.tgz", + "integrity": "sha512-Ny8aXnGdtlEVBZLpzNyVp7gff/3zFYrbfbiY93lx5jdrG4BrraA6P8RkRFP7NbFwh1rBgQkdHEsMxTp3f2r8dA==", "requires": { - "acme-v2": "^1.3.1" + "acme-v2": "^1.6.0" } }, "acme-v2": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/acme-v2/-/acme-v2-1.5.2.tgz", - "integrity": "sha512-Ux0cFCxHeaGGeGyPGMLHBLIGF05OYaxuh4TvaVzwkVVRib/gPpioa50CGj2pnQimH/MRkg0VtWCEdfE45MV/0g==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/acme-v2/-/acme-v2-1.6.0.tgz", + "integrity": "sha512-+vCD+j87eEQhdiqSVA9KT97+EGYbkVTgSqxQ37y9aM/3uExi2U+UM4EQEAIRSV/DWZ6oqeRPe+dha8h+PtNdwQ==", "requires": { "@coolaj86/urequest": "^1.3.6", - "rsa-compat": "^1.9.2" - }, - "dependencies": { - "rsa-compat": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/rsa-compat/-/rsa-compat-1.9.2.tgz", - "integrity": "sha512-XY4I/74W+QENMd99zVsyHQcxYxWTXd0EihVXsI4oeb1bz7DYxEKasQrjyzYPnR1tZT7fTPu5HP/vTKfs9lzdGA==", - "requires": { - "node-forge": "^0.7.6", - "ursa-optional": "^0.9.10" - } - } + "rsa-compat": "^2.0.6" } }, "array-flatten": { @@ -74,20 +63,6 @@ "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", "dev": true }, - "bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "optional": true, - "requires": { - "file-uri-to-path": "1.0.0" - } - }, - "bluebird": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz", - "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==" - }, "body-parser": { "version": "1.18.3", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz", @@ -162,6 +137,11 @@ "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", "dev": true }, + "eckles": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/eckles/-/eckles-1.4.1.tgz", + "integrity": "sha512-auWyk/k8oSkVHaD4RxkPadKsLUcIwKgr/h8F7UZEueFDBO7BsE4y+H6IMUDbfqKIFPg/9MxV6KcBdJCmVVcxSA==" + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -232,12 +212,6 @@ "basic-auth": "^2.0.1" } }, - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "optional": true - }, "finalhandler": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", @@ -266,17 +240,27 @@ "dev": true }, "greenlock": { - "version": "2.6.8", - "resolved": "https://registry.npmjs.org/greenlock/-/greenlock-2.6.8.tgz", - "integrity": "sha512-TYm9XrbtGkcFIwfonCzuAGCJXteyZRQxoaHYlDG2OPAihtVAlsM+KAVKsLlzLJ+oVEWj5XPLBnWU9NtwLrRX+Q==", + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/greenlock/-/greenlock-2.7.3.tgz", + "integrity": "sha512-IuIVmZ5Dhu+vP41i8Swm9b8n9BKK/Scif+9JP+uhcG+j60e6IYzM7jOiaAS5xO47E02srLFkKRDzt3ZUJuKumA==", "requires": { - "acme": "^1.2.0", - "acme-v2": "^1.5.0", + "acme": "^1.3.0", + "acme-v2": "^1.6.0", "cert-info": "^1.5.1", + "keypairs": "^1.2.14", + "le-challenge-dns": "^2.3.2", "le-challenge-fs": "^2.0.2", - "le-sni-auto": "^2.1.3", - "le-store-certbot": "^2.1.7", - "rsa-compat": "^2.0.3" + "le-sni-auto": "^2.1.8", + "le-store-certbot": "^2.2.1", + "le-store-fs": "^1.0.0", + "rsa-compat": "^2.0.6" + }, + "dependencies": { + "le-sni-auto": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/le-sni-auto/-/le-sni-auto-2.1.8.tgz", + "integrity": "sha512-aEUP+DB5mfHi4kHY37nJdtVr+DIF5vxiXKdiZBPOLNgF7pK3iD0wJU6fiwDRtZRz2KOahX+VBxlgTN2r24nKhw==" + } } }, "http-errors": { @@ -312,6 +296,20 @@ "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=", "dev": true }, + "keypairs": { + "version": "1.2.14", + "resolved": "https://registry.npmjs.org/keypairs/-/keypairs-1.2.14.tgz", + "integrity": "sha512-ZoZfZMygyB0QcjSlz7Rh6wT2CJasYEHBPETtmHZEfxuJd7bnsOG5AdtPZqHZBT+hoHvuWCp/4y8VmvTvH0Y9uA==", + "requires": { + "eckles": "^1.4.1", + "rasha": "^1.2.4" + } + }, + "le-challenge-dns": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/le-challenge-dns/-/le-challenge-dns-2.3.2.tgz", + "integrity": "sha512-3BcmK+gELGpt1heyXRcIOciaUnuN7Yh0aFIBsAof1Lqm9LnQ4CnWRjYXtOsAtXlmhDhtNMs+AytGj6fwYBTr1A==" + }, "le-challenge-fs": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/le-challenge-fs/-/le-challenge-fs-2.0.8.tgz", @@ -321,12 +319,9 @@ } }, "le-sni-auto": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/le-sni-auto/-/le-sni-auto-2.1.6.tgz", - "integrity": "sha512-LcfkF2yQ1nrep+ZfyG+SfR3pHphKFD3zMZ9FKervGfTfvgScCv/XGbX+vxsGZEKZjvzxKbFZ/5LdSCXuLXUU6A==", - "requires": { - "bluebird": "^3.5.1" - } + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/le-sni-auto/-/le-sni-auto-2.1.8.tgz", + "integrity": "sha512-aEUP+DB5mfHi4kHY37nJdtVr+DIF5vxiXKdiZBPOLNgF7pK3iD0wJU6fiwDRtZRz2KOahX+VBxlgTN2r24nKhw==" }, "le-store-certbot": { "version": "2.2.1", @@ -338,6 +333,15 @@ "safe-replace": "^1.0.3" } }, + "le-store-fs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/le-store-fs/-/le-store-fs-1.0.0.tgz", + "integrity": "sha512-UVGFYwZO/kzkeoIbnbuPyUCB2HMWHAoKJQhsIeunyFakIa4J1ozqy136h3uV3GulSN+99ZJfQBT5aoqVZsmfzw==", + "requires": { + "mkdirp": "^0.5.1", + "safe-replace": "^1.1.0" + } + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -396,24 +400,12 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "nan": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", - "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==", - "optional": true - }, "negotiator": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", "dev": true }, - "node-forge": { - "version": "0.7.6", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz", - "integrity": "sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==", - "optional": true - }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -465,6 +457,11 @@ "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", "dev": true }, + "rasha": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/rasha/-/rasha-1.2.5.tgz", + "integrity": "sha512-KxtX+/fBk+wM7O3CNgwjSh5elwFilLvqWajhr6wFr2Hd63JnKTTi43Tw+Jb1hxJQWOwoya+NZWR2xztn3hCrTw==" + }, "raw-body": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz", @@ -486,9 +483,12 @@ } }, "rsa-compat": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/rsa-compat/-/rsa-compat-2.0.3.tgz", - "integrity": "sha512-oMEiSfk8KTKleNO7OEahZtrZTcjV+fzBm8jpt2bXBgyhbgO3bJdwawm4BkJe+2LfdK8kaKqMIO8pHZ/UmybQ7w==" + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/rsa-compat/-/rsa-compat-2.0.6.tgz", + "integrity": "sha512-bQmpscAQec9442RaghDybrHMy1twQ3nUZOgTlqntio1yru+rMnDV64uGRzKp7dJ4VVhNv3mLh3X4MNON+YM0dA==", + "requires": { + "keypairs": "^1.2.14" + } }, "safe-buffer": { "version": "5.1.2", @@ -583,16 +583,6 @@ "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", "dev": true }, - "ursa-optional": { - "version": "0.9.10", - "resolved": "https://registry.npmjs.org/ursa-optional/-/ursa-optional-0.9.10.tgz", - "integrity": "sha512-RvEbhnxlggX4MXon7KQulTFiJQtLJZpSb9ZSa7ZTkOW0AzqiVTaLjI4vxaSzJBDH9dwZ3ltZadFiBaZslp6haA==", - "optional": true, - "requires": { - "bindings": "^1.3.0", - "nan": "^2.11.1" - } - }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", diff --git a/package.json b/package.json index 82ef22b..f5129c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "greenlock-express", - "version": "2.6.9", + "version": "2.7.0", "description": "Free SSL and managed or automatic HTTPS for node.js with Express, Koa, Connect, Hapi, and all other middleware systems.", "main": "index.js", "homepage": "https://git.coolaj86.com/coolaj86/greenlock-express.js", @@ -8,10 +8,12 @@ "example": "examples" }, "dependencies": { - "greenlock": "^2.6.8", + "greenlock": "^2.7.3", + "le-challenge-dns": "^2.3.2", "le-challenge-fs": "^2.0.8", - "le-sni-auto": "^2.1.4", + "le-sni-auto": "^2.1.8", "le-store-certbot": "^2.1.0", + "le-store-fs": "^1.0.0", "redirect-https": "^1.1.5" }, "files": [