node-opcua-server-configuration 2.186.5 → 2.186.6

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 (6) hide show
  1. package/dist/server/install_push_certificate_management.d.ts +7 -5
  2. package/dist/server/install_push_certificate_management.d.ts.map +1 -1
  3. package/dist/server/install_push_certificate_management.js +29 -11
  4. package/dist/server/install_push_certificate_management.js.map +1 -1
  5. package/package.json +2 -2
  6. package/source/server/install_push_certificate_management.ts +29 -11
package/dist/server/install_push_certificate_management.d.ts CHANGED
@@ -84,12 +84,14 @@ export interface ApplicationSetupOptions {
84
84
  export declare function installPushCertificateManagementOnServer(server: OPCUAServer, options?: InstallPushCertificateManagementOnServerOptions): Promise<void>;
85
85
  /**
86
86
  * Close every SecureChannel, and the Sessions on it, whose client
87
- * certificate the server no longer accepts. In the setup state an untrusted
88
- * certificate is still admitted, so only a revoked or otherwise invalid one
89
- * closes the channel then. Returns the number of channels closed.
87
+ * certificate the server would no longer admit, by the same decision as at
88
+ * OpenSecureChannel: the certificate store, then the endpoint's
89
+ * `onAdjustCertificateStatus` hook (the NoConfiguration relaxation, plus
90
+ * whatever admission policy the application composed with it). In the setup
91
+ * state an untrusted certificate is therefore still admitted. Returns the
92
+ * number of channels closed.
90
93
  *
91
- * The check never trusts a certificate on its own: the relaxation hook,
92
- * which does, is not called.
94
+ * The check never trusts a certificate on its own.
93
95
  */
94
96
  export declare function closeChannelsNoLongerTrusted(server: OPCUAServer): Promise<number>;
95
97
  //# sourceMappingURL=install_push_certificate_management.d.ts.map
package/dist/server/install_push_certificate_management.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"install_push_certificate_management.d.ts","sourceRoot":"","sources":["../../source/server/install_push_certificate_management.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAyB,MAAM,0BAA0B,CAAC;AAEpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAEH,KAAK,yBAAyB,EAC9B,KAAK,2BAA2B,EAGnC,MAAM,mBAAmB,CAAC;AAU3B,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,KAAK,6BAA6B,EAAe,MAAM,kBAAkB,CAAC;AAcnF,MAAM,WAAW,kBAAmB,SAAQ,2BAA2B;IACnE,UAAU,CAAC,EAAE,6BAA6B,CAAC;IAC3C,wBAAwB,EAAE,uBAAuB,CAAC;IAClD,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE;QAAE,YAAY,CAAC,EAAE,YAAY,CAAA;KAAE,CAAC;IACxC,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,WAAW,CAAC,QAAQ,EAAE,2BAA2B,GAAG,IAAI,CAAC;IACzD,4BAA4B,IAAI,IAAI,CAAC;IACrC,2BAA2B,IAAI,yBAAyB,CAAC;CAC5D;AAsKD,MAAM,WAAW,+CAA+C;IAC5D;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;CAC9C;AAED,MAAM,WAAW,uBAAuB;IACpC;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,wCAAwC,CAC1D,MAAM,EAAE,WAAW,EACnB,OAAO,CAAC,EAAE,+CAA+C,GAC1D,OAAO,CAAC,IAAI,CAAC,CAwKf;AASD;;;;;;;;GAQG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAOjF"}
1
+ {"version":3,"file":"install_push_certificate_management.d.ts","sourceRoot":"","sources":["../../source/server/install_push_certificate_management.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAyB,MAAM,0BAA0B,CAAC;AAEpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAEH,KAAK,yBAAyB,EAC9B,KAAK,2BAA2B,EAGnC,MAAM,mBAAmB,CAAC;AAU3B,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,KAAK,6BAA6B,EAAe,MAAM,kBAAkB,CAAC;AAcnF,MAAM,WAAW,kBAAmB,SAAQ,2BAA2B;IACnE,UAAU,CAAC,EAAE,6BAA6B,CAAC;IAC3C,wBAAwB,EAAE,uBAAuB,CAAC;IAClD,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE;QAAE,YAAY,CAAC,EAAE,YAAY,CAAA;KAAE,CAAC;IACxC,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,WAAW,CAAC,QAAQ,EAAE,2BAA2B,GAAG,IAAI,CAAC;IACzD,4BAA4B,IAAI,IAAI,CAAC;IACrC,2BAA2B,IAAI,yBAAyB,CAAC;CAC5D;AAsKD,MAAM,WAAW,+CAA+C;IAC5D;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;CAC9C;AAED,MAAM,WAAW,uBAAuB;IACpC;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,wCAAwC,CAC1D,MAAM,EAAE,WAAW,EACnB,OAAO,CAAC,EAAE,+CAA+C,GAC1D,OAAO,CAAC,IAAI,CAAC,CAwKf;AAYD;;;;;;;;;;GAUG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAOjF"}
package/dist/server/install_push_certificate_management.js CHANGED
@@ -322,16 +322,20 @@ export async function installPushCertificateManagementOnServer(server, options)
322
322
  }
323
323
  // ── Re-evaluating open channels (§7.8.2.5) ─────────────────────
324
324
  const reevaluations = new WeakMap();
325
+ /** Certificates being re-evaluated: the relaxation hook admits them without trusting them. */
326
+ const reevaluating = new WeakSet();
325
327
  /** How long after a TrustList change open channels are re-evaluated (see the "trustListUpdated" listener). */
326
328
  const REEVALUATION_DELAY_MS = 250;
327
329
  /**
328
330
  * Close every SecureChannel, and the Sessions on it, whose client
329
- * certificate the server no longer accepts. In the setup state an untrusted
330
- * certificate is still admitted, so only a revoked or otherwise invalid one
331
- * closes the channel then. Returns the number of channels closed.
331
+ * certificate the server would no longer admit, by the same decision as at
332
+ * OpenSecureChannel: the certificate store, then the endpoint's
333
+ * `onAdjustCertificateStatus` hook (the NoConfiguration relaxation, plus
334
+ * whatever admission policy the application composed with it). In the setup
335
+ * state an untrusted certificate is therefore still admitted. Returns the
336
+ * number of channels closed.
332
337
  *
333
- * The check never trusts a certificate on its own: the relaxation hook,
334
- * which does, is not called.
338
+ * The check never trusts a certificate on its own.
335
339
  */
336
340
  export function closeChannelsNoLongerTrusted(server) {
337
341
  const run = (reevaluations.get(server) ?? Promise.resolve()).then(() => _closeChannelsNoLongerTrusted(server));
@@ -347,11 +351,22 @@ async function _closeChannelsNoLongerTrusted(server) {
347
351
  if (!certificate) {
348
352
  continue;
349
353
  }
350
- const statusCode = await cm.checkCertificate(certificate);
351
- if (statusCode.isGood()) {
352
- continue;
354
+ // The same decision as when the channel was opened: the store,
355
+ // then the endpoint's adjustment hook, which the application may
356
+ // have composed with its own admission policy. Only the
357
+ // NoConfiguration relaxation's side effect (trusting the
358
+ // certificate) is suppressed: a re-evaluation never adds trust.
359
+ let statusCode = await cm.checkCertificate(certificate);
360
+ if (statusCode.isNotGood()) {
361
+ reevaluating.add(certificate);
362
+ try {
363
+ statusCode = await endpoint.adjustCertificateStatus(statusCode, certificate);
364
+ }
365
+ finally {
366
+ reevaluating.delete(certificate);
367
+ }
353
368
  }
354
- if (server.engine.getServerState() === ServerState.NoConfiguration && isRelaxableCertificateError(statusCode)) {
369
+ if (statusCode.isGood()) {
355
370
  continue;
356
371
  }
357
372
  warningLog(`[TrustList] closing SecureChannel ${channel.channelId}: client certificate is now ${statusCode.name}`);
@@ -551,8 +566,11 @@ function installCertificateRelaxationHook(server, recordProvisional) {
551
566
  }
552
567
  doDebug &&
553
568
  warningLog(`[NoConfiguration] Relaxing certificate check:`, `${statusCode.toString()} → Good`, "(server is awaiting GDS provisioning)");
554
- // Auto-trust the leaf certificate; issuer CAs go to issuers/
555
- await autoTrustCertificateChain(server, certificate, recordProvisional);
569
+ // Auto-trust the leaf certificate; issuer CAs go to issuers/ (not
570
+ // when an open channel is being re-evaluated: that adds no trust).
571
+ if (!reevaluating.has(certificate)) {
572
+ await autoTrustCertificateChain(server, certificate, recordProvisional);
573
+ }
556
574
  return StatusCodes.Good;
557
575
  };
558
576
  for (const endpoint of server.endpoints) {
package/dist/server/install_push_certificate_management.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"install_push_certificate_management.js","sourceRoot":"","sources":["../../source/server/install_push_certificate_management.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"install_push_certificate_management.js","sourceRoot":"","sources":["../../source/server/install_push_certificate_management.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-opcua-server-configuration",
3
- "version": "2.186.5",
3
+ "version": "2.186.6",
4
4
  "description": "pure nodejs OPCUA SDK - module server-configuration",
5
5
  "scripts": {
6
6
  "build": "tsc -b",
@@ -64,7 +64,7 @@
64
64
  "internet of things"
65
65
  ],
66
66
  "homepage": "http://node-opcua.github.io/",
67
- "gitHead": "dcbd5e9e579be280973cf978bf80e7f18ba68d1b",
67
+ "gitHead": "79ae0117bb878f9a8fbb96ddb3acb59f247796e0",
68
68
  "files": [
69
69
  "dist",
70
70
  "source"
package/source/server/install_push_certificate_management.ts CHANGED
@@ -461,17 +461,22 @@ export async function installPushCertificateManagementOnServer(
461
461
 
462
462
  const reevaluations = new WeakMap<OPCUAServer, Promise<unknown>>();
463
463
 
464
+ /** Certificates being re-evaluated: the relaxation hook admits them without trusting them. */
465
+ const reevaluating = new WeakSet<Certificate>();
466
+
464
467
  /** How long after a TrustList change open channels are re-evaluated (see the "trustListUpdated" listener). */
465
468
  const REEVALUATION_DELAY_MS = 250;
466
469
 
467
470
  /**
468
471
  * Close every SecureChannel, and the Sessions on it, whose client
469
- * certificate the server no longer accepts. In the setup state an untrusted
470
- * certificate is still admitted, so only a revoked or otherwise invalid one
471
- * closes the channel then. Returns the number of channels closed.
472
+ * certificate the server would no longer admit, by the same decision as at
473
+ * OpenSecureChannel: the certificate store, then the endpoint's
474
+ * `onAdjustCertificateStatus` hook (the NoConfiguration relaxation, plus
475
+ * whatever admission policy the application composed with it). In the setup
476
+ * state an untrusted certificate is therefore still admitted. Returns the
477
+ * number of channels closed.
472
478
  *
473
- * The check never trusts a certificate on its own: the relaxation hook,
474
- * which does, is not called.
479
+ * The check never trusts a certificate on its own.
475
480
  */
476
481
  export function closeChannelsNoLongerTrusted(server: OPCUAServer): Promise<number> {
477
482
  const run = (reevaluations.get(server) ?? Promise.resolve()).then(() => _closeChannelsNoLongerTrusted(server));
@@ -491,11 +496,21 @@ async function _closeChannelsNoLongerTrusted(server: OPCUAServer): Promise<numbe
491
496
  if (!certificate) {
492
497
  continue;
493
498
  }
494
- const statusCode = await cm.checkCertificate(certificate);
495
- if (statusCode.isGood()) {
496
- continue;
499
+ // The same decision as when the channel was opened: the store,
500
+ // then the endpoint's adjustment hook, which the application may
501
+ // have composed with its own admission policy. Only the
502
+ // NoConfiguration relaxation's side effect (trusting the
503
+ // certificate) is suppressed: a re-evaluation never adds trust.
504
+ let statusCode = await cm.checkCertificate(certificate);
505
+ if (statusCode.isNotGood()) {
506
+ reevaluating.add(certificate);
507
+ try {
508
+ statusCode = await endpoint.adjustCertificateStatus(statusCode, certificate);
509
+ } finally {
510
+ reevaluating.delete(certificate);
511
+ }
497
512
  }
498
- if (server.engine.getServerState() === ServerState.NoConfiguration && isRelaxableCertificateError(statusCode)) {
513
+ if (statusCode.isGood()) {
499
514
  continue;
500
515
  }
501
516
  warningLog(`[TrustList] closing SecureChannel ${channel.channelId}: client certificate is now ${statusCode.name}`);
@@ -713,8 +728,11 @@ function installCertificateRelaxationHook(server: OPCUAServer, recordProvisional
713
728
  "(server is awaiting GDS provisioning)"
714
729
  );
715
730
 
716
- // Auto-trust the leaf certificate; issuer CAs go to issuers/
717
- await autoTrustCertificateChain(server, certificate, recordProvisional);
731
+ // Auto-trust the leaf certificate; issuer CAs go to issuers/ (not
732
+ // when an open channel is being re-evaluated: that adds no trust).
733
+ if (!reevaluating.has(certificate)) {
734
+ await autoTrustCertificateChain(server, certificate, recordProvisional);
735
+ }
718
736
 
719
737
  return StatusCodes.Good;
720
738
  };