roster-server 2.1.23 → 2.1.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/vendor/acme-dns-01-cli-wrapper.js +6 -18
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "roster-server",
3
- "version": "2.1.23",
3
+ "version": "2.1.25",
4
4
  "description": "👾 RosterServer - A domain host router to host multiple HTTPS.",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/vendor/acme-dns-01-cli-wrapper.js CHANGED
@@ -125,22 +125,16 @@ module.exports.create = function create(config = {}) {
125
125
  const presentedByAltname = new Map();
126
126
 
127
127
  async function setChallenge(opts) {
128
- const isInteractive = Boolean(process.stdin && process.stdin.isTTY);
129
- if (isInteractive && !autoContinue && !verifyDnsBeforeContinue) {
130
- return toPromise(challenger.set, challenger)(opts);
131
- }
132
-
133
128
  const ch = opts?.challenge || {};
134
- log.info('');
135
- log.info("[ACME dns-01 '" + (ch.altname || opts?.altname || 'unknown') + "' CHALLENGE]");
136
- log.info("You're about to receive the following DNS query:");
137
- log.info('');
129
+ const altname = ch.altname || opts?.altname || 'unknown';
138
130
  const dnsHost = String(ch.dnsHost || '');
139
131
  const dnsAuth = ch.dnsAuthorization || opts?.dnsAuthorization || null;
132
+ const token = ch.dnsAuthorization || '<dns-authorization-token>';
133
+ const host = ch.dnsHost || '_acme-challenge.<domain>';
134
+
140
135
  if (dnsHost && dnsAuth) {
141
136
  presentedByHost.set(dnsHost, dnsAuth);
142
137
  }
143
- const altname = String(ch.altname || opts?.altname || '');
144
138
  if (altname && dnsAuth) {
145
139
  presentedByAltname.set(altname, { dnsHost, dnsAuthorization: dnsAuth });
146
140
  }
@@ -151,14 +145,8 @@ module.exports.create = function create(config = {}) {
151
145
  const effectiveTimeoutMs = dnsPollTimeoutMs === null ? effectiveDelay : dnsPollTimeoutMs;
152
146
  const expectedToken = resolveExpectedToken(opts, ch);
153
147
 
154
- log.info(
155
- '\tTXT\t' +
156
- (ch.dnsHost || '_acme-challenge.<domain>') +
157
- '\t' +
158
- (ch.dnsAuthorization || '<dns-authorization-token>') +
159
- '\tTTL 60'
160
- );
161
- log.info('');
148
+ log.info('DNS-01 ' + altname);
149
+ log.info('TXT ' + host + ' ' + token + ' (TTL 60)');
162
150
  if (verifyDnsBeforeContinue && dnsHost && expectedToken) {
163
151
  log.info(
164
152
  'DNS verification enabled. Continuing automatically when TXT appears at ' +