node-opcua-server-configuration 2.59.0 → 2.62.1

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 (11) hide show
  1. package/bin/configurator.ts +7 -4
  2. package/dist/server/install_CertificateAlarm.js +2 -2
  3. package/dist/server/install_CertificateAlarm.js.map +1 -1
  4. package/dist/server/promote_trust_list.js +6 -7
  5. package/dist/server/promote_trust_list.js.map +1 -1
  6. package/dist/server/push_certificate_manager_helpers.js +9 -12
  7. package/dist/server/push_certificate_manager_helpers.js.map +1 -1
  8. package/package.json +20 -20
  9. package/source/server/install_CertificateAlarm.ts +2 -2
  10. package/source/server/promote_trust_list.ts +6 -6
  11. package/source/server/push_certificate_manager_helpers.ts +23 -57
package/bin/configurator.ts CHANGED
@@ -27,10 +27,10 @@ import {
27
27
  } from "node-opcua-crypto";
28
28
  import { CertificateAuthority } from "node-opcua-pki";
29
29
  import { OPCUACertificateManager } from "node-opcua-certificate-manager";
30
+ import { TrustListDataType } from "node-opcua-types";
30
31
 
31
32
  import { CertificateType } from "../source";
32
33
  import { ClientPushCertificateManagement } from "../source/clientTools";
33
- import { TrustListDataType } from "node-opcua-types";
34
34
 
35
35
  const endpointUrl = "opc.tcp://localhost:48010";
36
36
 
@@ -39,13 +39,13 @@ function dumpCertificateInfo(certificate: Certificate) {
39
39
  const i = exploreCertificate(certificate);
40
40
  console.log(" serial number : ", i.tbsCertificate.serialNumber);
41
41
  console.log(" subject : ");
42
- for (let [k, v] of Object.entries(i.tbsCertificate.subject)) {
42
+ for (const [k, v] of Object.entries(i.tbsCertificate.subject)) {
43
43
  console.log(` ${k.padEnd(18)}: ${v}`);
44
44
  }
45
45
  console.log(" notBefore : ", i.tbsCertificate.validity.notBefore);
46
46
  console.log(" notAfter : ", i.tbsCertificate.validity.notAfter);
47
47
  console.log(" issuer : ");
48
- for (let [k, v] of Object.entries(i.tbsCertificate.issuer)) {
48
+ for (const [k, v] of Object.entries(i.tbsCertificate.issuer)) {
49
49
  console.log(` ${k.padEnd(18)}: ${v}`);
50
50
  }
51
51
  console.log(" signature algo : ", i.signatureAlgorithm);
@@ -143,7 +143,10 @@ async function addApplicationCertificate(session: IBasicSession) {
143
143
  await trustList.addCertificate(certificate, true);
144
144
  }
145
145
 
146
- async function addApplicationIssuerCertificateAndCRL(session: IBasicSession) {}
146
+ async function addApplicationIssuerCertificateAndCRL(session: IBasicSession) {
147
+ /**
148
+ */
149
+ }
147
150
  async function replaceServerCertificate(session: IBasicSession, caAuthority: CertificateAuthority) {
148
151
  const certificateAutorityhPath = path.join(caAuthority.location);
149
152
  const caCertificate = await readCertificate(caAuthority.caCertificate);
package/dist/server/install_CertificateAlarm.js CHANGED
@@ -21,8 +21,8 @@ function installCertificateExpirationAlarm(addressSpace) {
21
21
  browseName: "ServerCertificateAlarm",
22
22
  conditionSource: null,
23
23
  eventSourceOf: server,
24
- inputNode: node_opcua_nodeid_1.NodeId.nullNodeId,
25
- normalState: node_opcua_nodeid_1.NodeId.nullNodeId
24
+ inputNode: new node_opcua_nodeid_1.NodeId(),
25
+ normalState: new node_opcua_nodeid_1.NodeId()
26
26
  };
27
27
  const data = {};
28
28
  const alarm = node_opcua_address_space_1.UACertificateExpirationAlarmImpl.instantiate(namespace, options, data);
package/dist/server/install_CertificateAlarm.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"install_CertificateAlarm.js","sourceRoot":"","sources":["../../source/server/install_CertificateAlarm.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,uEAIkC;AAClC,uDAI0B;AAC1B,yDAE2B;AAC3B,2DAA8C;AAE9C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,qBAAqB,CAAC,CAAC;AACtD,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,qBAAqB,CAAC,CAAC;AACtD,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,qBAAqB,CAAC,CAAC;AAEtD,SAAgB,iCAAiC,CAAC,YAA0B;;IAExE,QAAQ,CAAC,mCAAmC,CAAC,CAAC;IAE9C,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC;IAEtD,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,CAAC;IAEjD,MAAM,8BAA8B,GAAG,YAAY,CAAC,aAAa,CAAC,gCAAgC,CAAC,CAAC;IAEpG,MAAM,OAAO,GAAG;QACZ,UAAU,EAAE,wBAAwB;QACpC,eAAe,EAAE,IAAI;QACrB,aAAa,EAAE,MAAM;QACrB,SAAS,EAAE,0BAAM,CAAC,UAAU;QAC5B,WAAW,EAAE,0BAAM,CAAC,UAAU;KACjC,CAAC;IACF,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,MAAM,KAAK,GAAG,2DAAgC,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACrF,wFAAwF;IACxF,KAAK,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACtC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjC,MAAA,KAAK,CAAC,eAAe,0CAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvC,KAAK,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAC,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACpF,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAC,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAEpF,CAAC;AA3BD,8EA2BC"}
1
+ {"version":3,"file":"install_CertificateAlarm.js","sourceRoot":"","sources":["../../source/server/install_CertificateAlarm.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,uEAIkC;AAClC,uDAI0B;AAC1B,yDAE2B;AAC3B,2DAA8C;AAE9C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,qBAAqB,CAAC,CAAC;AACtD,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,qBAAqB,CAAC,CAAC;AACtD,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,qBAAqB,CAAC,CAAC;AAEtD,SAAgB,iCAAiC,CAAC,YAA0B;;IAExE,QAAQ,CAAC,mCAAmC,CAAC,CAAC;IAE9C,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC;IAEtD,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,CAAC;IAEjD,MAAM,8BAA8B,GAAG,YAAY,CAAC,aAAa,CAAC,gCAAgC,CAAC,CAAC;IAEpG,MAAM,OAAO,GAAG;QACZ,UAAU,EAAE,wBAAwB;QACpC,eAAe,EAAE,IAAI;QACrB,aAAa,EAAE,MAAM;QACrB,SAAS,EAAE,IAAI,0BAAM,EAAE;QACvB,WAAW,EAAE,IAAI,0BAAM,EAAE;KAC5B,CAAC;IACF,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,MAAM,KAAK,GAAG,2DAAgC,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACrF,wFAAwF;IACxF,KAAK,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACtC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjC,MAAA,KAAK,CAAC,eAAe,0CAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvC,KAAK,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAC,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACpF,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAC,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAEpF,CAAC;AA3BD,8EA2BC"}
package/dist/server/promote_trust_list.js CHANGED
@@ -13,7 +13,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.installAccessRestrictionOnTrustList = exports.promoteTrustList = void 0;
16
- const util_1 = require("util");
17
16
  const memfs_1 = require("memfs");
18
17
  const node_opcua_debug_1 = require("node-opcua-debug");
19
18
  const node_opcua_status_code_1 = require("node-opcua-status-code");
@@ -149,19 +148,19 @@ function promoteTrustList(trustList) {
149
148
  // The OpenWithMasks Method allows a Client to read only the portion of the Trust List.
150
149
  // This Method can only be used to read the Trust List.
151
150
  openWithMasks.bindMethod(_openWithMaskCallback);
152
- addCertificate.bindMethod((0, util_1.callbackify)(_addCertificate));
153
- removeCertificate.bindMethod((0, util_1.callbackify)(_removeCertificate));
154
- closeAndUpdate === null || closeAndUpdate === void 0 ? void 0 : closeAndUpdate.bindMethod((0, util_1.callbackify)(_closeAndUpdate));
151
+ addCertificate.bindMethod(_addCertificate);
152
+ removeCertificate.bindMethod(_removeCertificate);
153
+ closeAndUpdate === null || closeAndUpdate === void 0 ? void 0 : closeAndUpdate.bindMethod(_closeAndUpdate);
155
154
  function install_method_handle_on_TrustListType(addressSpace) {
156
155
  const fileType = addressSpace.findObjectType("TrustListType");
157
156
  if (!fileType || fileType.addCertificate.isBound()) {
158
157
  return;
159
158
  }
160
159
  fileType.open && fileType.open.bindMethod(_openCallback);
161
- fileType.addCertificate.bindMethod((0, util_1.callbackify)(_addCertificate));
162
- fileType.removeCertificate.bindMethod((0, util_1.callbackify)(_removeCertificate));
160
+ fileType.addCertificate.bindMethod(_addCertificate);
161
+ fileType.removeCertificate.bindMethod(_removeCertificate);
163
162
  fileType.openWithMasks && fileType.openWithMasks.bindMethod(_openWithMaskCallback);
164
- fileType.closeAndUpdate && fileType.closeAndUpdate.bindMethod((0, util_1.callbackify)(_closeAndUpdate));
163
+ fileType.closeAndUpdate && fileType.closeAndUpdate.bindMethod(_closeAndUpdate);
165
164
  }
166
165
  install_method_handle_on_TrustListType(trustList.addressSpace);
167
166
  });
package/dist/server/promote_trust_list.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"promote_trust_list.js","sourceRoot":"","sources":["../../source/server/promote_trust_list.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"promote_trust_list.js","sourceRoot":"","sources":["../../source/server/promote_trust_list.ts"],"names":[],"mappings":"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"}
package/dist/server/push_certificate_manager_helpers.js CHANGED
@@ -13,7 +13,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.installPushCertificateManagement = exports.promoteCertificateGroup = void 0;
16
- const util_1 = require("util");
17
16
  const node_opcua_debug_1 = require("node-opcua-debug");
18
17
  const node_opcua_nodeid_1 = require("node-opcua-nodeid");
19
18
  const node_opcua_status_code_1 = require("node-opcua-status-code");
@@ -274,17 +273,17 @@ function installPushCertificateManagement(addressSpace, options) {
274
273
  if (serverConfigurationType.createSigningRequest.isBound()) {
275
274
  return;
276
275
  }
277
- serverConfigurationType.createSigningRequest.bindMethod((0, util_1.callbackify)(_createSigningRequest));
278
- serverConfigurationType.getRejectedList.bindMethod((0, util_1.callbackify)(_getRejectedList));
279
- serverConfigurationType.updateCertificate.bindMethod((0, util_1.callbackify)(_updateCertificate));
280
- serverConfigurationType.applyChanges.bindMethod((0, util_1.callbackify)(_applyChanges));
276
+ serverConfigurationType.createSigningRequest.bindMethod(_createSigningRequest);
277
+ serverConfigurationType.getRejectedList.bindMethod(_getRejectedList);
278
+ serverConfigurationType.updateCertificate.bindMethod(_updateCertificate);
279
+ serverConfigurationType.applyChanges.bindMethod(_applyChanges);
281
280
  }
282
281
  install_method_handle_on_type(addressSpace);
283
- serverConfiguration.createSigningRequest.bindMethod((0, util_1.callbackify)(_createSigningRequest));
284
- serverConfiguration.updateCertificate.bindMethod((0, util_1.callbackify)(_updateCertificate));
285
- serverConfiguration.getRejectedList.bindMethod((0, util_1.callbackify)(_getRejectedList));
282
+ serverConfiguration.createSigningRequest.bindMethod(_createSigningRequest);
283
+ serverConfiguration.updateCertificate.bindMethod(_updateCertificate);
284
+ serverConfiguration.getRejectedList.bindMethod(_getRejectedList);
286
285
  if (serverConfiguration.applyChanges) {
287
- serverConfiguration.applyChanges.bindMethod((0, util_1.callbackify)(_applyChanges));
286
+ serverConfiguration.applyChanges.bindMethod(_applyChanges);
288
287
  }
289
288
  (0, install_CertificateAlarm_1.installCertificateExpirationAlarm)(addressSpace);
290
289
  const cg = serverConfiguration.certificateGroups.getComponents();
@@ -293,9 +292,7 @@ function installPushCertificateManagement(addressSpace, options) {
293
292
  certificateTypes.setValueFromSource({
294
293
  dataType: node_opcua_variant_1.DataType.NodeId,
295
294
  arrayType: node_opcua_variant_1.VariantArrayType.Array,
296
- value: [
297
- (0, node_opcua_nodeid_1.resolveNodeId)(node_opcua_constants_1.ObjectTypeIds.RsaSha256ApplicationCertificateType)
298
- ]
295
+ value: [(0, node_opcua_nodeid_1.resolveNodeId)(node_opcua_constants_1.ObjectTypeIds.RsaSha256ApplicationCertificateType)]
299
296
  });
300
297
  for (const certificateGroup of cg) {
301
298
  if (certificateGroup.nodeClass !== node_opcua_data_model_1.NodeClass.Object) {
package/dist/server/push_certificate_manager_helpers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"push_certificate_manager_helpers.js","sourceRoot":"","sources":["../../source/server/push_certificate_manager_helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"push_certificate_manager_helpers.js","sourceRoot":"","sources":["../../source/server/push_certificate_manager_helpers.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.59.0",
3
+ "version": "2.62.1",
4
4
  "description": "pure nodejs OPCUA SDK - module -server",
5
5
  "scripts": {
6
6
  "build": "tsc -b",
@@ -12,35 +12,35 @@
12
12
  "types": "./dist/index.d.ts",
13
13
  "dependencies": {
14
14
  "memfs": "^3.3.0",
15
- "node-opcua-address-space": "2.59.0",
15
+ "node-opcua-address-space": "2.62.1",
16
16
  "node-opcua-assert": "2.55.0",
17
- "node-opcua-basic-types": "2.57.0",
18
- "node-opcua-certificate-manager": "2.57.0",
19
- "node-opcua-client": "2.59.0",
17
+ "node-opcua-basic-types": "2.61.0",
18
+ "node-opcua-certificate-manager": "2.61.0",
19
+ "node-opcua-client": "2.62.1",
20
20
  "node-opcua-constants": "2.52.0",
21
21
  "node-opcua-crypto": "^1.7.4",
22
- "node-opcua-data-model": "2.57.0",
23
- "node-opcua-debug": "2.55.0",
24
- "node-opcua-file-transfer": "2.59.0",
22
+ "node-opcua-data-model": "2.61.0",
23
+ "node-opcua-debug": "2.61.0",
24
+ "node-opcua-file-transfer": "2.62.1",
25
25
  "node-opcua-hostname": "2.55.0",
26
- "node-opcua-nodeid": "2.55.0",
26
+ "node-opcua-nodeid": "2.61.0",
27
27
  "node-opcua-nodesets": "2.57.0",
28
- "node-opcua-pki": "^2.12.0",
29
- "node-opcua-pseudo-session": "2.59.0",
30
- "node-opcua-secure-channel": "2.59.0",
31
- "node-opcua-server": "2.59.0",
32
- "node-opcua-service-translate-browse-path": "2.59.0",
28
+ "node-opcua-pki": "^2.12.1",
29
+ "node-opcua-pseudo-session": "2.62.0",
30
+ "node-opcua-secure-channel": "2.62.0",
31
+ "node-opcua-server": "2.62.1",
32
+ "node-opcua-service-translate-browse-path": "2.62.0",
33
33
  "node-opcua-status-code": "2.56.0",
34
- "node-opcua-types": "2.59.0",
35
- "node-opcua-variant": "2.59.0",
34
+ "node-opcua-types": "2.62.0",
35
+ "node-opcua-variant": "2.62.0",
36
36
  "rimraf": "^3.0.2"
37
37
  },
38
38
  "devDependencies": {
39
39
  "node-opcua-binary-stream": "2.55.0",
40
- "node-opcua-data-value": "2.59.0",
41
- "node-opcua-leak-detector": "2.56.0",
40
+ "node-opcua-data-value": "2.62.0",
41
+ "node-opcua-leak-detector": "2.61.0",
42
42
  "should": "^13.2.3",
43
- "sinon": "^11.1.2"
43
+ "sinon": "^12.0.1"
44
44
  },
45
45
  "author": "Etienne Rossignon",
46
46
  "license": "MIT",
@@ -57,5 +57,5 @@
57
57
  "internet of things"
58
58
  ],
59
59
  "homepage": "http://node-opcua.github.io/",
60
- "gitHead": "ea10265745d3d4b8af249a4e13288ad71232706f"
60
+ "gitHead": "2c2e9bd471f14c303fc617415f39a8b7c82ad55a"
61
61
  }
package/source/server/install_CertificateAlarm.ts CHANGED
@@ -34,8 +34,8 @@ export function installCertificateExpirationAlarm(addressSpace: AddressSpace) {
34
34
  browseName: "ServerCertificateAlarm",
35
35
  conditionSource: null,
36
36
  eventSourceOf: server,
37
- inputNode: NodeId.nullNodeId,
38
- normalState: NodeId.nullNodeId
37
+ inputNode: new NodeId(),
38
+ normalState: new NodeId()
39
39
  };
40
40
  const data = {};
41
41
  const alarm = UACertificateExpirationAlarmImpl.instantiate(namespace, options, data);
package/source/server/promote_trust_list.ts CHANGED
@@ -197,9 +197,9 @@ export async function promoteTrustList(trustList: UATrustList) {
197
197
  // The OpenWithMasks Method allows a Client to read only the portion of the Trust List.
198
198
  // This Method can only be used to read the Trust List.
199
199
  openWithMasks.bindMethod(_openWithMaskCallback);
200
- addCertificate.bindMethod(callbackify(_addCertificate));
201
- removeCertificate.bindMethod(callbackify(_removeCertificate));
202
- closeAndUpdate?.bindMethod(callbackify(_closeAndUpdate));
200
+ addCertificate.bindMethod(_addCertificate);
201
+ removeCertificate.bindMethod(_removeCertificate);
202
+ closeAndUpdate?.bindMethod(_closeAndUpdate);
203
203
 
204
204
  function install_method_handle_on_TrustListType(addressSpace: IAddressSpace): void {
205
205
  const fileType = addressSpace.findObjectType("TrustListType") as any;
@@ -207,10 +207,10 @@ export async function promoteTrustList(trustList: UATrustList) {
207
207
  return;
208
208
  }
209
209
  fileType.open && fileType.open.bindMethod(_openCallback);
210
- fileType.addCertificate.bindMethod(callbackify(_addCertificate));
211
- fileType.removeCertificate.bindMethod(callbackify(_removeCertificate));
210
+ fileType.addCertificate.bindMethod(_addCertificate);
211
+ fileType.removeCertificate.bindMethod(_removeCertificate);
212
212
  fileType.openWithMasks && fileType.openWithMasks.bindMethod(_openWithMaskCallback);
213
- fileType.closeAndUpdate && fileType.closeAndUpdate.bindMethod(callbackify(_closeAndUpdate));
213
+ fileType.closeAndUpdate && fileType.closeAndUpdate.bindMethod(_closeAndUpdate);
214
214
  }
215
215
  install_method_handle_on_TrustListType(trustList.addressSpace);
216
216
  }
package/source/server/push_certificate_manager_helpers.ts CHANGED
@@ -14,11 +14,7 @@ import {
14
14
  UAServerConfiguration,
15
15
  ISessionContext
16
16
  } from "node-opcua-address-space";
17
- import {
18
- checkDebugFlag,
19
- make_debugLog,
20
- make_warningLog
21
- } from "node-opcua-debug";
17
+ import { checkDebugFlag, make_debugLog, make_warningLog } from "node-opcua-debug";
22
18
  import { NodeId, resolveNodeId } from "node-opcua-nodeid";
23
19
  import { StatusCodes } from "node-opcua-status-code";
24
20
  import { CallMethodResultOptions } from "node-opcua-types";
@@ -27,19 +23,10 @@ import { AccessRestrictionsFlag, NodeClass } from "node-opcua-data-model";
27
23
  import { ByteString, UAString } from "node-opcua-basic-types";
28
24
  import { ObjectTypeIds } from "node-opcua-constants";
29
25
 
30
- import {
31
- CreateSigningRequestResult,
32
- PushCertificateManager
33
- } from "../push_certificate_manager";
34
-
26
+ import { CreateSigningRequestResult, PushCertificateManager } from "../push_certificate_manager";
35
27
 
36
- import {
37
- installCertificateExpirationAlarm
38
- } from "./install_CertificateAlarm";
39
- import {
40
- PushCertificateManagerServerImpl,
41
- PushCertificateManagerServerOptions
42
- } from "./push_certificate_manager_server_impl";
28
+ import { installCertificateExpirationAlarm } from "./install_CertificateAlarm";
29
+ import { PushCertificateManagerServerImpl, PushCertificateManagerServerOptions } from "./push_certificate_manager_server_impl";
43
30
  import { installAccessRestrictionOnTrustList, promoteTrustList } from "./promote_trust_list";
44
31
  import { hasEncryptedChannel, hasExpectedUserAccess } from "./tools";
45
32
  import { rolePermissionAdminOnly, rolePermissionRestricted } from "./roles_and_permissions";
@@ -49,12 +36,7 @@ const doDebug = checkDebugFlag("ServerConfiguration");
49
36
  const warningLog = make_warningLog("ServerConfiguration");
50
37
  const errorLog = debugLog;
51
38
 
52
-
53
- function expected(
54
- variant: Variant | undefined,
55
- dataType: DataType,
56
- variantArrayType: VariantArrayType
57
- ): boolean {
39
+ function expected(variant: Variant | undefined, dataType: DataType, variantArrayType: VariantArrayType): boolean {
58
40
  if (!variant) {
59
41
  return false;
60
42
  }
@@ -68,7 +50,6 @@ function expected(
68
50
  }
69
51
 
70
52
  function getPushCertificateManager(method: UAMethod): PushCertificateManager | null {
71
-
72
53
  const serverConfiguration = method.addressSpace.rootFolder.objects.server.getChildByName("ServerConfiguration");
73
54
  const serverConfigurationPriv = serverConfiguration as any;
74
55
  if (serverConfigurationPriv.$pushCertificateManager) {
@@ -78,13 +59,11 @@ function getPushCertificateManager(method: UAMethod): PushCertificateManager | n
78
59
  return null;
79
60
  }
80
61
 
81
-
82
62
  async function _createSigningRequest(
83
63
  this: UAMethod,
84
64
  inputArguments: Variant[],
85
65
  context: ISessionContext
86
66
  ): Promise<CallMethodResultOptions> {
87
-
88
67
  const certificateGroupIdVariant = inputArguments[0];
89
68
  const certificateTypeIdVariant = inputArguments[1];
90
69
  const subjectNameVariant = inputArguments[2];
@@ -159,7 +138,6 @@ async function _updateCertificate(
159
138
  inputArguments: Variant[],
160
139
  context: ISessionContext
161
140
  ): Promise<CallMethodResultOptions> {
162
-
163
141
  const certificateGroupId: NodeId = inputArguments[0].value as NodeId;
164
142
  const certificateTypeId: NodeId = inputArguments[1].value as NodeId;
165
143
  const certificate: Buffer = inputArguments[2].value as Buffer;
@@ -192,7 +170,7 @@ async function _updateCertificate(
192
170
  certificate,
193
171
  issuerCertificates,
194
172
  privateKeyFormat,
195
- privateKey,
173
+ privateKey
196
174
  );
197
175
 
198
176
  // todo raise a CertificateUpdatedAuditEventType
@@ -217,7 +195,6 @@ async function _getRejectedList(
217
195
  inputArguments: Variant[],
218
196
  context: ISessionContext
219
197
  ): Promise<CallMethodResultOptions> {
220
-
221
198
  if (!hasEncryptedChannel(context)) {
222
199
  return { statusCode: StatusCodes.BadSecurityModeInsufficient };
223
200
  }
@@ -253,7 +230,6 @@ async function _applyChanges(
253
230
  inputArguments: Variant[],
254
231
  context: ISessionContext
255
232
  ): Promise<CallMethodResultOptions> {
256
-
257
233
  // This Method requires an encrypted channel and that the Client provide credentials with
258
234
  // administrative rights on the Server.
259
235
  if (!hasEncryptedChannel(context)) {
@@ -271,12 +247,10 @@ async function _applyChanges(
271
247
  return { statusCode };
272
248
  }
273
249
 
274
- function bindCertificateManager(
275
- addressSpace: AddressSpace,
276
- options: PushCertificateManagerServerOptions
277
- ) {
278
-
279
- const serverConfiguration = addressSpace.rootFolder.objects.server.getChildByName("ServerConfiguration")! as UAServerConfiguration;
250
+ function bindCertificateManager(addressSpace: AddressSpace, options: PushCertificateManagerServerOptions) {
251
+ const serverConfiguration = addressSpace.rootFolder.objects.server.getChildByName(
252
+ "ServerConfiguration"
253
+ )! as UAServerConfiguration;
280
254
 
281
255
  const defaultApplicationGroup = serverConfiguration.certificateGroups.getComponentByName("DefaultApplicationGroup");
282
256
  if (defaultApplicationGroup) {
@@ -294,9 +268,7 @@ function bindCertificateManager(
294
268
  }
295
269
  }
296
270
 
297
-
298
271
  export async function promoteCertificateGroup(certificateGroup: UAObject) {
299
-
300
272
  const trustList = certificateGroup.getChildByName("TrustList") as UATrustList;
301
273
  if (trustList) {
302
274
  promoteTrustList(trustList);
@@ -307,8 +279,9 @@ export async function installPushCertificateManagement(
307
279
  addressSpace: AddressSpace,
308
280
  options: PushCertificateManagerServerOptions
309
281
  ): Promise<void> {
310
-
311
- const serverConfiguration = addressSpace.rootFolder.objects.server.getChildByName("ServerConfiguration")! as UAServerConfiguration;
282
+ const serverConfiguration = addressSpace.rootFolder.objects.server.getChildByName(
283
+ "ServerConfiguration"
284
+ )! as UAServerConfiguration;
312
285
 
313
286
  const serverConfigurationPriv = serverConfiguration as any;
314
287
  if (serverConfigurationPriv.$pushCertificateManager) {
@@ -319,7 +292,6 @@ export async function installPushCertificateManagement(
319
292
  const accessRestrictionFlag = AccessRestrictionsFlag.SigningRequired | AccessRestrictionsFlag.EncryptionRequired;
320
293
 
321
294
  function installAccessRestrictions(serverConfiguration: UAObject) {
322
-
323
295
  serverConfiguration.setRolePermissions(rolePermissionRestricted);
324
296
  serverConfiguration.setAccessRestrictions(AccessRestrictionsFlag.None);
325
297
 
@@ -344,7 +316,6 @@ export async function installPushCertificateManagement(
344
316
  certificateGroups.setAccessRestrictions(AccessRestrictionsFlag.None);
345
317
 
346
318
  function installAccessRestrictionOnGroup(group: UAObject) {
347
-
348
319
  const trustList = group.getComponentByName("TrustList")!;
349
320
  if (trustList) {
350
321
  installAccessRestrictionOnTrustList(trustList);
@@ -357,9 +328,8 @@ export async function installPushCertificateManagement(
357
328
  installAccessRestrictionOnGroup(group as UAObject);
358
329
  }
359
330
  }
360
-
361
331
  }
362
- installAccessRestrictions(serverConfiguration)
332
+ installAccessRestrictions(serverConfiguration);
363
333
 
364
334
  serverConfigurationPriv.$pushCertificateManager = new PushCertificateManagerServerImpl(options);
365
335
 
@@ -369,25 +339,24 @@ export async function installPushCertificateManagement(
369
339
  value: ["PEM"]
370
340
  });
371
341
 
372
-
373
342
  function install_method_handle_on_type(addressSpace: AddressSpace): void {
374
343
  const serverConfigurationType = addressSpace.findObjectType("ServerConfigurationType")! as any;
375
344
  if (serverConfigurationType.createSigningRequest.isBound()) {
376
345
  return;
377
346
  }
378
- serverConfigurationType.createSigningRequest.bindMethod(callbackify(_createSigningRequest));
379
- serverConfigurationType.getRejectedList.bindMethod(callbackify(_getRejectedList));
380
- serverConfigurationType.updateCertificate.bindMethod(callbackify(_updateCertificate));
381
- serverConfigurationType.applyChanges.bindMethod(callbackify(_applyChanges));
347
+ serverConfigurationType.createSigningRequest.bindMethod(_createSigningRequest);
348
+ serverConfigurationType.getRejectedList.bindMethod(_getRejectedList);
349
+ serverConfigurationType.updateCertificate.bindMethod(_updateCertificate);
350
+ serverConfigurationType.applyChanges.bindMethod(_applyChanges);
382
351
  }
383
352
 
384
353
  install_method_handle_on_type(addressSpace);
385
354
 
386
- serverConfiguration.createSigningRequest.bindMethod(callbackify(_createSigningRequest));
387
- serverConfiguration.updateCertificate.bindMethod(callbackify(_updateCertificate));
388
- serverConfiguration.getRejectedList.bindMethod(callbackify(_getRejectedList));
355
+ serverConfiguration.createSigningRequest.bindMethod(_createSigningRequest);
356
+ serverConfiguration.updateCertificate.bindMethod(_updateCertificate);
357
+ serverConfiguration.getRejectedList.bindMethod(_getRejectedList);
389
358
  if (serverConfiguration.applyChanges) {
390
- serverConfiguration.applyChanges!.bindMethod(callbackify(_applyChanges));
359
+ serverConfiguration.applyChanges!.bindMethod(_applyChanges);
391
360
  }
392
361
 
393
362
  installCertificateExpirationAlarm(addressSpace);
@@ -399,9 +368,7 @@ export async function installPushCertificateManagement(
399
368
  certificateTypes.setValueFromSource({
400
369
  dataType: DataType.NodeId,
401
370
  arrayType: VariantArrayType.Array,
402
- value: [
403
- resolveNodeId(ObjectTypeIds.RsaSha256ApplicationCertificateType)
404
- ]
371
+ value: [resolveNodeId(ObjectTypeIds.RsaSha256ApplicationCertificateType)]
405
372
  });
406
373
  for (const certificateGroup of cg) {
407
374
  if (certificateGroup.nodeClass !== NodeClass.Object) {
@@ -411,4 +378,3 @@ export async function installPushCertificateManagement(
411
378
  }
412
379
  await bindCertificateManager(addressSpace, options);
413
380
  }
414
-