node-opcua-server-configuration 2.132.0 → 2.134.0

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 (17) hide show
  1. package/dist/clientTools/push_certificate_management_client.d.ts +1 -1
  2. package/dist/server/install_push_certitifate_management.d.ts +1 -1
  3. package/dist/server/install_push_certitifate_management.js +7 -6
  4. package/dist/server/install_push_certitifate_management.js.map +1 -1
  5. package/dist/server/promote_trust_list.js +3 -3
  6. package/dist/server/promote_trust_list.js.map +1 -1
  7. package/dist/server/push_certificate_manager_server_impl.d.ts +8 -1
  8. package/dist/server/push_certificate_manager_server_impl.js +16 -16
  9. package/dist/server/push_certificate_manager_server_impl.js.map +1 -1
  10. package/dist/trust_list_impl.d.ts +1 -0
  11. package/dist/trust_list_impl.js +1 -0
  12. package/dist/trust_list_impl.js.map +1 -1
  13. package/package.json +26 -26
  14. package/source/clientTools/push_certificate_management_client.ts +1 -1
  15. package/source/server/install_push_certitifate_management.ts +2 -2
  16. package/source/server/promote_trust_list.ts +1 -1
  17. package/source/server/push_certificate_manager_server_impl.ts +18 -11
package/dist/clientTools/push_certificate_management_client.d.ts CHANGED
@@ -7,7 +7,7 @@ import { IBasicSessionAsync } from "node-opcua-pseudo-session";
7
7
  import { StatusCode } from "node-opcua-status-code";
8
8
  import { ClientFile } from "node-opcua-file-transfer";
9
9
  import { QualifiedNameLike } from "node-opcua-data-model";
10
- import { Certificate } from "node-opcua-crypto";
10
+ import { Certificate } from "node-opcua-crypto/web";
11
11
  import { TrustListDataType } from "node-opcua-types";
12
12
  import { CreateSigningRequestResult, GetRejectedListResult, PushCertificateManager, UpdateCertificateResult } from "../push_certificate_manager";
13
13
  import { ITrustList } from "../trust_list";
package/dist/server/install_push_certitifate_management.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { AddressSpace } from "node-opcua-address-space";
2
2
  import { OPCUACertificateManager } from "node-opcua-certificate-manager";
3
- import { Certificate, PrivateKey } from "node-opcua-crypto";
3
+ import { Certificate, PrivateKey } from "node-opcua-crypto/web";
4
4
  import { ICertificateKeyPairProviderPriv } from "node-opcua-common";
5
5
  import { OPCUAServer } from "node-opcua-server";
6
6
  import { ApplicationDescriptionOptions } from "node-opcua-types";
package/dist/server/install_push_certitifate_management.js CHANGED
@@ -13,6 +13,7 @@ const path_1 = __importDefault(require("path"));
13
13
  const util_1 = require("util");
14
14
  const chalk_1 = __importDefault(require("chalk"));
15
15
  const node_opcua_assert_1 = require("node-opcua-assert");
16
+ const web_1 = require("node-opcua-crypto/web");
16
17
  const node_opcua_crypto_1 = require("node-opcua-crypto");
17
18
  const node_opcua_debug_1 = require("node-opcua-debug");
18
19
  const node_opcua_hostname_1 = require("node-opcua-hostname");
@@ -25,7 +26,7 @@ const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("ServerConfiguration");
25
26
  function getCertificate() {
26
27
  if (!this.$$certificate) {
27
28
  const certificateChain = getCertificateChain.call(this);
28
- this.$$certificate = (0, node_opcua_crypto_1.split_der)(certificateChain)[0];
29
+ this.$$certificate = (0, web_1.split_der)(certificateChain)[0];
29
30
  }
30
31
  return this.$$certificate;
31
32
  }
@@ -91,15 +92,15 @@ async function install() {
91
92
  await this.serverCertificateManager.createSelfSignedCertificate(options);
92
93
  }
93
94
  const certificatePEM = await readFile(certificateFile, "utf8");
94
- this.$$certificateChain = (0, node_opcua_crypto_1.convertPEMtoDER)(certificatePEM);
95
+ this.$$certificateChain = (0, web_1.convertPEMtoDER)(certificatePEM);
95
96
  // await this.serverCertificateManager.trustCertificate( this.$$certificateChain);
96
97
  }
97
98
  }
98
99
  function getCertificateChainEP() {
99
100
  const certificateFile = path_1.default.join(this.certificateManager.rootDir, "own/certs/certificate.pem");
100
101
  const certificatePEM = fs_1.default.readFileSync(certificateFile, "utf8");
101
- const $$certificateChain = (0, node_opcua_crypto_1.convertPEMtoDER)(certificatePEM);
102
- const thumbprint = (0, node_opcua_crypto_1.makeSHA1Thumbprint)($$certificateChain);
102
+ const $$certificateChain = (0, web_1.convertPEMtoDER)(certificatePEM);
103
+ const thumbprint = (0, web_1.makeSHA1Thumbprint)($$certificateChain);
103
104
  return $$certificateChain;
104
105
  }
105
106
  function getPrivateKeyEP() {
@@ -129,10 +130,10 @@ async function onCertificateChange(server) {
129
130
  const privateKeyFile = server.serverCertificateManager.privateKey;
130
131
  const privateKey = (0, node_opcua_crypto_1.readPrivateKey)(privateKeyFile);
131
132
  // also reread the private key
132
- _server.$$certificateChain = (0, node_opcua_crypto_1.convertPEMtoDER)(certificatePEM);
133
+ _server.$$certificateChain = (0, web_1.convertPEMtoDER)(certificatePEM);
133
134
  _server.$$privateKey = privateKey;
134
135
  // note : $$certificate will be reconstructed on demand
135
- _server.$$certificate = (0, node_opcua_crypto_1.split_der)(_server.$$certificateChain)[0];
136
+ _server.$$certificate = (0, web_1.split_der)(_server.$$certificateChain)[0];
136
137
  setTimeout(async () => {
137
138
  try {
138
139
  debugLog(chalk_1.default.yellow(" onCertificateChange => shutting down channels"));
package/dist/server/install_push_certitifate_management.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"install_push_certitifate_management.js","sourceRoot":"","sources":["../../source/server/install_push_certitifate_management.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"install_push_certitifate_management.js","sourceRoot":"","sources":["../../source/server/install_push_certitifate_management.ts"],"names":[],"mappings":";;;;;AAqNA,4FAsDC;AA3QD;;GAEG;AACH,4CAAoB;AACpB,4CAAoB;AACpB,gDAAwB;AAExB,+BAA6B;AAC7B,kDAA0B;AAG1B,yDAA2C;AAE3C,+CAM+B;AAC/B,yDAAmD;AACnD,uDAAgF;AAChF,6DAAkE;AAKlE,yFAAsF;AAGtF,4DAA4D;AAC5D,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAE,CAAC,QAAQ,CAAC;AAEjC,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;AAatD,SAAS,cAAc;IACnB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACtB,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,aAAa,GAAG,IAAA,eAAS,EAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,IAAI,CAAC,aAAc,CAAC;AAC/B,CAAC;AAED,SAAS,mBAAmB;IACxB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;AACnC,CAAC;AAED,SAAS,aAAa;IAClB,uBAAuB;IACvB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,IAAI,CAAC,YAAY,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,cAAc;IACzB,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,aAAa,GAAG,YAAE,CAAC,iBAAiB,EAAE,CAAC;IAC7C,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;QACrD,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;YAChC,SAAS;QACb,CAAC;QACD,KAAK,MAAM,SAAS,IAAI,aAAa,CAAC,aAAa,CAAE,EAAE,CAAC;YACpD,IAAI,MAAM,KAAK,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;gBAC9D,6DAA6D;gBAC7D,SAAS;YACb,CAAC;YACD,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACxC,CAAC;IACL,CAAC;IACD,OAAO,WAAW,CAAC;AACvB,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,OAAO;IAClB,QAAQ,CAAC,qCAAqC,EAAE,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAEtF,IAAY,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAChG,IAAY,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,GAAG,EAAE,CACnD,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAChF,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,IAAA,kCAAc,EAAC,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IACjF,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC3B,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAE7C,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YAClC,0CAA0C;YAC1C,uEAAuE;YAEvE,MAAM,IAAI,GAAG,MAAM,IAAA,iDAA2B,GAAE,CAAC;YACjD,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;YAE3C,MAAM,cAAc,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAW,CAAC,cAAe,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC;YAEpG,MAAM,OAAO,GAAG;gBACZ,cAAc;gBAEd,GAAG,EAAE,CAAC,IAAI,CAAC;gBACX,EAAE,EAAE,WAAW;gBAEf,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW;gBAE9C,SAAS,EAAE,IAAI,IAAI,EAAE;gBAErB,QAAQ,EAAE,GAAG,GAAG,CAAC,EAAE,YAAY;gBAE/B,KAAK;gBACL,UAAU,EAAE,eAAe;aAC9B,CAAC;YAEF,QAAQ,CAAC,kCAAkC,EAAE,OAAO,CAAC,CAAC;YACtD,MAAM,IAAI,CAAC,wBAAwB,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;QAC7E,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAE/D,IAAI,CAAC,kBAAkB,GAAG,IAAA,qBAAe,EAAC,cAAc,CAAC,CAAC;QAE1D,mFAAmF;IACvF,CAAC;AACL,CAAC;AAED,SAAS,qBAAqB;IAC1B,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;IAChG,MAAM,cAAc,GAAG,YAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAG,IAAA,qBAAe,EAAC,cAAc,CAAC,CAAC;IAC3D,MAAM,UAAU,GAAG,IAAA,wBAAkB,EAAC,kBAAkB,CAAC,CAAC;IAE1D,OAAO,kBAAkB,CAAC;AAC9B,CAAC;AAED,SAAS,eAAe;IACpB,MAAM,UAAU,GAAG,IAAA,kCAAc,EAAC,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACtE,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,0BAA0B,CAAC,MAAmB;IACzD,QAAQ,CAAC,eAAK,CAAC,MAAM,CAAC,sDAAsD,CAAC,CAAC,CAAC;IAC/E,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC;IAChC,QAAQ,CAAC,eAAK,CAAC,MAAM,CAAC,qDAAqD,CAAC,CAAC,CAAC;AAClF,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,mBAAmB,CAAC,MAAmB;IAClD,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IAElC,MAAM,OAAO,GAAG,MAAmC,CAAC;IAEpD,OAAO,CAAC,YAAY,GAAG,IAAA,kCAAc,EAAC,MAAM,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAClF,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;IACxG,MAAM,cAAc,GAAG,YAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAEhE,MAAM,cAAc,GAAG,MAAM,CAAC,wBAAwB,CAAC,UAAU,CAAC;IAClE,MAAM,UAAU,GAAG,IAAA,kCAAc,EAAC,cAAc,CAAC,CAAC;IAClD,8BAA8B;IAE9B,OAAO,CAAC,kBAAkB,GAAG,IAAA,qBAAe,EAAC,cAAc,CAAC,CAAC;IAC7D,OAAO,CAAC,YAAY,GAAG,UAAU,CAAC;IAClC,uDAAuD;IACvD,OAAO,CAAC,aAAa,GAAG,IAAA,eAAS,EAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjE,UAAU,CAAC,KAAK,IAAI,EAAE;QAClB,IAAI,CAAC;YACD,QAAQ,CAAC,eAAK,CAAC,MAAM,CAAC,gDAAgD,CAAC,CAAC,CAAC;YACzE,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAChC,QAAQ,CAAC,eAAK,CAAC,MAAM,CAAC,4CAA4C,CAAC,CAAC,CAAC;YAErE,QAAQ,CAAC,eAAK,CAAC,MAAM,CAAC,6CAA6C,CAAC,CAAC,CAAC;YACtE,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;YAC/B,QAAQ,CAAC,eAAK,CAAC,MAAM,CAAC,4CAA4C,CAAC,CAAC,CAAC;YAErE,QAAQ,CAAC,eAAK,CAAC,MAAM,CAAC,uDAAuD,CAAC,CAAC,CAAC;QACpF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,YAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,QAAQ,CAAC,sCAAsC,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YAClE,CAAC;YACD,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC5B,CAAC;IACL,CAAC,EAAE,IAAI,CAAC,CAAC;AACb,CAAC;AAKM,KAAK,UAAU,wCAAwC,CAAC,MAAmB;IAC9E,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CACX,yCAAyC;YACrC,6FAA6F,CACpG,CAAC;IACN,CAAC;IACD,MAAM,OAAO,CAAC,IAAI,CAAC,MAAmC,CAAC,CAAC;IAExD,MAAM,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,MAAM,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACjD,MAAM,CAAC,aAAa,GAAG,aAAa,CAAC;IAErC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,YAAY,GAAG,QAAe,CAAC;QACrC,YAAY,CAAC,iBAAiB,GAAG,IAAI,CAAC;QACtC,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC;QAEhC,QAAQ,CAAC,mBAAmB,GAAG,qBAAqB,CAAC;QACrD,QAAQ,CAAC,aAAa,GAAG,eAAe,CAAC;QAEzC,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,oBAAoB,EAAE,EAAE,CAAC;YAC9C,8BAA8B;YAC7B,CAAS,CAAC,gBAAgB,CAAC,mBAAmB,EAAE;gBAC7C,OAAO,QAAQ,CAAC,cAAc,EAAE,CAAC;YACrC,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,MAAM,IAAA,mEAAgC,EAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE;QAC/D,gBAAgB,EAAE,MAAM,CAAC,wBAAwB;QACjD,cAAc,EAAE,MAAM,CAAC,sBAAsB;QAE7C,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,cAAe,IAAI,YAAY;KACpE,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,qBAAqB,CAAE,CAAC;IACxH,MAAM,uBAAuB,GAAG,mBAA8C,CAAC;IAC/E,IAAA,0BAAM,EAAC,uBAAuB,CAAC,uBAAuB,CAAC,CAAC;IAExD,uBAAuB,CAAC,uBAAuB,CAAC,EAAE,CAAC,0BAA0B,EAAE,CAAC,WAAwB,EAAE,EAAE;QACxG,WAAW,CAAC,IAAI,CAAC,KAAK,IAAmB,EAAE;YACvC,QAAQ,CAAC,yCAAyC,CAAC,CAAC;YACpD,MAAM,0BAA0B,CAAC,MAAM,CAAC,CAAC;YACzC,QAAQ,CAAC,0CAA0C,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,uBAAuB,CAAC,uBAAuB,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,WAAwB,EAAE,EAAE;QAClG,WAAW,CAAC,IAAI,CAAC,KAAK,IAAmB,EAAE;YACvC,QAAQ,CAAC,mCAAmC,CAAC,CAAC;YAC9C,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAC;YAClC,QAAQ,CAAC,oCAAoC,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}
package/dist/server/promote_trust_list.js CHANGED
@@ -11,7 +11,7 @@ const node_opcua_status_code_1 = require("node-opcua-status-code");
11
11
  const node_opcua_variant_1 = require("node-opcua-variant");
12
12
  const node_opcua_data_model_1 = require("node-opcua-data-model");
13
13
  const node_opcua_file_transfer_1 = require("node-opcua-file-transfer");
14
- const node_opcua_crypto_1 = require("node-opcua-crypto");
14
+ const web_1 = require("node-opcua-crypto/web");
15
15
  const trust_list_server_1 = require("./trust_list_server");
16
16
  const tools_1 = require("./tools");
17
17
  const roles_and_permissions_1 = require("./roles_and_permissions");
@@ -49,9 +49,9 @@ async function _addCertificate(inputArguments, context) {
49
49
  }
50
50
  const certificateChain = inputArguments[0].value;
51
51
  const isTrustedCertificate = inputArguments[1].value;
52
- const certificates = (0, node_opcua_crypto_1.split_der)(certificateChain);
52
+ const certificates = (0, web_1.split_der)(certificateChain);
53
53
  // validate certificate first
54
- const r = await (0, node_opcua_crypto_1.verifyCertificateChain)(certificates);
54
+ const r = await (0, web_1.verifyCertificateChain)(certificates);
55
55
  if (r.status !== "Good") {
56
56
  warningLog("Invalid certificate ", r.status, r.reason);
57
57
  return { statusCode: node_opcua_status_code_1.StatusCodes.BadCertificateInvalid };
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_server_impl.d.ts CHANGED
@@ -4,7 +4,14 @@
4
4
  import { EventEmitter } from "events";
5
5
  import { SubjectOptions } from "node-opcua-pki";
6
6
  import { ByteString } from "node-opcua-basic-types";
7
- import { DirectoryName } from "node-opcua-crypto";
7
+ export interface DirectoryName {
8
+ stateOrProvinceName?: string;
9
+ localityName?: string;
10
+ organizationName?: string;
11
+ organizationUnitName?: string;
12
+ commonName?: string;
13
+ countryName?: string;
14
+ }
8
15
  import { NodeId } from "node-opcua-nodeid";
9
16
  import { CertificateManager } from "node-opcua-certificate-manager";
10
17
  import { StatusCode } from "node-opcua-status-code";
package/dist/server/push_certificate_manager_server_impl.js CHANGED
@@ -15,10 +15,10 @@ exports.subjectToString = subjectToString;
15
15
  const events_1 = require("events");
16
16
  const fs_1 = __importDefault(require("fs"));
17
17
  const path_1 = __importDefault(require("path"));
18
- const util_1 = require("util");
19
- const rimraf_1 = __importDefault(require("rimraf"));
18
+ const rimraf_1 = require("rimraf");
20
19
  const node_opcua_assert_1 = require("node-opcua-assert");
21
20
  const node_opcua_basic_types_1 = require("node-opcua-basic-types");
21
+ const web_1 = require("node-opcua-crypto/web");
22
22
  const node_opcua_crypto_1 = require("node-opcua-crypto");
23
23
  const node_opcua_debug_1 = require("node-opcua-debug");
24
24
  const node_opcua_nodeid_1 = require("node-opcua-nodeid");
@@ -167,7 +167,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
167
167
  };
168
168
  }
169
169
  const certificate = (0, node_opcua_crypto_1.readCertificate)(currentCertificateFilename);
170
- const e = (0, node_opcua_crypto_1.exploreCertificate)(certificate);
170
+ const e = (0, web_1.exploreCertificate)(certificate);
171
171
  subjectName = subjectToString(e.tbsCertificate.subject);
172
172
  warningLog("reusing existing certificate subjectAltName = ", subjectName);
173
173
  }
@@ -187,7 +187,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
187
187
  }
188
188
  const location = path_1.default.join(certificateManager.rootDir, "tmp");
189
189
  if (fs_1.default.existsSync(location)) {
190
- await (0, util_1.promisify)(rimraf_1.default)(path_1.default.join(location));
190
+ await rimraf_1.rimraf.rimraf(path_1.default.join(location));
191
191
  }
192
192
  if (!fs_1.default.existsSync(location)) {
193
193
  await fs_1.default.promises.mkdir(location);
@@ -205,7 +205,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
205
205
  await moveFileWithBackup(certificateManager.privateKey, destCertificateManager.privateKey);
206
206
  });
207
207
  this.addPendingTask(async () => {
208
- await (0, util_1.promisify)(rimraf_1.default)(path_1.default.join(location));
208
+ await rimraf_1.rimraf.rimraf(path_1.default.join(location));
209
209
  });
210
210
  }
211
211
  else {
@@ -221,7 +221,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
221
221
  await certificateManager.initialize();
222
222
  const csrFile = await certificateManager.createCertificateRequest(options);
223
223
  const csrPEM = await readFile(csrFile, "utf8");
224
- const certificateSigningRequest = (0, node_opcua_crypto_1.convertPEMtoDER)(csrPEM);
224
+ const certificateSigningRequest = (0, web_1.convertPEMtoDER)(csrPEM);
225
225
  this.addPendingTask(() => deleteFile(csrFile));
226
226
  return {
227
227
  certificateSigningRequest,
@@ -261,7 +261,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
261
261
  promises.push(readFile(item.filename, "utf8"));
262
262
  }
263
263
  const certificatesPEM = await Promise.all(promises);
264
- const certificates = certificatesPEM.map(node_opcua_crypto_1.convertPEMtoDER);
264
+ const certificates = certificatesPEM.map(web_1.convertPEMtoDER);
265
265
  return {
266
266
  certificates,
267
267
  statusCode: node_opcua_basic_types_1.StatusCodes.Good
@@ -287,7 +287,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
287
287
  const certificateFileDER = path_1.default.join(certFolder, `_pending_certificate${fileCounter++}.der`);
288
288
  const certificateFilePEM = path_1.default.join(certFolder, `_pending_certificate${fileCounter++}.pem`);
289
289
  await writeFile(certificateFileDER, certificate, "binary");
290
- await writeFile(certificateFilePEM, (0, node_opcua_crypto_1.toPem)(certificate, "CERTIFICATE"));
290
+ await writeFile(certificateFilePEM, (0, web_1.toPem)(certificate, "CERTIFICATE"));
291
291
  const destDER = path_1.default.join(certFolder, "certificate.der");
292
292
  const destPEM = path_1.default.join(certFolder, "certificate.pem");
293
293
  // put existing file in security by backing them up
@@ -299,8 +299,8 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
299
299
  const ownPrivateFolder = path_1.default.join(certificateManager.rootDir, "own/private");
300
300
  const privateKeyFilePEM = path_1.default.join(ownPrivateFolder, `_pending_private_key${fileCounter++}.pem`);
301
301
  if (privateKey) {
302
- const privateKey1 = (0, node_opcua_crypto_1.coercePEMorDerToPrivateKey)(privateKey);
303
- const privateKeyPEM = await (0, node_opcua_crypto_1.coercePrivateKeyPem)(privateKey1);
302
+ const privateKey1 = (0, web_1.coercePEMorDerToPrivateKey)(privateKey);
303
+ const privateKeyPEM = await (0, web_1.coercePrivateKeyPem)(privateKey1);
304
304
  await writeFile(privateKeyFilePEM, privateKeyPEM, "utf-8");
305
305
  self.addPendingTask(() => moveFileWithBackup(privateKeyFilePEM, certificateManager.privateKey));
306
306
  }
@@ -319,7 +319,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
319
319
  // The Server shall do all normal integrity checks on the Certificate and all of the issuer
320
320
  // Certificates. If errors occur the BadSecurityChecksFailed error is returned.
321
321
  // todo : all normal integrity check on the certificate
322
- const certInfo = (0, node_opcua_crypto_1.exploreCertificate)(certificate);
322
+ const certInfo = (0, web_1.exploreCertificate)(certificate);
323
323
  const now = new Date();
324
324
  if (certInfo.tbsCertificate.validity.notBefore.getTime() > now.getTime()) {
325
325
  // certificate is not yet valid
@@ -333,7 +333,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
333
333
  }
334
334
  // If the Server returns applyChangesRequired=FALSE then it is indicating that it is able to
335
335
  // satisfy the requirements specified for the ApplyChanges Method.
336
- debugLog(" updateCertificate ", (0, node_opcua_crypto_1.makeSHA1Thumbprint)(certificate).toString("hex"));
336
+ debugLog(" updateCertificate ", (0, web_1.makeSHA1Thumbprint)(certificate).toString("hex"));
337
337
  if (!privateKeyFormat || !privateKey) {
338
338
  // first of all we need to find the future private key;
339
339
  // this one may have been created during the creation of the certificate signing request
@@ -342,11 +342,11 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
342
342
  // The Server shall report an error if the public key does not match the existing Certificate and
343
343
  // the privateKey was not provided.
344
344
  // privateKey is not provided, so check that the public key matches the existing certificate
345
- if (!(0, node_opcua_crypto_1.certificateMatchesPrivateKey)(certificate, privateKey1)) {
345
+ if (!(0, web_1.certificateMatchesPrivateKey)(certificate, privateKey1)) {
346
346
  // certificate doesn't match privateKey
347
347
  warningLog("certificate doesn't match privateKey");
348
348
  /* debug code */
349
- const certificatePEM = (0, node_opcua_crypto_1.toPem)(certificate, "CERTIFICATE");
349
+ const certificatePEM = (0, web_1.toPem)(certificate, "CERTIFICATE");
350
350
  //xx const privateKeyPEM = toPem(privateKeyDER, "RSA PRIVATE KEY");
351
351
  //xx const initialBuffer = Buffer.from("Lorem Ipsum");
352
352
  //xx const encryptedBuffer = publicEncrypt_long(initialBuffer, certificatePEM, 256, 11);
@@ -381,13 +381,13 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
381
381
  (0, node_opcua_assert_1.assert)(privateKeyFormat === "PEM");
382
382
  privateKey = privateKey.toString("utf-8");
383
383
  }
384
- privateKey1 = (0, node_opcua_crypto_1.coercePEMorDerToPrivateKey)(privateKey);
384
+ privateKey1 = (0, web_1.coercePEMorDerToPrivateKey)(privateKey);
385
385
  }
386
386
  if (!privateKey1) {
387
387
  return { statusCode: node_opcua_basic_types_1.StatusCodes.BadNotSupported };
388
388
  }
389
389
  // privateKey is provided, so check that the public key matches provided private key
390
- if (!(0, node_opcua_crypto_1.certificateMatchesPrivateKey)(certificate, privateKey1)) {
390
+ if (!(0, web_1.certificateMatchesPrivateKey)(certificate, privateKey1)) {
391
391
  // certificate doesn't match privateKey
392
392
  warningLog("certificate doesn't match privateKey");
393
393
  return { statusCode: node_opcua_basic_types_1.StatusCodes.BadSecurityChecksFailed };
package/dist/server/push_certificate_manager_server_impl.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"push_certificate_manager_server_impl.js","sourceRoot":"","sources":["../../source/server/push_certificate_manager_server_impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"push_certificate_manager_server_impl.js","sourceRoot":"","sources":["../../source/server/push_certificate_manager_server_impl.ts"],"names":[],"mappings":"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"}
package/dist/trust_list_impl.d.ts CHANGED
@@ -0,0 +1 @@
1
+ export {};
package/dist/trust_list_impl.js CHANGED
@@ -4,6 +4,7 @@
4
4
  // */
5
5
  // import { StatusCode, StatusCodes } from "node-opcua-status-code";
6
6
  // import { ITrustList } from "./trust_list";
7
+ Object.defineProperty(exports, "__esModule", { value: true });
7
8
  // export class TrustList implements ITrustList {
8
9
  // public async closeAndUpdate(
9
10
  // applyChangesRequired: boolean
package/dist/trust_list_impl.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"trust_list_impl.js","sourceRoot":"","sources":["../source/trust_list_impl.ts"],"names":[],"mappings":";AAAA,MAAM;AACN,6CAA6C;AAC7C,MAAM;AACN,oEAAoE;AACpE,6CAA6C;AAE7C,iDAAiD;AAEjD,iCAAiC;AACjC,oCAAoC;AACpC,0BAA0B;AAE1B,oBAAoB;AACpB,MAAM;AAEN,iCAAiC;AACjC,2BAA2B;AAC3B,oCAAoC;AACpC,6BAA6B;AAC7B,4CAA4C;AAC5C,MAAM;AAEN,oCAAoC;AACpC,0BAA0B;AAC1B,oCAAoC;AACpC,6BAA6B;AAC7B,4CAA4C;AAC5C,MAAM;AACN,IAAI"}
1
+ {"version":3,"file":"trust_list_impl.js","sourceRoot":"","sources":["../source/trust_list_impl.ts"],"names":[],"mappings":";AAAA,MAAM;AACN,6CAA6C;AAC7C,MAAM;AACN,oEAAoE;AACpE,6CAA6C;;AAE7C,iDAAiD;AAEjD,iCAAiC;AACjC,oCAAoC;AACpC,0BAA0B;AAE1B,oBAAoB;AACpB,MAAM;AAEN,iCAAiC;AACjC,2BAA2B;AAC3B,oCAAoC;AACpC,6BAA6B;AAC7B,4CAA4C;AAC5C,MAAM;AAEN,oCAAoC;AACpC,0BAA0B;AAC1B,oCAAoC;AACpC,6BAA6B;AAC7B,4CAA4C;AAC5C,MAAM;AACN,IAAI"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-opcua-server-configuration",
3
- "version": "2.132.0",
3
+ "version": "2.134.0",
4
4
  "description": "pure nodejs OPCUA SDK - module server-configuration",
5
5
  "scripts": {
6
6
  "build": "tsc -b",
@@ -14,35 +14,35 @@
14
14
  "@types/bcryptjs": "^2.4.6",
15
15
  "bcryptjs": "^2.4.3",
16
16
  "chalk": "4.1.2",
17
- "memfs": "^4.11.1",
18
- "node-opcua-address-space": "2.132.0",
19
- "node-opcua-address-space-base": "2.132.0",
17
+ "memfs": "^4.14.0",
18
+ "node-opcua-address-space": "2.134.0",
19
+ "node-opcua-address-space-base": "2.134.0",
20
20
  "node-opcua-assert": "2.120.0",
21
- "node-opcua-basic-types": "2.132.0",
22
- "node-opcua-binary-stream": "2.128.0",
23
- "node-opcua-certificate-manager": "2.131.0",
24
- "node-opcua-client": "2.132.0",
25
- "node-opcua-common": "2.132.0",
21
+ "node-opcua-basic-types": "2.134.0",
22
+ "node-opcua-binary-stream": "2.133.0",
23
+ "node-opcua-certificate-manager": "2.134.0",
24
+ "node-opcua-client": "2.134.0",
25
+ "node-opcua-common": "2.134.0",
26
26
  "node-opcua-constants": "2.125.0",
27
- "node-opcua-crypto": "4.9.4",
28
- "node-opcua-data-model": "2.132.0",
29
- "node-opcua-debug": "2.128.0",
30
- "node-opcua-file-transfer": "2.132.0",
27
+ "node-opcua-crypto": "4.12.0",
28
+ "node-opcua-data-model": "2.134.0",
29
+ "node-opcua-debug": "2.133.0",
30
+ "node-opcua-file-transfer": "2.134.0",
31
31
  "node-opcua-hostname": "2.128.0",
32
- "node-opcua-nodeid": "2.128.0",
33
- "node-opcua-pki": "4.13.1",
34
- "node-opcua-pseudo-session": "2.132.0",
35
- "node-opcua-secure-channel": "2.132.0",
36
- "node-opcua-server": "2.132.0",
37
- "node-opcua-service-translate-browse-path": "2.132.0",
38
- "node-opcua-status-code": "2.128.0",
39
- "node-opcua-types": "2.132.0",
40
- "node-opcua-variant": "2.132.0",
41
- "rimraf": "3.0.2"
32
+ "node-opcua-nodeid": "2.133.0",
33
+ "node-opcua-pki": "4.16.0",
34
+ "node-opcua-pseudo-session": "2.134.0",
35
+ "node-opcua-secure-channel": "2.134.0",
36
+ "node-opcua-server": "2.134.0",
37
+ "node-opcua-service-translate-browse-path": "2.134.0",
38
+ "node-opcua-status-code": "2.133.0",
39
+ "node-opcua-types": "2.134.0",
40
+ "node-opcua-variant": "2.134.0",
41
+ "rimraf": "6.0.1"
42
42
  },
43
43
  "devDependencies": {
44
- "node-opcua-data-value": "2.132.0",
45
- "node-opcua-leak-detector": "2.128.0",
44
+ "node-opcua-data-value": "2.134.0",
45
+ "node-opcua-leak-detector": "2.133.0",
46
46
  "node-opcua-nodesets": "2.121.0"
47
47
  },
48
48
  "author": "Etienne Rossignon",
@@ -60,7 +60,7 @@
60
60
  "internet of things"
61
61
  ],
62
62
  "homepage": "http://node-opcua.github.io/",
63
- "gitHead": "5fab0f1eac0e59abf94bab9034035aec44890456",
63
+ "gitHead": "ccb34926a3c195f6a7e66fca58a2f101858e78be",
64
64
  "files": [
65
65
  "dist",
66
66
  "source"
package/source/clientTools/push_certificate_management_client.ts CHANGED
@@ -9,7 +9,7 @@ import { DataType, VariantArrayType, VariantLike } from "node-opcua-variant";
9
9
  import { ClientFile, OpenFileMode } from "node-opcua-file-transfer";
10
10
  import { AttributeIds, QualifiedNameLike, coerceQualifiedName } from "node-opcua-data-model";
11
11
  import { makeBrowsePath } from "node-opcua-service-translate-browse-path";
12
- import { Certificate } from "node-opcua-crypto";
12
+ import { Certificate } from "node-opcua-crypto/web";
13
13
  import { TrustListDataType } from "node-opcua-types";
14
14
  import { BinaryStream } from "node-opcua-binary-stream";
15
15
 
package/source/server/install_push_certitifate_management.ts CHANGED
@@ -16,9 +16,9 @@ import {
16
16
  convertPEMtoDER,
17
17
  makeSHA1Thumbprint,
18
18
  PrivateKey,
19
- readPrivateKey,
20
19
  split_der
21
- } from "node-opcua-crypto";
20
+ } from "node-opcua-crypto/web";
21
+ import { readPrivateKey } from "node-opcua-crypto";
22
22
  import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
23
23
  import { getFullyQualifiedDomainName } from "node-opcua-hostname";
24
24
  import { ICertificateKeyPairProviderPriv } from "node-opcua-common";
package/source/server/promote_trust_list.ts CHANGED
@@ -21,7 +21,7 @@ import { AccessRestrictionsFlag } from "node-opcua-data-model";
21
21
  import { CertificateManager } from "node-opcua-pki";
22
22
  import { AbstractFs, installFileType, OpenFileMode } from "node-opcua-file-transfer";
23
23
  import { OPCUACertificateManager } from "node-opcua-certificate-manager";
24
- import { split_der, verifyCertificateChain } from "node-opcua-crypto";
24
+ import { split_der, verifyCertificateChain } from "node-opcua-crypto/web";
25
25
 
26
26
  import { TrustListMasks, writeTrustList } from "./trust_list_server";
27
27
 
package/source/server/push_certificate_manager_server_impl.ts CHANGED
@@ -4,9 +4,7 @@
4
4
  import { EventEmitter } from "events";
5
5
  import fs from "fs";
6
6
  import path from "path";
7
- import { promisify } from "util";
8
-
9
- import rimraf from "rimraf";
7
+ import { rimraf } from "rimraf";
10
8
  import { SubjectOptions } from "node-opcua-pki";
11
9
  import { assert } from "node-opcua-assert";
12
10
  import { ByteString, StatusCodes } from "node-opcua-basic-types";
@@ -14,16 +12,24 @@ import {
14
12
  convertPEMtoDER,
15
13
  exploreCertificate,
16
14
  makeSHA1Thumbprint,
17
- readPrivateKey,
18
15
  toPem,
19
16
  PrivateKey,
20
17
  certificateMatchesPrivateKey,
21
- readCertificate,
22
18
  coercePEMorDerToPrivateKey,
23
- coercePrivateKeyPem
24
- } from "node-opcua-crypto";
25
-
26
- import { DirectoryName } from "node-opcua-crypto";
19
+ coercePrivateKeyPem,
20
+ } from "node-opcua-crypto/web";
21
+
22
+ import {readPrivateKey, readCertificate, asn1 } from "node-opcua-crypto";
23
+
24
+ // fixme: use the one from node-opcua-crypto
25
+ export interface DirectoryName {
26
+ stateOrProvinceName?: string;
27
+ localityName?: string;
28
+ organizationName?: string;
29
+ organizationUnitName?: string;
30
+ commonName?: string;
31
+ countryName?: string;
32
+ }
27
33
 
28
34
  import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
29
35
  import { NodeId, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
@@ -118,6 +124,7 @@ export async function moveFileWithBackup(source: string, dest: string): Promise<
118
124
  await moveFile(source, dest);
119
125
  }
120
126
 
127
+
121
128
  export function subjectToString(subject: SubjectOptions & DirectoryName): string {
122
129
  let s = "";
123
130
  subject.commonName && (s += `/CN=${subject.commonName}`);
@@ -259,7 +266,7 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
259
266
 
260
267
  const location = path.join(certificateManager.rootDir, "tmp");
261
268
  if (fs.existsSync(location)) {
262
- await promisify(rimraf)(path.join(location));
269
+ await rimraf.rimraf(path.join(location));
263
270
  }
264
271
  if (!fs.existsSync(location)) {
265
272
  await fs.promises.mkdir(location);
@@ -280,7 +287,7 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
280
287
  await moveFileWithBackup(certificateManager!.privateKey, destCertificateManager.privateKey);
281
288
  });
282
289
  this.addPendingTask(async () => {
283
- await promisify(rimraf)(path.join(location));
290
+ await rimraf.rimraf(path.join(location));
284
291
  });
285
292
  } else {
286
293
  // The Server uses its existing Private Key