@social-mail/social-mail-web-server 2.0.52 → 2.0.54
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.
- package/dist/.tsbuildinfo +1 -1
- package/dist/server/dns/NamedService.d.ts.map +1 -1
- package/dist/server/dns/NamedService.js +15 -6
- package/dist/server/dns/NamedService.js.map +1 -1
- package/dist/server/model/entities/CachedZoneRecord.d.ts +1 -0
- package/dist/server/model/entities/CachedZoneRecord.d.ts.map +1 -1
- package/dist/server/model/entities/CachedZoneRecord.js +4 -0
- package/dist/server/model/entities/CachedZoneRecord.js.map +1 -1
- package/dist/server/seed/seed.d.ts.map +1 -1
- package/dist/server/seed/seed.js +2 -0
- package/dist/server/seed/seed.js.map +1 -1
- package/dist/server/services/dns/ClusterDnsCache.d.ts.map +1 -1
- package/dist/server/services/dns/ClusterDnsCache.js +1 -0
- package/dist/server/services/dns/ClusterDnsCache.js.map +1 -1
- package/package.json +1 -1
- package/src/server/dns/NamedService.ts +17 -5
- package/src/server/model/entities/CachedZoneRecord.ts +3 -0
- package/src/server/seed/seed.ts +3 -0
- package/src/server/services/dns/ClusterDnsCache.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NamedService.d.ts","sourceRoot":"","sources":["../../../src/server/dns/NamedService.ts"],"names":[],"mappings":"AA0BA,MAAM,CAAC,OAAO,OAAO,YAAY;IAE7B,OAAc,QAAQ,eAAsB;IAE5C,OAAO,CAAC,UAAU,CAA0D;IAItE,OAAO,CAAC,QAAQ,KAAA,iBAQrB;IAEM,KAAK,SAQX;YAEa,SAAS;YAgBT,OAAO;YA+CP,OAAO;
|
|
1
|
+
{"version":3,"file":"NamedService.d.ts","sourceRoot":"","sources":["../../../src/server/dns/NamedService.ts"],"names":[],"mappings":"AA0BA,MAAM,CAAC,OAAO,OAAO,YAAY;IAE7B,OAAc,QAAQ,eAAsB;IAE5C,OAAO,CAAC,UAAU,CAA0D;IAItE,OAAO,CAAC,QAAQ,KAAA,iBAQrB;IAEM,KAAK,SAQX;YAEa,SAAS;YAgBT,OAAO;YA+CP,OAAO;CA+KxB"}
|
|
@@ -185,7 +185,8 @@ class NamedService {
|
|
|
185
185
|
// console.log(`looking for ${typeNames} for ${name}`);
|
|
186
186
|
// check if there is a wildcard ...
|
|
187
187
|
const records = await db.cachedDnsRecords.where({ typeNames, host: name }, (x, p) => x.type in p.typeNames
|
|
188
|
-
&& x.fqdn === p.host
|
|
188
|
+
&& x.fqdn === p.host
|
|
189
|
+
&& x.disabled === false)
|
|
189
190
|
.toArray();
|
|
190
191
|
const rootPostFix = "." + root;
|
|
191
192
|
let answerCount = 0;
|
|
@@ -230,7 +231,8 @@ class NamedService {
|
|
|
230
231
|
if (answerCount === 0) {
|
|
231
232
|
if (typeName === "A") {
|
|
232
233
|
// console.log(`Looking up ${wildcard} for ${name}`);
|
|
233
|
-
const r = await db.cachedDnsRecords.where({ wildcard }, (x, p) => x.fqdn === p.wildcard
|
|
234
|
+
const r = await db.cachedDnsRecords.where({ wildcard }, (x, p) => x.fqdn === p.wildcard
|
|
235
|
+
&& x.disabled === false)
|
|
234
236
|
.toArray();
|
|
235
237
|
for (const x of r) {
|
|
236
238
|
answers.push(toAnswer(name, x));
|
|
@@ -238,9 +240,14 @@ class NamedService {
|
|
|
238
240
|
}
|
|
239
241
|
if (typeName === "AAAA") {
|
|
240
242
|
// if there is no A record...
|
|
241
|
-
const hasA = await db.cachedDnsRecords
|
|
243
|
+
const hasA = await db.cachedDnsRecords
|
|
244
|
+
.where({ host: name }, (x, p) => x.fqdn === p.host
|
|
245
|
+
&& x.type === "A"
|
|
246
|
+
&& x.disabled === false)
|
|
247
|
+
.some();
|
|
242
248
|
if (!hasA) {
|
|
243
|
-
const r = await db.cachedDnsRecords.where({ wildcard }, (x, p) => x.fqdn === p.wildcard
|
|
249
|
+
const r = await db.cachedDnsRecords.where({ wildcard }, (x, p) => x.fqdn === p.wildcard
|
|
250
|
+
&& x.disabled === false)
|
|
244
251
|
.toArray();
|
|
245
252
|
for (const x of r) {
|
|
246
253
|
answers.push(toAnswer(name, x));
|
|
@@ -251,10 +258,12 @@ class NamedService {
|
|
|
251
258
|
// console.log({ answers, additionals, authorities });
|
|
252
259
|
const authorityRecords = (answers.length || additionals.length)
|
|
253
260
|
? await db.cachedDnsRecords.where({ typeName, root }, (x, p) => x.type === "NS"
|
|
254
|
-
&& x.fqdn === p.root
|
|
261
|
+
&& x.fqdn === p.root
|
|
262
|
+
&& x.disabled === false)
|
|
255
263
|
.toArray()
|
|
256
264
|
: await db.cachedDnsRecords.where({ typeName, root }, (x, p) => x.type === "SOA"
|
|
257
|
-
&& x.fqdn === p.root
|
|
265
|
+
&& x.fqdn === p.root
|
|
266
|
+
&& x.disabled === false)
|
|
258
267
|
.toArray();
|
|
259
268
|
for (const x of authorityRecords) {
|
|
260
269
|
authorities.push(toAnswer(name, x));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NamedService.js","sourceRoot":"","sources":["../../../src/server/dns/NamedService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAU,oBAAoB,EAAU,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,UAAU,MAAM,4BAA4B,CAAC;AACpD,OAAO,UAAU,MAAM,8DAA8D,CAAC;AACtF,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,gBAAgB,MAAM,gDAAgD,CAAC;AAC9E,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAS9D,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE;IACnC,IAAI,CAAC;QACD,OAAO,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,iCAAiC,IAAI,EAAE,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC,CAAC;AACF,MAAqB,YAAY;IAAjC;QAIY,eAAU,GAAG,IAAI,UAAU,CAA6B,EAAE,GAAC,EAAE,GAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"NamedService.js","sourceRoot":"","sources":["../../../src/server/dns/NamedService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachedZoneRecord.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/CachedZoneRecord.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAU/C,MAAM,CAAC,OAAO,OAAO,eAAe;IAGhC,QAAQ,EAAE,MAAM,CAAC;IAOjB,eAAe,EAAE,MAAM,CAAC;IAGxB,YAAY,EAAE,MAAM,CAAC;IAGrB,WAAW,EAAE,QAAQ,CAAC;IAGtB,IAAI,EAAE,MAAM,CAAC;IAGb,GAAG,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"CachedZoneRecord.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/CachedZoneRecord.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAU/C,MAAM,CAAC,OAAO,OAAO,eAAe;IAGhC,QAAQ,EAAE,MAAM,CAAC;IAOjB,eAAe,EAAE,MAAM,CAAC;IAGxB,YAAY,EAAE,MAAM,CAAC;IAGrB,WAAW,EAAE,QAAQ,CAAC;IAGtB,IAAI,EAAE,MAAM,CAAC;IAGb,GAAG,EAAE,MAAM,CAAC;IAGL,QAAQ,EAAE,OAAO,CAAC;IAGzB,IAAI,EAAE,MAAM,CAAC;IAGb,KAAK,EAAE,MAAM,CAAC;IAEd,aAAa,EAAE,aAAa,CAAC;CAEhC"}
|
|
@@ -44,6 +44,10 @@ __decorate([
|
|
|
44
44
|
Column({ dataType: "Int" }),
|
|
45
45
|
__metadata("design:type", Number)
|
|
46
46
|
], CachedDnsRecord.prototype, "ttl", void 0);
|
|
47
|
+
__decorate([
|
|
48
|
+
Column({ dataType: "Boolean", default: () => false }),
|
|
49
|
+
__metadata("design:type", Boolean)
|
|
50
|
+
], CachedDnsRecord.prototype, "disabled", void 0);
|
|
47
51
|
__decorate([
|
|
48
52
|
Column({ dataType: "Char", length: 5 }),
|
|
49
53
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachedZoneRecord.js","sourceRoot":"","sources":["../../../../src/server/model/entities/CachedZoneRecord.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAClF,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAS3D,IAAM,eAAe,GAArB,MAAM,eAAe;
|
|
1
|
+
{"version":3,"file":"CachedZoneRecord.js","sourceRoot":"","sources":["../../../../src/server/model/entities/CachedZoneRecord.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAClF,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAS3D,IAAM,eAAe,GAArB,MAAM,eAAe;CAmCnC,CAAA;AAhCG;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAC,CAAC;;iDAC/C;AAOjB;IALC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAC,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE;QACrB,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa;QAChC,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB;KAC7C,CAAC;;wDACsB;AAGxB;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC1B;AAGrB;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,EAAC,CAAC;8BAClD,QAAQ;oDAAC;AAGtB;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;6CAC7B;AAGb;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAC,CAAC;;4CACf;AAGL;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,EAAC,CAAC;;iDAC5B;AAGzB;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC;;6CAC1B;AAGb;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAC,CAAC;;8CACd;AA/BG,eAAe;IAPnC,KAAK,CAAC,iBAAiB,CAAC;IACxB,KAAK,CAAC;QACH,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;SAC7C;KACJ,CAAC;GACmB,eAAe,CAmCnC;eAnCoB,eAAe"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seed.d.ts","sourceRoot":"","sources":["../../../src/server/seed/seed.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"seed.d.ts","sourceRoot":"","sources":["../../../src/server/seed/seed.ts"],"names":[],"mappings":"AAiBA,wBAA8B,IAAI,kBAsEjC"}
|
package/dist/server/seed/seed.js
CHANGED
|
@@ -65,6 +65,7 @@ import ReportDbContext from "../../reports/model/ReportDbContext.js";
|
|
|
65
65
|
import Logger from "@entity-access/entity-access/dist/common/Logger.js";
|
|
66
66
|
import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
|
|
67
67
|
import GenerateTemplatePreviewWorkflow from "../workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.js";
|
|
68
|
+
import UpdateDnsCacheWorkflow from "../workflows/dns/UpdateDnsCacheWorkflow.js";
|
|
68
69
|
export default async function seed() {
|
|
69
70
|
const scope = globalServices.createScope();
|
|
70
71
|
try {
|
|
@@ -117,6 +118,7 @@ export default async function seed() {
|
|
|
117
118
|
// generate template previews...
|
|
118
119
|
const wc = scope.resolve(WorkflowContext);
|
|
119
120
|
await GenerateTemplatePreviewWorkflow.queue(wc);
|
|
121
|
+
await UpdateDnsCacheWorkflow.queue(wc, -1);
|
|
120
122
|
}
|
|
121
123
|
catch (e_1) {
|
|
122
124
|
env_1.error = e_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seed.js","sourceRoot":"","sources":["../../../src/server/seed/seed.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,aAAa,MAAM,2BAA2B,CAAC;AACtD,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAC3C,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,WAAW,MAAM,2BAA2B,CAAC;AACpD,OAAO,eAAe,MAAM,wCAAwC,CAAC;AACrE,OAAO,MAAM,MAAM,oDAAoD,CAAC;AACxE,OAAO,eAAe,MAAM,gEAAgE,CAAC;AAC7F,OAAO,+BAA+B,MAAM,wEAAwE,CAAC;
|
|
1
|
+
{"version":3,"file":"seed.js","sourceRoot":"","sources":["../../../src/server/seed/seed.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDnsCache.d.ts","sourceRoot":"","sources":["../../../../src/server/services/dns/ClusterDnsCache.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,kCAAkC,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAG5E,MAAM,CAAC,OAAO,OAAO,eAAe;IAGhC,EAAE,EAAE,mBAAmB,CAAC;IAElB,IAAI,CAAC,CAAC,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"ClusterDnsCache.d.ts","sourceRoot":"","sources":["../../../../src/server/services/dns/ClusterDnsCache.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,kCAAkC,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAG5E,MAAM,CAAC,OAAO,OAAO,eAAe;IAGhC,EAAE,EAAE,mBAAmB,CAAC;IAElB,IAAI,CAAC,CAAC,EAAE,gBAAgB,iBA4B7B;IAEK,MAAM,CAAC,CAAC,EAAE,gBAAgB,iBAe/B;CAEJ"}
|
|
@@ -27,6 +27,7 @@ let ClusterDnsCache = class ClusterDnsCache {
|
|
|
27
27
|
existing.type = r.type;
|
|
28
28
|
existing.syncRecordID = recordID;
|
|
29
29
|
existing.virtualServerID = serverID;
|
|
30
|
+
existing.disabled = r.disabled;
|
|
30
31
|
existing.value = r.value
|
|
31
32
|
.replace("$HOST$", globalEnv.host)
|
|
32
33
|
.replace("$IP$", globalEnv.ips[0]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDnsCache.js","sourceRoot":"","sources":["../../../../src/server/services/dns/ClusterDnsCache.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,mBAAmB,MAAM,kCAAkC,CAAC;AACnE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAI5D,IAAM,eAAe,GAArB,MAAM,eAAe;IAKhC,KAAK,CAAC,IAAI,CAAC,CAAmB;QAC1B,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QACvB,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAW,CAAC;QAC7D,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB;aACxC,KAAK,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,QAAQ;eACnE,CAAC,CAAC,eAAe,KAAK,CAAC,CAAC,QAAQ,CACtC;aACA,KAAK,EAAE,CAAC;QACb,IAAG,CAAC,QAAQ,EAAE,CAAC;YACX,QAAQ,GAAG,EAAE,KAAK,EAAE,iBAAiB,EAAQ,CAAC;QAClD,CAAC;QACD,QAAQ,CAAC,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QACpC,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;QACvB,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;QACvB,QAAQ,CAAC,YAAY,GAAG,QAAQ,CAAC;QACjC,QAAQ,CAAC,eAAe,GAAG,QAAQ,CAAC;QACpC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK;aACnB,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC;aACjC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAEvC,IAAG,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACxB,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK;iBAC1B,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;QAED,QAAQ,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;QACrB,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,CAAmB;QAC5B,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QACvB,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAW,CAAC;QAC7D,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB;aACxC,KAAK,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,QAAQ;eACnE,CAAC,CAAC,eAAe,KAAK,CAAC,CAAC,QAAQ,CACtC;aACA,KAAK,EAAE,CAAC;QACb,IAAG,CAAC,QAAQ,EAAE,CAAC;YACX,OAAO;QACX,CAAC;QACD,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC;YAClC,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;SAC9B,CAAC,CAAC;IACP,CAAC;CAEJ,CAAA;
|
|
1
|
+
{"version":3,"file":"ClusterDnsCache.js","sourceRoot":"","sources":["../../../../src/server/services/dns/ClusterDnsCache.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -171,7 +171,9 @@ export default class NamedService {
|
|
|
171
171
|
// check if there is a wildcard ...
|
|
172
172
|
const records = await db.cachedDnsRecords.where({ typeNames, host: name }, (x, p) =>
|
|
173
173
|
x.type in p.typeNames
|
|
174
|
-
&& x.fqdn === p.host
|
|
174
|
+
&& x.fqdn === p.host
|
|
175
|
+
&& x.disabled === false
|
|
176
|
+
)
|
|
175
177
|
.toArray();
|
|
176
178
|
|
|
177
179
|
const rootPostFix = "." + root;
|
|
@@ -229,7 +231,9 @@ export default class NamedService {
|
|
|
229
231
|
// console.log(`Looking up ${wildcard} for ${name}`);
|
|
230
232
|
|
|
231
233
|
const r = await db.cachedDnsRecords.where({ wildcard }, (x, p) =>
|
|
232
|
-
x.fqdn === p.wildcard
|
|
234
|
+
x.fqdn === p.wildcard
|
|
235
|
+
&& x.disabled === false
|
|
236
|
+
)
|
|
233
237
|
.toArray();
|
|
234
238
|
|
|
235
239
|
for (const x of r) {
|
|
@@ -240,11 +244,17 @@ export default class NamedService {
|
|
|
240
244
|
|
|
241
245
|
// if there is no A record...
|
|
242
246
|
|
|
243
|
-
const hasA = await db.cachedDnsRecords
|
|
247
|
+
const hasA = await db.cachedDnsRecords
|
|
248
|
+
.where({ host: name}, (x, p) =>
|
|
249
|
+
x.fqdn === p.host
|
|
250
|
+
&& x.type === "A"
|
|
251
|
+
&& x.disabled === false)
|
|
252
|
+
.some();
|
|
244
253
|
if (!hasA) {
|
|
245
254
|
|
|
246
255
|
const r = await db.cachedDnsRecords.where({ wildcard }, (x, p) =>
|
|
247
256
|
x.fqdn === p.wildcard
|
|
257
|
+
&& x.disabled === false
|
|
248
258
|
)
|
|
249
259
|
.toArray();
|
|
250
260
|
|
|
@@ -260,11 +270,13 @@ export default class NamedService {
|
|
|
260
270
|
const authorityRecords = (answers.length || additionals.length)
|
|
261
271
|
? await db.cachedDnsRecords.where({ typeName, root }, (x, p) =>
|
|
262
272
|
x.type === "NS"
|
|
263
|
-
&& x.fqdn === p.root
|
|
273
|
+
&& x.fqdn === p.root
|
|
274
|
+
&& x.disabled === false)
|
|
264
275
|
.toArray()
|
|
265
276
|
: await db.cachedDnsRecords.where({ typeName, root }, (x, p) =>
|
|
266
277
|
x.type === "SOA"
|
|
267
|
-
&& x.fqdn === p.root
|
|
278
|
+
&& x.fqdn === p.root
|
|
279
|
+
&& x.disabled === false)
|
|
268
280
|
.toArray();
|
|
269
281
|
|
|
270
282
|
for (const x of authorityRecords) {
|
package/src/server/seed/seed.ts
CHANGED
|
@@ -13,6 +13,7 @@ import ReportDbContext from "../../reports/model/ReportDbContext.js";
|
|
|
13
13
|
import Logger from "@entity-access/entity-access/dist/common/Logger.js";
|
|
14
14
|
import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
|
|
15
15
|
import GenerateTemplatePreviewWorkflow from "../workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.js";
|
|
16
|
+
import UpdateDnsCacheWorkflow from "../workflows/dns/UpdateDnsCacheWorkflow.js";
|
|
16
17
|
|
|
17
18
|
export default async function seed() {
|
|
18
19
|
|
|
@@ -79,6 +80,8 @@ export default async function seed() {
|
|
|
79
80
|
const wc = scope.resolve(WorkflowContext);
|
|
80
81
|
await GenerateTemplatePreviewWorkflow.queue(wc);
|
|
81
82
|
|
|
83
|
+
await UpdateDnsCacheWorkflow.queue(wc, -1);
|
|
84
|
+
|
|
82
85
|
} finally {
|
|
83
86
|
scope.dispose();
|
|
84
87
|
}
|
|
@@ -26,6 +26,7 @@ export default class ClusterDnsCache {
|
|
|
26
26
|
existing.type = r.type;
|
|
27
27
|
existing.syncRecordID = recordID;
|
|
28
28
|
existing.virtualServerID = serverID;
|
|
29
|
+
existing.disabled = r.disabled;
|
|
29
30
|
existing.value = r.value
|
|
30
31
|
.replace("$HOST$", globalEnv.host)
|
|
31
32
|
.replace("$IP$", globalEnv.ips[0]);
|