node-opcua-server-configuration 2.85.0 → 2.86.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.
- package/bin/configurator.ts +4 -4
- package/dist/clientTools/push_certificate_management_client.d.ts +2 -2
- package/dist/clientTools/push_certificate_management_client.js +8 -8
- package/dist/clientTools/push_certificate_management_client.js.map +1 -1
- package/dist/server/install_push_certitifate_management.d.ts +2 -2
- package/dist/server/install_push_certitifate_management.js +12 -10
- package/dist/server/install_push_certitifate_management.js.map +1 -1
- package/dist/server/push_certificate_manager_helpers.js +3 -3
- package/dist/server/push_certificate_manager_helpers.js.map +1 -1
- package/dist/server/push_certificate_manager_server_impl.d.ts +0 -2
- package/dist/server/push_certificate_manager_server_impl.js +26 -30
- package/dist/server/push_certificate_manager_server_impl.js.map +1 -1
- package/package.json +24 -24
- package/source/clientTools/push_certificate_management_client.ts +12 -11
- package/source/server/install_push_certitifate_management.ts +17 -15
- package/source/server/push_certificate_manager_helpers.ts +3 -3
- package/source/server/push_certificate_manager_server_impl.ts +46 -44
package/bin/configurator.ts
CHANGED
|
@@ -86,7 +86,7 @@ async function dumpUserTokenTrustedCertificates(session: IBasicSession) {
|
|
|
86
86
|
async function getRejectedList(session: IBasicSession) {
|
|
87
87
|
const s = new ClientPushCertificateManagement(session);
|
|
88
88
|
const rejectedList = await s.getRejectedList();
|
|
89
|
-
if (rejectedList.statusCode
|
|
89
|
+
if (rejectedList.statusCode.isNotGood()) {
|
|
90
90
|
throw new Error(rejectedList.statusCode.name);
|
|
91
91
|
}
|
|
92
92
|
|
|
@@ -157,7 +157,7 @@ async function replaceServerCertificate(session: IBasicSession, caAuthority: Cer
|
|
|
157
157
|
const s = new ClientPushCertificateManagement(session);
|
|
158
158
|
const ag = await s.getApplicationGroup();
|
|
159
159
|
const csr = await s.createSigningRequest("DefaultApplicationGroup", CertificateType.RsaSha256Application, "CN=toto", false);
|
|
160
|
-
if (csr.statusCode
|
|
160
|
+
if (csr.statusCode.isNotGood()) {
|
|
161
161
|
console.log("Signing Request = ", csr.statusCode.toString());
|
|
162
162
|
throw new Error(csr.statusCode.name);
|
|
163
163
|
}
|
|
@@ -195,13 +195,13 @@ async function replaceServerCertificate(session: IBasicSession, caAuthority: Cer
|
|
|
195
195
|
certificates[1],
|
|
196
196
|
crl
|
|
197
197
|
]);
|
|
198
|
-
if (result.statusCode
|
|
198
|
+
if (result.statusCode.isNotGood()) {
|
|
199
199
|
throw new Error("updateCertificate failed " + csr.statusCode.name);
|
|
200
200
|
}
|
|
201
201
|
if (result.applyChangesRequired) {
|
|
202
202
|
console.log("Applying changes");
|
|
203
203
|
const statusCode = await s.applyChanges();
|
|
204
|
-
if (statusCode
|
|
204
|
+
if (statusCode.isNotGood()) {
|
|
205
205
|
throw new Error("applyChanged failed " + csr.statusCode.name);
|
|
206
206
|
}
|
|
207
207
|
}
|
|
@@ -8,7 +8,7 @@ import { IBasicSession } from "node-opcua-pseudo-session";
|
|
|
8
8
|
import { StatusCode } from "node-opcua-status-code";
|
|
9
9
|
import { ClientFile } from "node-opcua-file-transfer";
|
|
10
10
|
import { QualifiedNameLike } from "node-opcua-data-model";
|
|
11
|
-
import { Certificate } from "node-opcua-crypto";
|
|
11
|
+
import { Certificate, PrivateKey } from "node-opcua-crypto";
|
|
12
12
|
import { TrustListDataType } from "node-opcua-types";
|
|
13
13
|
import { CreateSigningRequestResult, GetRejectedListResult, PushCertificateManager, UpdateCertificateResult } from "../push_certificate_manager";
|
|
14
14
|
import { ITrustList } from "../trust_list";
|
|
@@ -141,7 +141,7 @@ export declare class ClientPushCertificateManagement implements PushCertificateM
|
|
|
141
141
|
* @param privateKey - The Private Key encoded in the privateKeyFormat
|
|
142
142
|
*
|
|
143
143
|
*/
|
|
144
|
-
updateCertificate(certificateGroupId: NodeId | string, certificateTypeId: NodeId | string, certificate: Buffer, issuerCertificates: Buffer[], privateKeyFormat: string, privateKey: Buffer): Promise<UpdateCertificateResult>;
|
|
144
|
+
updateCertificate(certificateGroupId: NodeId | string, certificateTypeId: NodeId | string, certificate: Buffer, issuerCertificates: Buffer[], privateKeyFormat: string, privateKey: Buffer | string | PrivateKey): Promise<UpdateCertificateResult>;
|
|
145
145
|
/**
|
|
146
146
|
* ApplyChanges tells the Server to apply any security changes.
|
|
147
147
|
* This Method should only be called if a previous call to a Method that changed the
|
|
@@ -105,7 +105,7 @@ class TrustListClient extends node_opcua_file_transfer_1.ClientFile {
|
|
|
105
105
|
objectId: this.nodeId
|
|
106
106
|
};
|
|
107
107
|
const callMethodResult = yield this.session.call(methodToCall);
|
|
108
|
-
if (callMethodResult.statusCode
|
|
108
|
+
if (callMethodResult.statusCode.isNotGood()) {
|
|
109
109
|
throw new Error(callMethodResult.statusCode.name);
|
|
110
110
|
}
|
|
111
111
|
this.fileHandle = callMethodResult.outputArguments[0].value;
|
|
@@ -131,7 +131,7 @@ class TrustListClient extends node_opcua_file_transfer_1.ClientFile {
|
|
|
131
131
|
objectId: this.nodeId
|
|
132
132
|
};
|
|
133
133
|
const callMethodResult = yield this.session.call(methodToCall);
|
|
134
|
-
if (callMethodResult.statusCode
|
|
134
|
+
if (callMethodResult.statusCode.isNotGood()) {
|
|
135
135
|
throw new Error(callMethodResult.statusCode.name);
|
|
136
136
|
}
|
|
137
137
|
return callMethodResult.outputArguments[0].value;
|
|
@@ -216,12 +216,12 @@ class CertificateGroup {
|
|
|
216
216
|
getCertificateTypes() {
|
|
217
217
|
return __awaiter(this, void 0, void 0, function* () {
|
|
218
218
|
const browsePathResult = yield this.session.translateBrowsePath((0, node_opcua_service_translate_browse_path_1.makeBrowsePath)(this.nodeId, "/CertificateTypes"));
|
|
219
|
-
if (browsePathResult.statusCode
|
|
219
|
+
if (browsePathResult.statusCode.isNotGood()) {
|
|
220
220
|
throw new Error(browsePathResult.statusCode.name);
|
|
221
221
|
}
|
|
222
222
|
const certificateTypesNodeId = browsePathResult.targets[0].targetId;
|
|
223
223
|
const dataValue = yield this.session.read({ nodeId: certificateTypesNodeId, attributeId: node_opcua_data_model_1.AttributeIds.Value });
|
|
224
|
-
if (dataValue.statusCode
|
|
224
|
+
if (dataValue.statusCode.isNotGood()) {
|
|
225
225
|
throw new Error(browsePathResult.statusCode.name);
|
|
226
226
|
}
|
|
227
227
|
return dataValue.value.value;
|
|
@@ -230,7 +230,7 @@ class CertificateGroup {
|
|
|
230
230
|
getTrustList() {
|
|
231
231
|
return __awaiter(this, void 0, void 0, function* () {
|
|
232
232
|
const browsePathResult = yield this.session.translateBrowsePath((0, node_opcua_service_translate_browse_path_1.makeBrowsePath)(this.nodeId, "/TrustList"));
|
|
233
|
-
if (browsePathResult.statusCode
|
|
233
|
+
if (browsePathResult.statusCode.isNotGood()) {
|
|
234
234
|
throw new Error(browsePathResult.statusCode.name);
|
|
235
235
|
}
|
|
236
236
|
const trustListNodeId = browsePathResult.targets[0].targetId;
|
|
@@ -297,7 +297,7 @@ class ClientPushCertificateManagement {
|
|
|
297
297
|
objectId: serverConfigurationNodeId
|
|
298
298
|
};
|
|
299
299
|
const callMethodResult = yield this.session.call(methodToCall);
|
|
300
|
-
if (callMethodResult.statusCode
|
|
300
|
+
if (callMethodResult.statusCode.isGood()) {
|
|
301
301
|
// xx console.log(callMethodResult.toString());
|
|
302
302
|
return {
|
|
303
303
|
certificateSigningRequest: callMethodResult.outputArguments[0].value,
|
|
@@ -329,7 +329,7 @@ class ClientPushCertificateManagement {
|
|
|
329
329
|
objectId: serverConfigurationNodeId
|
|
330
330
|
};
|
|
331
331
|
const callMethodResult = yield this.session.call(methodToCall);
|
|
332
|
-
if (callMethodResult.statusCode
|
|
332
|
+
if (callMethodResult.statusCode.isGood()) {
|
|
333
333
|
if (callMethodResult.outputArguments[0].dataType !== node_opcua_variant_1.DataType.ByteString) {
|
|
334
334
|
return { statusCode: node_opcua_status_code_1.StatusCodes.BadInvalidArgument };
|
|
335
335
|
}
|
|
@@ -361,7 +361,7 @@ class ClientPushCertificateManagement {
|
|
|
361
361
|
objectId: serverConfigurationNodeId
|
|
362
362
|
};
|
|
363
363
|
const callMethodResult = yield this.session.call(methodToCall);
|
|
364
|
-
if (callMethodResult.statusCode
|
|
364
|
+
if (callMethodResult.statusCode.isGood()) {
|
|
365
365
|
if (!callMethodResult.outputArguments || callMethodResult.outputArguments.length !== 1) {
|
|
366
366
|
return {
|
|
367
367
|
statusCode: node_opcua_status_code_1.StatusCodes.BadInternalError
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push_certificate_management_client.js","sourceRoot":"","sources":["../../source/clientTools/push_certificate_management_client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"push_certificate_management_client.js","sourceRoot":"","sources":["../../source/clientTools/push_certificate_management_client.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|
|
3
|
+
import { Certificate, PrivateKey } from "node-opcua-crypto";
|
|
4
4
|
import { ICertificateKeyPairProviderPriv } from "node-opcua-common";
|
|
5
5
|
import { OPCUAServer } from "node-opcua-server";
|
|
6
6
|
import { ApplicationDescriptionOptions } from "node-opcua-types";
|
|
@@ -11,7 +11,7 @@ export interface OPCUAServerPartial extends ICertificateKeyPairProviderPriv {
|
|
|
11
11
|
certificateFile: string;
|
|
12
12
|
$$certificate: null | Certificate;
|
|
13
13
|
$$certificateChain: null | Certificate;
|
|
14
|
-
$$
|
|
14
|
+
$$privateKey: null | PrivateKey;
|
|
15
15
|
engine: {
|
|
16
16
|
addressSpace?: AddressSpace;
|
|
17
17
|
};
|
|
@@ -16,6 +16,7 @@ exports.installPushCertificateManagementOnServer = void 0;
|
|
|
16
16
|
const fs = require("fs");
|
|
17
17
|
const os = require("os");
|
|
18
18
|
const path = require("path");
|
|
19
|
+
const crypto_1 = require("crypto");
|
|
19
20
|
const chalk = require("chalk");
|
|
20
21
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
21
22
|
const node_opcua_crypto_1 = require("node-opcua-crypto");
|
|
@@ -41,10 +42,11 @@ function getCertificateChain() {
|
|
|
41
42
|
return this.$$certificateChain;
|
|
42
43
|
}
|
|
43
44
|
function getPrivateKey() {
|
|
44
|
-
|
|
45
|
-
|
|
45
|
+
// istanbul ignore next
|
|
46
|
+
if (!this.$$privateKey) {
|
|
47
|
+
throw new Error("internal Error. cannot find $$privateKey");
|
|
46
48
|
}
|
|
47
|
-
return this.$$
|
|
49
|
+
return this.$$privateKey;
|
|
48
50
|
}
|
|
49
51
|
function getIpAddresses() {
|
|
50
52
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -73,8 +75,8 @@ function install() {
|
|
|
73
75
|
debugLog("install push certificate management", this.serverCertificateManager.rootDir);
|
|
74
76
|
this.__defineGetter__("privateKeyFile", () => this.serverCertificateManager.privateKey);
|
|
75
77
|
this.__defineGetter__("certificateFile", () => path.join(this.serverCertificateManager.rootDir, "own/certs/certificate.pem"));
|
|
76
|
-
if (!this.$$
|
|
77
|
-
this.$$
|
|
78
|
+
if (!this.$$privateKey) {
|
|
79
|
+
this.$$privateKey = (0, crypto_1.createPrivateKey)(yield readFile(this.serverCertificateManager.privateKey, "utf8"));
|
|
78
80
|
}
|
|
79
81
|
if (!this.$$certificateChain) {
|
|
80
82
|
const certificateFile = this.certificateFile;
|
|
@@ -111,8 +113,8 @@ function getCertificateChainEP() {
|
|
|
111
113
|
return $$certificateChain;
|
|
112
114
|
}
|
|
113
115
|
function getPrivateKeyEP() {
|
|
114
|
-
const $$
|
|
115
|
-
return $$
|
|
116
|
+
const $$privateKey = (0, crypto_1.createPrivateKey)(fs.readFileSync(this.certificateManager.privateKey, "utf8"));
|
|
117
|
+
return $$privateKey;
|
|
116
118
|
}
|
|
117
119
|
function onCertificateAboutToChange(server) {
|
|
118
120
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -134,14 +136,14 @@ function onCertificateChange(server) {
|
|
|
134
136
|
return __awaiter(this, void 0, void 0, function* () {
|
|
135
137
|
debugLog("on CertificateChanged");
|
|
136
138
|
const _server = server;
|
|
137
|
-
_server.$$
|
|
139
|
+
_server.$$privateKey = (0, crypto_1.createPrivateKey)(fs.readFileSync(server.serverCertificateManager.privateKey, "utf8"));
|
|
138
140
|
const certificateFile = path.join(server.serverCertificateManager.rootDir, "own/certs/certificate.pem");
|
|
139
141
|
const certificatePEM = fs.readFileSync(certificateFile, "utf8");
|
|
140
142
|
const privateKeyFile = server.serverCertificateManager.privateKey;
|
|
141
|
-
const
|
|
143
|
+
const privateKey = (0, crypto_1.createPrivateKey)(fs.readFileSync(privateKeyFile, "utf8"));
|
|
142
144
|
// also reread the private key
|
|
143
145
|
_server.$$certificateChain = (0, node_opcua_crypto_1.convertPEMtoDER)(certificatePEM);
|
|
144
|
-
_server.$$
|
|
146
|
+
_server.$$privateKey = privateKey;
|
|
145
147
|
// note : $$certificate will be reconstructed on demand
|
|
146
148
|
_server.$$certificate = (0, node_opcua_crypto_1.split_der)(_server.$$certificateChain)[0];
|
|
147
149
|
setTimeout(() => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install_push_certitifate_management.js","sourceRoot":"","sources":["../../source/server/install_push_certitifate_management.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;GAEG;AACH,yBAAyB;AACzB,yBAAyB;AACzB,6BAA6B;
|
|
1
|
+
{"version":3,"file":"install_push_certitifate_management.js","sourceRoot":"","sources":["../../source/server/install_push_certitifate_management.ts"],"names":[],"mappings":"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"}
|
|
@@ -97,7 +97,7 @@ function _createSigningRequest(inputArguments, context) {
|
|
|
97
97
|
return { statusCode: node_opcua_status_code_1.StatusCodes.BadNotImplemented };
|
|
98
98
|
}
|
|
99
99
|
const result = yield pushCertificateManager.createSigningRequest(certificateGroupId, certificateTypeId, subjectName, regeneratePrivateKey, nonce);
|
|
100
|
-
if (result.statusCode
|
|
100
|
+
if (result.statusCode.isNotGood()) {
|
|
101
101
|
return { statusCode: result.statusCode };
|
|
102
102
|
}
|
|
103
103
|
const callMethodResult = {
|
|
@@ -138,7 +138,7 @@ function _updateCertificate(inputArguments, context) {
|
|
|
138
138
|
}
|
|
139
139
|
const result = yield pushCertificateManager.updateCertificate(certificateGroupId, certificateTypeId, certificate, issuerCertificates, privateKeyFormat, privateKey);
|
|
140
140
|
// todo raise a CertificateUpdatedAuditEventType
|
|
141
|
-
if (result.statusCode
|
|
141
|
+
if (result.statusCode.isNotGood()) {
|
|
142
142
|
return { statusCode: result.statusCode };
|
|
143
143
|
}
|
|
144
144
|
const callMethodResult = {
|
|
@@ -166,7 +166,7 @@ function _getRejectedList(inputArguments, context) {
|
|
|
166
166
|
return { statusCode: node_opcua_status_code_1.StatusCodes.BadNotImplemented };
|
|
167
167
|
}
|
|
168
168
|
const result = yield pushCertificateManager.getRejectedList();
|
|
169
|
-
if (result.statusCode
|
|
169
|
+
if (result.statusCode.isNotGood()) {
|
|
170
170
|
return { statusCode: result.statusCode };
|
|
171
171
|
}
|
|
172
172
|
return {
|
|
@@ -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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"}
|
|
@@ -6,13 +6,11 @@
|
|
|
6
6
|
import { EventEmitter } from "events";
|
|
7
7
|
import { SubjectOptions } from "node-opcua-pki";
|
|
8
8
|
import { ByteString } from "node-opcua-basic-types";
|
|
9
|
-
import { Certificate, PrivateKey } from "node-opcua-crypto";
|
|
10
9
|
import { DirectoryName } from "node-opcua-crypto/dist/source/asn1";
|
|
11
10
|
import { NodeId } from "node-opcua-nodeid";
|
|
12
11
|
import { CertificateManager } from "node-opcua-certificate-manager";
|
|
13
12
|
import { StatusCode } from "node-opcua-status-code";
|
|
14
13
|
import { CreateSigningRequestResult, GetRejectedListResult, PushCertificateManager, UpdateCertificateResult } from "../push_certificate_manager";
|
|
15
|
-
export declare function certificateMatchesPrivateKey(certificate: Certificate, privateKey: PrivateKey): boolean;
|
|
16
14
|
export interface PushCertificateManagerServerOptions {
|
|
17
15
|
applicationGroup?: CertificateManager;
|
|
18
16
|
userTokenGroup?: CertificateManager;
|
|
@@ -16,13 +16,14 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
|
16
16
|
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
17
17
|
};
|
|
18
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
-
exports.PushCertificateManagerServerImpl = exports.subjectToString = exports.moveFileWithBackup = exports.moveFile = exports.deleteFile = exports.copyFile =
|
|
19
|
+
exports.PushCertificateManagerServerImpl = exports.subjectToString = exports.moveFileWithBackup = exports.moveFile = exports.deleteFile = exports.copyFile = void 0;
|
|
20
20
|
/**
|
|
21
21
|
* @module node-opcua-server-configuration-server
|
|
22
22
|
*/
|
|
23
23
|
const events_1 = require("events");
|
|
24
24
|
const fs = require("fs");
|
|
25
25
|
const path = require("path");
|
|
26
|
+
const crypto_1 = require("crypto");
|
|
26
27
|
const util_1 = require("util");
|
|
27
28
|
const rimraf = require("rimraf");
|
|
28
29
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
@@ -40,23 +41,6 @@ const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("ServerConfiguration");
|
|
|
40
41
|
const defaultApplicationGroup = (0, node_opcua_nodeid_1.resolveNodeId)("ServerConfiguration_CertificateGroups_DefaultApplicationGroup");
|
|
41
42
|
const defaultHttpsGroup = (0, node_opcua_nodeid_1.resolveNodeId)("ServerConfiguration_CertificateGroups_DefaultHttpsGroup");
|
|
42
43
|
const defaultUserTokenGroup = (0, node_opcua_nodeid_1.resolveNodeId)("ServerConfiguration_CertificateGroups_DefaultUserTokenGroup");
|
|
43
|
-
/**
|
|
44
|
-
* check that the given certificate matches the given private key
|
|
45
|
-
* @param certificate
|
|
46
|
-
* @param privateKey
|
|
47
|
-
*/
|
|
48
|
-
function certificateMatchesPrivateKeyPEM(certificate, privateKey) {
|
|
49
|
-
const initialBuffer = Buffer.from("Lorem Ipsum");
|
|
50
|
-
const encryptedBuffer = (0, node_opcua_crypto_1.publicEncrypt_long)(initialBuffer, certificate, 256, 11);
|
|
51
|
-
const decryptedBuffer = (0, node_opcua_crypto_1.privateDecrypt_long)(encryptedBuffer, privateKey, 256);
|
|
52
|
-
return initialBuffer.toString("utf-8") === decryptedBuffer.toString("utf-8");
|
|
53
|
-
}
|
|
54
|
-
function certificateMatchesPrivateKey(certificate, privateKey) {
|
|
55
|
-
const certificatePEM = (0, node_opcua_crypto_1.toPem)(certificate, "CERTIFICATE");
|
|
56
|
-
const privateKeyPEM = (0, node_opcua_crypto_1.toPem)(privateKey, "RSA PRIVATE KEY");
|
|
57
|
-
return certificateMatchesPrivateKeyPEM(certificatePEM, privateKeyPEM);
|
|
58
|
-
}
|
|
59
|
-
exports.certificateMatchesPrivateKey = certificateMatchesPrivateKey;
|
|
60
44
|
function findCertificateGroupName(certificateGroupNodeId) {
|
|
61
45
|
if (typeof certificateGroupNodeId === "string") {
|
|
62
46
|
return certificateGroupNodeId;
|
|
@@ -239,7 +223,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
|
|
|
239
223
|
const keySize = certificateManager.keySize; // because keySize is private !
|
|
240
224
|
certificateManager = new node_opcua_certificate_manager_1.CertificateManager({
|
|
241
225
|
keySize,
|
|
242
|
-
location
|
|
226
|
+
location
|
|
243
227
|
});
|
|
244
228
|
debugLog("generating a new private key ...");
|
|
245
229
|
yield certificateManager.initialize();
|
|
@@ -315,6 +299,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
|
|
|
315
299
|
};
|
|
316
300
|
});
|
|
317
301
|
}
|
|
302
|
+
// eslint-disable-next-line max-statements
|
|
318
303
|
updateCertificate(certificateGroupId, certificateTypeId, certificate, issuerCertificates, privateKeyFormat, privateKey) {
|
|
319
304
|
return __awaiter(this, void 0, void 0, function* () {
|
|
320
305
|
// Result Code Description
|
|
@@ -347,7 +332,6 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
|
|
|
347
332
|
function preInstallPrivateKey(self) {
|
|
348
333
|
return __awaiter(this, void 0, void 0, function* () {
|
|
349
334
|
(0, node_opcua_assert_1.assert)(privateKeyFormat.toUpperCase() === "PEM");
|
|
350
|
-
(0, node_opcua_assert_1.assert)(privateKey instanceof Buffer); // could be DER or PEM in a buffer ?
|
|
351
335
|
const ownPrivateFolder = path.join(certificateManager.rootDir, "own/private");
|
|
352
336
|
const privateKeyFilePEM = path.join(ownPrivateFolder, `_pending_private_key${fileCounter++}.pem`);
|
|
353
337
|
const privateKeyPEM = (0, node_opcua_crypto_1.toPem)(privateKey, "RSA PRIVATE KEY");
|
|
@@ -373,28 +357,37 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
|
|
|
373
357
|
const now = new Date();
|
|
374
358
|
if (certInfo.tbsCertificate.validity.notBefore.getTime() > now.getTime()) {
|
|
375
359
|
// certificate is not yet valid
|
|
376
|
-
|
|
360
|
+
warningLog("Certificate is not yet valid : not before ", certInfo.tbsCertificate.validity.notBefore.toISOString(), "now = ", now.toISOString());
|
|
377
361
|
return { statusCode: node_opcua_basic_types_1.StatusCodes.BadSecurityChecksFailed };
|
|
378
362
|
}
|
|
379
363
|
if (certInfo.tbsCertificate.validity.notAfter.getTime() < now.getTime()) {
|
|
380
364
|
// certificate is already out of date
|
|
381
|
-
|
|
365
|
+
warningLog("Certificate is already out of date : not after ", certInfo.tbsCertificate.validity.notAfter.toISOString(), "now = ", now.toISOString());
|
|
382
366
|
return { statusCode: node_opcua_basic_types_1.StatusCodes.BadSecurityChecksFailed };
|
|
383
367
|
}
|
|
384
368
|
// If the Server returns applyChangesRequired=FALSE then it is indicating that it is able to
|
|
385
369
|
// satisfy the requirements specified for the ApplyChanges Method.
|
|
386
370
|
debugLog(" updateCertificate ", (0, node_opcua_crypto_1.makeSHA1Thumbprint)(certificate).toString("hex"));
|
|
387
371
|
if (!privateKeyFormat || !privateKey) {
|
|
388
|
-
// first of all we need to find the future private key;
|
|
372
|
+
// first of all we need to find the future private key;
|
|
389
373
|
// this one may have been created during the creation of the certficate signing request
|
|
390
374
|
// but is not active yet
|
|
391
375
|
const privateKeyDER = (0, node_opcua_crypto_1.readPrivateKey)(this._tmpCertificateManager ? this._tmpCertificateManager.privateKey : certificateManager.privateKey);
|
|
392
376
|
// The Server shall report an error if the public key does not match the existing Certificate and
|
|
393
377
|
// the privateKey was not provided.
|
|
394
378
|
// privateKey is not provided, so check that the public key matches the existing certificate
|
|
395
|
-
if (!certificateMatchesPrivateKey(certificate, privateKeyDER)) {
|
|
379
|
+
if (!(0, node_opcua_crypto_1.certificateMatchesPrivateKey)(certificate, privateKeyDER)) {
|
|
396
380
|
// certificate doesn't match privateKey
|
|
397
|
-
|
|
381
|
+
warningLog("certificate doesn't match privateKey");
|
|
382
|
+
/* debug code */
|
|
383
|
+
const certificatePEM = (0, node_opcua_crypto_1.toPem)(certificate, "CERTIFICATE");
|
|
384
|
+
const privateKeyPEM = (0, node_opcua_crypto_1.toPem)(privateKeyDER, "RSA PRIVATE KEY");
|
|
385
|
+
const initialBuffer = Buffer.from("Lorem Ipsum");
|
|
386
|
+
const encryptedBuffer = (0, node_opcua_crypto_1.publicEncrypt_long)(initialBuffer, certificatePEM, 256, 11);
|
|
387
|
+
const decryptedBuffer = (0, node_opcua_crypto_1.privateDecrypt_long)(encryptedBuffer, privateKeyPEM, 256);
|
|
388
|
+
console.log(certificatePEM);
|
|
389
|
+
console.log(privateKeyPEM);
|
|
390
|
+
console.log("decrypted buffer", decryptedBuffer.toString("utf-8"));
|
|
398
391
|
return { statusCode: node_opcua_basic_types_1.StatusCodes.BadSecurityChecksFailed };
|
|
399
392
|
}
|
|
400
393
|
// a new certificate is provided for us,
|
|
@@ -408,21 +401,24 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
|
|
|
408
401
|
else if (privateKey) {
|
|
409
402
|
// a private key has been provided by the caller !
|
|
410
403
|
if (!privateKeyFormat) {
|
|
411
|
-
|
|
404
|
+
warningLog("the privateKeyFormat must be specified " + privateKeyFormat);
|
|
412
405
|
return { statusCode: node_opcua_basic_types_1.StatusCodes.BadNotSupported };
|
|
413
406
|
}
|
|
414
407
|
if (privateKeyFormat !== "PEM" && privateKeyFormat !== "PFX") {
|
|
415
|
-
|
|
408
|
+
warningLog(" the private key format is invalid privateKeyFormat =" + privateKeyFormat);
|
|
416
409
|
return { statusCode: node_opcua_basic_types_1.StatusCodes.BadNotSupported };
|
|
417
410
|
}
|
|
418
411
|
if (privateKeyFormat !== "PEM") {
|
|
419
|
-
|
|
412
|
+
warningLog("in NodeOPCUA we only support PEM for the moment privateKeyFormat =" + privateKeyFormat);
|
|
420
413
|
return { statusCode: node_opcua_basic_types_1.StatusCodes.BadNotSupported };
|
|
421
414
|
}
|
|
415
|
+
if (privateKey instanceof Buffer || typeof privateKey === "string") {
|
|
416
|
+
privateKey = (0, crypto_1.createPrivateKey)(privateKey);
|
|
417
|
+
}
|
|
422
418
|
// privateKey is provided, so check that the public key matches provided private key
|
|
423
|
-
if (!certificateMatchesPrivateKey(certificate, privateKey)) {
|
|
419
|
+
if (!(0, node_opcua_crypto_1.certificateMatchesPrivateKey)(certificate, privateKey)) {
|
|
424
420
|
// certificate doesn't match privateKey
|
|
425
|
-
|
|
421
|
+
warningLog("certificate doesn't match privateKey");
|
|
426
422
|
return { statusCode: node_opcua_basic_types_1.StatusCodes.BadSecurityChecksFailed };
|
|
427
423
|
}
|
|
428
424
|
yield preInstallPrivateKey(this);
|
|
@@ -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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-server-configuration",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.86.1",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module -server",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "tsc -b",
|
|
@@ -13,34 +13,34 @@
|
|
|
13
13
|
"dependencies": {
|
|
14
14
|
"chalk": "4.1.2",
|
|
15
15
|
"memfs": "^3.4.12",
|
|
16
|
-
"node-opcua-address-space": "2.
|
|
17
|
-
"node-opcua-address-space-base": "2.
|
|
16
|
+
"node-opcua-address-space": "2.86.1",
|
|
17
|
+
"node-opcua-address-space-base": "2.86.1",
|
|
18
18
|
"node-opcua-assert": "2.77.0",
|
|
19
|
-
"node-opcua-basic-types": "2.
|
|
20
|
-
"node-opcua-binary-stream": "2.
|
|
21
|
-
"node-opcua-certificate-manager": "2.
|
|
22
|
-
"node-opcua-client": "2.
|
|
23
|
-
"node-opcua-common": "2.
|
|
19
|
+
"node-opcua-basic-types": "2.86.1",
|
|
20
|
+
"node-opcua-binary-stream": "2.86.0",
|
|
21
|
+
"node-opcua-certificate-manager": "2.86.1",
|
|
22
|
+
"node-opcua-client": "2.86.1",
|
|
23
|
+
"node-opcua-common": "2.86.1",
|
|
24
24
|
"node-opcua-constants": "2.77.0",
|
|
25
|
-
"node-opcua-crypto": "^1.
|
|
26
|
-
"node-opcua-data-model": "2.
|
|
27
|
-
"node-opcua-debug": "2.
|
|
28
|
-
"node-opcua-file-transfer": "2.
|
|
25
|
+
"node-opcua-crypto": "^2.1.2",
|
|
26
|
+
"node-opcua-data-model": "2.86.1",
|
|
27
|
+
"node-opcua-debug": "2.86.0",
|
|
28
|
+
"node-opcua-file-transfer": "2.86.1",
|
|
29
29
|
"node-opcua-hostname": "2.77.0",
|
|
30
|
-
"node-opcua-nodeid": "2.
|
|
31
|
-
"node-opcua-pki": "^
|
|
32
|
-
"node-opcua-pseudo-session": "2.
|
|
33
|
-
"node-opcua-secure-channel": "2.
|
|
34
|
-
"node-opcua-server": "2.
|
|
35
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
36
|
-
"node-opcua-status-code": "2.
|
|
37
|
-
"node-opcua-types": "2.
|
|
38
|
-
"node-opcua-variant": "2.
|
|
30
|
+
"node-opcua-nodeid": "2.86.0",
|
|
31
|
+
"node-opcua-pki": "^3.0.1",
|
|
32
|
+
"node-opcua-pseudo-session": "2.86.1",
|
|
33
|
+
"node-opcua-secure-channel": "2.86.1",
|
|
34
|
+
"node-opcua-server": "2.86.1",
|
|
35
|
+
"node-opcua-service-translate-browse-path": "2.86.1",
|
|
36
|
+
"node-opcua-status-code": "2.86.1",
|
|
37
|
+
"node-opcua-types": "2.86.1",
|
|
38
|
+
"node-opcua-variant": "2.86.1",
|
|
39
39
|
"rimraf": "^3.0.2"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"node-opcua-data-value": "2.
|
|
43
|
-
"node-opcua-leak-detector": "2.
|
|
42
|
+
"node-opcua-data-value": "2.86.1",
|
|
43
|
+
"node-opcua-leak-detector": "2.86.0",
|
|
44
44
|
"node-opcua-nodesets": "2.77.0",
|
|
45
45
|
"should": "^13.2.3"
|
|
46
46
|
},
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"internet of things"
|
|
60
60
|
],
|
|
61
61
|
"homepage": "http://node-opcua.github.io/",
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "389ba18585ff4b62f6fee58b69bd871a8e6b0dff"
|
|
63
63
|
}
|
|
@@ -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, QualifiedName, 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, PrivateKey } from "node-opcua-crypto";
|
|
13
13
|
import { TrustListDataType } from "node-opcua-types";
|
|
14
14
|
import { BinaryStream } from "node-opcua-binary-stream";
|
|
15
15
|
|
|
@@ -115,7 +115,7 @@ export class TrustListClient extends ClientFile implements ITrustList {
|
|
|
115
115
|
objectId: this.nodeId
|
|
116
116
|
};
|
|
117
117
|
const callMethodResult = await this.session.call(methodToCall);
|
|
118
|
-
if (callMethodResult.statusCode
|
|
118
|
+
if (callMethodResult.statusCode.isNotGood()) {
|
|
119
119
|
throw new Error(callMethodResult.statusCode.name);
|
|
120
120
|
}
|
|
121
121
|
this.fileHandle = callMethodResult.outputArguments![0].value as number;
|
|
@@ -140,7 +140,7 @@ export class TrustListClient extends ClientFile implements ITrustList {
|
|
|
140
140
|
objectId: this.nodeId
|
|
141
141
|
};
|
|
142
142
|
const callMethodResult = await this.session.call(methodToCall);
|
|
143
|
-
if (callMethodResult.statusCode
|
|
143
|
+
if (callMethodResult.statusCode.isNotGood()) {
|
|
144
144
|
throw new Error(callMethodResult.statusCode.name);
|
|
145
145
|
}
|
|
146
146
|
return callMethodResult.outputArguments![0].value as boolean;
|
|
@@ -215,19 +215,19 @@ export class CertificateGroup {
|
|
|
215
215
|
constructor(public session: IBasicSession, public nodeId: NodeId) {}
|
|
216
216
|
async getCertificateTypes(): Promise<NodeId[]> {
|
|
217
217
|
const browsePathResult = await this.session.translateBrowsePath(makeBrowsePath(this.nodeId, "/CertificateTypes"));
|
|
218
|
-
if (browsePathResult.statusCode
|
|
218
|
+
if (browsePathResult.statusCode.isNotGood()) {
|
|
219
219
|
throw new Error(browsePathResult.statusCode.name);
|
|
220
220
|
}
|
|
221
221
|
const certificateTypesNodeId = browsePathResult.targets![0].targetId;
|
|
222
222
|
const dataValue = await this.session.read({ nodeId: certificateTypesNodeId, attributeId: AttributeIds.Value });
|
|
223
|
-
if (dataValue.statusCode
|
|
223
|
+
if (dataValue.statusCode.isNotGood()) {
|
|
224
224
|
throw new Error(browsePathResult.statusCode.name);
|
|
225
225
|
}
|
|
226
226
|
return dataValue.value.value as NodeId[];
|
|
227
227
|
}
|
|
228
228
|
async getTrustList(): Promise<TrustListClient> {
|
|
229
229
|
const browsePathResult = await this.session.translateBrowsePath(makeBrowsePath(this.nodeId, "/TrustList"));
|
|
230
|
-
if (browsePathResult.statusCode
|
|
230
|
+
if (browsePathResult.statusCode.isNotGood()) {
|
|
231
231
|
throw new Error(browsePathResult.statusCode.name);
|
|
232
232
|
}
|
|
233
233
|
const trustListNodeId = browsePathResult.targets![0].targetId;
|
|
@@ -304,7 +304,7 @@ export class ClientPushCertificateManagement implements PushCertificateManager {
|
|
|
304
304
|
};
|
|
305
305
|
const callMethodResult = await this.session.call(methodToCall);
|
|
306
306
|
|
|
307
|
-
if (callMethodResult.statusCode
|
|
307
|
+
if (callMethodResult.statusCode.isGood()) {
|
|
308
308
|
// xx console.log(callMethodResult.toString());
|
|
309
309
|
return {
|
|
310
310
|
certificateSigningRequest: callMethodResult.outputArguments![0].value,
|
|
@@ -334,7 +334,7 @@ export class ClientPushCertificateManagement implements PushCertificateManager {
|
|
|
334
334
|
objectId: serverConfigurationNodeId
|
|
335
335
|
};
|
|
336
336
|
const callMethodResult = await this.session.call(methodToCall);
|
|
337
|
-
if (callMethodResult.statusCode
|
|
337
|
+
if (callMethodResult.statusCode.isGood()) {
|
|
338
338
|
if (callMethodResult.outputArguments![0].dataType !== DataType.ByteString) {
|
|
339
339
|
return { statusCode: StatusCodes.BadInvalidArgument };
|
|
340
340
|
}
|
|
@@ -402,7 +402,7 @@ export class ClientPushCertificateManagement implements PushCertificateManager {
|
|
|
402
402
|
certificate: Buffer,
|
|
403
403
|
issuerCertificates: Buffer[],
|
|
404
404
|
privateKeyFormat: string,
|
|
405
|
-
privateKey: Buffer
|
|
405
|
+
privateKey: Buffer | string | PrivateKey
|
|
406
406
|
): Promise<UpdateCertificateResult>;
|
|
407
407
|
public async updateCertificate(
|
|
408
408
|
certificateGroupId: NodeId | string,
|
|
@@ -410,8 +410,9 @@ export class ClientPushCertificateManagement implements PushCertificateManager {
|
|
|
410
410
|
certificate: Buffer,
|
|
411
411
|
issuerCertificates: Buffer[],
|
|
412
412
|
privateKeyFormat?: string,
|
|
413
|
-
privateKey?: Buffer
|
|
413
|
+
privateKey?: Buffer | string | PrivateKey
|
|
414
414
|
): Promise<UpdateCertificateResult> {
|
|
415
|
+
|
|
415
416
|
const inputArguments: VariantLike[] = [
|
|
416
417
|
{ dataType: DataType.NodeId, value: findCertificateGroupNodeId(certificateGroupId) },
|
|
417
418
|
{ dataType: DataType.NodeId, value: findCertificateTypeIdNodeId(certificateTypeId) },
|
|
@@ -426,7 +427,7 @@ export class ClientPushCertificateManagement implements PushCertificateManager {
|
|
|
426
427
|
objectId: serverConfigurationNodeId
|
|
427
428
|
};
|
|
428
429
|
const callMethodResult = await this.session.call(methodToCall);
|
|
429
|
-
if (callMethodResult.statusCode
|
|
430
|
+
if (callMethodResult.statusCode.isGood()) {
|
|
430
431
|
if (!callMethodResult.outputArguments || callMethodResult.outputArguments!.length !== 1) {
|
|
431
432
|
return {
|
|
432
433
|
statusCode: StatusCodes.BadInternalError
|
|
@@ -4,19 +4,20 @@
|
|
|
4
4
|
import * as fs from "fs";
|
|
5
5
|
import * as os from "os";
|
|
6
6
|
import * as path from "path";
|
|
7
|
+
import { createPrivateKey } from "crypto";
|
|
7
8
|
|
|
8
9
|
import * as chalk from "chalk";
|
|
9
10
|
|
|
10
11
|
import { UAServerConfiguration, AddressSpace } from "node-opcua-address-space";
|
|
11
12
|
import { assert } from "node-opcua-assert";
|
|
12
13
|
import { OPCUACertificateManager } from "node-opcua-certificate-manager";
|
|
13
|
-
import { Certificate, convertPEMtoDER, makeSHA1Thumbprint, PrivateKeyPEM, split_der } from "node-opcua-crypto";
|
|
14
|
+
import { Certificate, convertPEMtoDER, makeSHA1Thumbprint, PrivateKey, PrivateKeyPEM, split_der } from "node-opcua-crypto";
|
|
14
15
|
import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
|
|
15
16
|
import { getFullyQualifiedDomainName } from "node-opcua-hostname";
|
|
16
|
-
import { ICertificateKeyPairProvider } from "node-opcua-secure-channel";
|
|
17
17
|
import { ICertificateKeyPairProviderPriv } from "node-opcua-common";
|
|
18
18
|
import { OPCUAServer, OPCUAServerEndPoint } from "node-opcua-server";
|
|
19
19
|
import { ApplicationDescriptionOptions } from "node-opcua-types";
|
|
20
|
+
|
|
20
21
|
import { installPushCertificateManagement } from "./push_certificate_manager_helpers";
|
|
21
22
|
import { ActionQueue, PushCertificateManagerServerImpl } from "./push_certificate_manager_server_impl";
|
|
22
23
|
|
|
@@ -34,7 +35,7 @@ export interface OPCUAServerPartial extends ICertificateKeyPairProviderPriv {
|
|
|
34
35
|
certificateFile: string;
|
|
35
36
|
$$certificate: null | Certificate;
|
|
36
37
|
$$certificateChain: null | Certificate;
|
|
37
|
-
$$
|
|
38
|
+
$$privateKey: null | PrivateKey;
|
|
38
39
|
engine: { addressSpace?: AddressSpace };
|
|
39
40
|
}
|
|
40
41
|
|
|
@@ -53,11 +54,12 @@ function getCertificateChain(this: OPCUAServerPartial): Certificate {
|
|
|
53
54
|
return this.$$certificateChain;
|
|
54
55
|
}
|
|
55
56
|
|
|
56
|
-
function getPrivateKey(this: OPCUAServerPartial):
|
|
57
|
-
|
|
58
|
-
|
|
57
|
+
function getPrivateKey(this: OPCUAServerPartial): PrivateKey {
|
|
58
|
+
// istanbul ignore next
|
|
59
|
+
if (!this.$$privateKey) {
|
|
60
|
+
throw new Error("internal Error. cannot find $$privateKey");
|
|
59
61
|
}
|
|
60
|
-
return this.$$
|
|
62
|
+
return this.$$privateKey;
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
async function getIpAddresses(): Promise<string[]> {
|
|
@@ -89,8 +91,8 @@ async function install(this: OPCUAServerPartial): Promise<void> {
|
|
|
89
91
|
path.join(this.serverCertificateManager.rootDir, "own/certs/certificate.pem")
|
|
90
92
|
);
|
|
91
93
|
|
|
92
|
-
if (!this.$$
|
|
93
|
-
this.$$
|
|
94
|
+
if (!this.$$privateKey) {
|
|
95
|
+
this.$$privateKey = createPrivateKey(await readFile(this.serverCertificateManager.privateKey, "utf8"));
|
|
94
96
|
}
|
|
95
97
|
|
|
96
98
|
if (!this.$$certificateChain) {
|
|
@@ -141,9 +143,9 @@ function getCertificateChainEP(this: OPCUAServerEndPoint): Certificate {
|
|
|
141
143
|
return $$certificateChain;
|
|
142
144
|
}
|
|
143
145
|
|
|
144
|
-
function getPrivateKeyEP(this: OPCUAServerEndPoint):
|
|
145
|
-
const $$
|
|
146
|
-
return $$
|
|
146
|
+
function getPrivateKeyEP(this: OPCUAServerEndPoint): PrivateKey {
|
|
147
|
+
const $$privateKey = createPrivateKey(fs.readFileSync(this.certificateManager.privateKey, "utf8"));
|
|
148
|
+
return $$privateKey;
|
|
147
149
|
}
|
|
148
150
|
|
|
149
151
|
async function onCertificateAboutToChange(server: OPCUAServer) {
|
|
@@ -166,16 +168,16 @@ async function onCertificateChange(server: OPCUAServer) {
|
|
|
166
168
|
|
|
167
169
|
const _server = server as any as OPCUAServerPartial;
|
|
168
170
|
|
|
169
|
-
_server.$$
|
|
171
|
+
_server.$$privateKey = createPrivateKey(fs.readFileSync(server.serverCertificateManager.privateKey, "utf8"));
|
|
170
172
|
const certificateFile = path.join(server.serverCertificateManager.rootDir, "own/certs/certificate.pem");
|
|
171
173
|
const certificatePEM = fs.readFileSync(certificateFile, "utf8");
|
|
172
174
|
|
|
173
175
|
const privateKeyFile = server.serverCertificateManager.privateKey;
|
|
174
|
-
const
|
|
176
|
+
const privateKey = createPrivateKey(fs.readFileSync(privateKeyFile, "utf8"));
|
|
175
177
|
// also reread the private key
|
|
176
178
|
|
|
177
179
|
_server.$$certificateChain = convertPEMtoDER(certificatePEM);
|
|
178
|
-
_server.$$
|
|
180
|
+
_server.$$privateKey = privateKey;
|
|
179
181
|
// note : $$certificate will be reconstructed on demand
|
|
180
182
|
_server.$$certificate = split_der(_server.$$certificateChain)[0];
|
|
181
183
|
|
|
@@ -128,7 +128,7 @@ async function _createSigningRequest(
|
|
|
128
128
|
nonce
|
|
129
129
|
);
|
|
130
130
|
|
|
131
|
-
if (result.statusCode
|
|
131
|
+
if (result.statusCode.isNotGood()) {
|
|
132
132
|
return { statusCode: result.statusCode };
|
|
133
133
|
}
|
|
134
134
|
|
|
@@ -186,7 +186,7 @@ async function _updateCertificate(
|
|
|
186
186
|
|
|
187
187
|
// todo raise a CertificateUpdatedAuditEventType
|
|
188
188
|
|
|
189
|
-
if (result.statusCode
|
|
189
|
+
if (result.statusCode.isNotGood()) {
|
|
190
190
|
return { statusCode: result.statusCode };
|
|
191
191
|
}
|
|
192
192
|
const callMethodResult = {
|
|
@@ -220,7 +220,7 @@ async function _getRejectedList(
|
|
|
220
220
|
|
|
221
221
|
const result = await pushCertificateManager.getRejectedList();
|
|
222
222
|
|
|
223
|
-
if (result.statusCode
|
|
223
|
+
if (result.statusCode.isNotGood()) {
|
|
224
224
|
return { statusCode: result.statusCode };
|
|
225
225
|
}
|
|
226
226
|
|
|
@@ -4,7 +4,9 @@
|
|
|
4
4
|
import { EventEmitter } from "events";
|
|
5
5
|
import * as fs from "fs";
|
|
6
6
|
import * as path from "path";
|
|
7
|
-
import {
|
|
7
|
+
import { createPrivateKey, KeyObject } from "crypto";
|
|
8
|
+
import { promisify } from "util";
|
|
9
|
+
|
|
8
10
|
import * as rimraf from "rimraf";
|
|
9
11
|
import { SubjectOptions } from "node-opcua-pki";
|
|
10
12
|
import { assert } from "node-opcua-assert";
|
|
@@ -15,14 +17,11 @@ import {
|
|
|
15
17
|
makeSHA1Thumbprint,
|
|
16
18
|
readPrivateKey,
|
|
17
19
|
toPem,
|
|
18
|
-
Certificate,
|
|
19
|
-
CertificatePEM,
|
|
20
20
|
privateDecrypt_long,
|
|
21
21
|
PrivateKey,
|
|
22
|
-
PrivateKeyPEM,
|
|
23
22
|
publicEncrypt_long,
|
|
24
|
-
|
|
25
|
-
readCertificate
|
|
23
|
+
certificateMatchesPrivateKey,
|
|
24
|
+
readCertificate
|
|
26
25
|
} from "node-opcua-crypto";
|
|
27
26
|
import { DirectoryName } from "node-opcua-crypto/dist/source/asn1";
|
|
28
27
|
|
|
@@ -41,7 +40,6 @@ import {
|
|
|
41
40
|
// node 14 onward : import { readFile, writeFile, readdir } from "fs/promises";
|
|
42
41
|
const { readFile, writeFile, readdir } = fs.promises;
|
|
43
42
|
|
|
44
|
-
|
|
45
43
|
const debugLog = make_debugLog("ServerConfiguration");
|
|
46
44
|
const errorLog = make_errorLog("ServerConfiguration");
|
|
47
45
|
const warningLog = make_warningLog("ServerConfiguration");
|
|
@@ -51,24 +49,6 @@ const defaultApplicationGroup = resolveNodeId("ServerConfiguration_CertificateGr
|
|
|
51
49
|
const defaultHttpsGroup = resolveNodeId("ServerConfiguration_CertificateGroups_DefaultHttpsGroup");
|
|
52
50
|
const defaultUserTokenGroup = resolveNodeId("ServerConfiguration_CertificateGroups_DefaultUserTokenGroup");
|
|
53
51
|
|
|
54
|
-
/**
|
|
55
|
-
* check that the given certificate matches the given private key
|
|
56
|
-
* @param certificate
|
|
57
|
-
* @param privateKey
|
|
58
|
-
*/
|
|
59
|
-
function certificateMatchesPrivateKeyPEM(certificate: CertificatePEM, privateKey: PrivateKeyPEM): boolean {
|
|
60
|
-
const initialBuffer = Buffer.from("Lorem Ipsum");
|
|
61
|
-
const encryptedBuffer = publicEncrypt_long(initialBuffer, certificate, 256, 11);
|
|
62
|
-
const decryptedBuffer = privateDecrypt_long(encryptedBuffer, privateKey, 256);
|
|
63
|
-
return initialBuffer.toString("utf-8") === decryptedBuffer.toString("utf-8");
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
export function certificateMatchesPrivateKey(certificate: Certificate, privateKey: PrivateKey): boolean {
|
|
67
|
-
const certificatePEM = toPem(certificate, "CERTIFICATE");
|
|
68
|
-
const privateKeyPEM = toPem(privateKey, "RSA PRIVATE KEY");
|
|
69
|
-
return certificateMatchesPrivateKeyPEM(certificatePEM, privateKeyPEM);
|
|
70
|
-
}
|
|
71
|
-
|
|
72
52
|
function findCertificateGroupName(certificateGroupNodeId: NodeId | string): string {
|
|
73
53
|
if (typeof certificateGroupNodeId === "string") {
|
|
74
54
|
return certificateGroupNodeId;
|
|
@@ -233,7 +213,6 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
233
213
|
regeneratePrivateKey?: boolean,
|
|
234
214
|
nonce?: Buffer
|
|
235
215
|
): Promise<CreateSigningRequestResult> {
|
|
236
|
-
|
|
237
216
|
let certificateManager = this.getCertificateManager(certificateGroupId);
|
|
238
217
|
|
|
239
218
|
if (!certificateManager) {
|
|
@@ -250,7 +229,7 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
250
229
|
errorLog("Cannot find existing certificate to extract subjectName", currentCertificateFilename);
|
|
251
230
|
return {
|
|
252
231
|
statusCode: StatusCodes.BadInvalidState
|
|
253
|
-
}
|
|
232
|
+
};
|
|
254
233
|
}
|
|
255
234
|
const certificate = readCertificate(currentCertificateFilename);
|
|
256
235
|
const e = exploreCertificate(certificate);
|
|
@@ -265,11 +244,12 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
265
244
|
// Previously created Private Keys may be discarded if UpdateCertificate was not
|
|
266
245
|
// called before calling this method again.
|
|
267
246
|
|
|
268
|
-
|
|
269
247
|
// Additional entropy which the caller shall provide if regeneratePrivateKey is TRUE.
|
|
270
248
|
// It shall be at least 32 bytes long
|
|
271
249
|
if (!nonce || nonce.length < 32) {
|
|
272
|
-
make_warningLog(
|
|
250
|
+
make_warningLog(
|
|
251
|
+
" nonce should be provided when regeneratePrivateKey is set, and length shall be greater than 32 bytes"
|
|
252
|
+
);
|
|
273
253
|
return {
|
|
274
254
|
statusCode: StatusCodes.BadInvalidArgument
|
|
275
255
|
};
|
|
@@ -287,7 +267,7 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
287
267
|
const keySize = (certificateManager as any).keySize; // because keySize is private !
|
|
288
268
|
certificateManager = new CertificateManager({
|
|
289
269
|
keySize,
|
|
290
|
-
location
|
|
270
|
+
location
|
|
291
271
|
});
|
|
292
272
|
debugLog("generating a new private key ...");
|
|
293
273
|
await certificateManager.initialize();
|
|
@@ -295,12 +275,11 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
295
275
|
this._tmpCertificateManager = certificateManager;
|
|
296
276
|
|
|
297
277
|
this.addPendingTask(async () => {
|
|
298
|
-
await moveFileWithBackup(certificateManager!.privateKey, destCertificateManager.privateKey)
|
|
278
|
+
await moveFileWithBackup(certificateManager!.privateKey, destCertificateManager.privateKey);
|
|
299
279
|
});
|
|
300
280
|
this.addPendingTask(async () => {
|
|
301
|
-
|
|
281
|
+
await promisify(rimraf)(path.join(location));
|
|
302
282
|
});
|
|
303
|
-
|
|
304
283
|
} else {
|
|
305
284
|
// The Server uses its existing Private Key
|
|
306
285
|
}
|
|
@@ -385,13 +364,14 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
385
364
|
certificate: Buffer,
|
|
386
365
|
issuerCertificates: ByteString[]
|
|
387
366
|
): Promise<UpdateCertificateResult>;
|
|
367
|
+
// eslint-disable-next-line max-statements
|
|
388
368
|
public async updateCertificate(
|
|
389
369
|
certificateGroupId: NodeId | string,
|
|
390
370
|
certificateTypeId: NodeId | string,
|
|
391
371
|
certificate: Buffer,
|
|
392
372
|
issuerCertificates: ByteString[],
|
|
393
373
|
privateKeyFormat?: string,
|
|
394
|
-
privateKey?: Buffer
|
|
374
|
+
privateKey?: Buffer | PrivateKey | string
|
|
395
375
|
): Promise<UpdateCertificateResult> {
|
|
396
376
|
// Result Code Description
|
|
397
377
|
// BadInvalidArgument The certificateTypeId or certificateGroupId is not valid.
|
|
@@ -426,7 +406,6 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
426
406
|
|
|
427
407
|
async function preInstallPrivateKey(self: PushCertificateManagerServerImpl) {
|
|
428
408
|
assert(privateKeyFormat!.toUpperCase() === "PEM");
|
|
429
|
-
assert(privateKey! instanceof Buffer); // could be DER or PEM in a buffer ?
|
|
430
409
|
|
|
431
410
|
const ownPrivateFolder = path.join(certificateManager.rootDir, "own/private");
|
|
432
411
|
const privateKeyFilePEM = path.join(ownPrivateFolder, `_pending_private_key${fileCounter++}.pem`);
|
|
@@ -457,12 +436,22 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
457
436
|
const now = new Date();
|
|
458
437
|
if (certInfo.tbsCertificate.validity.notBefore.getTime() > now.getTime()) {
|
|
459
438
|
// certificate is not yet valid
|
|
460
|
-
|
|
439
|
+
warningLog(
|
|
440
|
+
"Certificate is not yet valid : not before ",
|
|
441
|
+
certInfo.tbsCertificate.validity.notBefore.toISOString(),
|
|
442
|
+
"now = ",
|
|
443
|
+
now.toISOString()
|
|
444
|
+
);
|
|
461
445
|
return { statusCode: StatusCodes.BadSecurityChecksFailed };
|
|
462
446
|
}
|
|
463
447
|
if (certInfo.tbsCertificate.validity.notAfter.getTime() < now.getTime()) {
|
|
464
448
|
// certificate is already out of date
|
|
465
|
-
|
|
449
|
+
warningLog(
|
|
450
|
+
"Certificate is already out of date : not after ",
|
|
451
|
+
certInfo.tbsCertificate.validity.notAfter.toISOString(),
|
|
452
|
+
"now = ",
|
|
453
|
+
now.toISOString()
|
|
454
|
+
);
|
|
466
455
|
return { statusCode: StatusCodes.BadSecurityChecksFailed };
|
|
467
456
|
}
|
|
468
457
|
|
|
@@ -472,18 +461,28 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
472
461
|
debugLog(" updateCertificate ", makeSHA1Thumbprint(certificate).toString("hex"));
|
|
473
462
|
|
|
474
463
|
if (!privateKeyFormat || !privateKey) {
|
|
475
|
-
// first of all we need to find the future private key;
|
|
464
|
+
// first of all we need to find the future private key;
|
|
476
465
|
// this one may have been created during the creation of the certficate signing request
|
|
477
466
|
// but is not active yet
|
|
478
467
|
const privateKeyDER = readPrivateKey(
|
|
479
|
-
this._tmpCertificateManager ? this._tmpCertificateManager.privateKey : certificateManager.privateKey
|
|
468
|
+
this._tmpCertificateManager ? this._tmpCertificateManager.privateKey : certificateManager.privateKey
|
|
469
|
+
);
|
|
480
470
|
|
|
481
471
|
// The Server shall report an error if the public key does not match the existing Certificate and
|
|
482
472
|
// the privateKey was not provided.
|
|
483
473
|
// privateKey is not provided, so check that the public key matches the existing certificate
|
|
484
474
|
if (!certificateMatchesPrivateKey(certificate, privateKeyDER)) {
|
|
485
475
|
// certificate doesn't match privateKey
|
|
486
|
-
|
|
476
|
+
warningLog("certificate doesn't match privateKey");
|
|
477
|
+
/* debug code */
|
|
478
|
+
const certificatePEM = toPem(certificate, "CERTIFICATE");
|
|
479
|
+
const privateKeyPEM = toPem(privateKeyDER, "RSA PRIVATE KEY");
|
|
480
|
+
const initialBuffer = Buffer.from("Lorem Ipsum");
|
|
481
|
+
const encryptedBuffer = publicEncrypt_long(initialBuffer, certificatePEM, 256, 11);
|
|
482
|
+
const decryptedBuffer = privateDecrypt_long(encryptedBuffer, privateKeyPEM, 256);
|
|
483
|
+
console.log(certificatePEM);
|
|
484
|
+
console.log(privateKeyPEM);
|
|
485
|
+
console.log("decrypted buffer", decryptedBuffer.toString("utf-8"));
|
|
487
486
|
return { statusCode: StatusCodes.BadSecurityChecksFailed };
|
|
488
487
|
}
|
|
489
488
|
// a new certificate is provided for us,
|
|
@@ -497,22 +496,25 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
497
496
|
} else if (privateKey) {
|
|
498
497
|
// a private key has been provided by the caller !
|
|
499
498
|
if (!privateKeyFormat) {
|
|
500
|
-
|
|
499
|
+
warningLog("the privateKeyFormat must be specified " + privateKeyFormat);
|
|
501
500
|
return { statusCode: StatusCodes.BadNotSupported };
|
|
502
501
|
}
|
|
503
502
|
if (privateKeyFormat !== "PEM" && privateKeyFormat !== "PFX") {
|
|
504
|
-
|
|
503
|
+
warningLog(" the private key format is invalid privateKeyFormat =" + privateKeyFormat);
|
|
505
504
|
return { statusCode: StatusCodes.BadNotSupported };
|
|
506
505
|
}
|
|
507
506
|
if (privateKeyFormat !== "PEM") {
|
|
508
|
-
|
|
507
|
+
warningLog("in NodeOPCUA we only support PEM for the moment privateKeyFormat =" + privateKeyFormat);
|
|
509
508
|
return { statusCode: StatusCodes.BadNotSupported };
|
|
510
509
|
}
|
|
511
510
|
|
|
511
|
+
if (privateKey instanceof Buffer || typeof privateKey === "string") {
|
|
512
|
+
privateKey = createPrivateKey(privateKey);
|
|
513
|
+
}
|
|
512
514
|
// privateKey is provided, so check that the public key matches provided private key
|
|
513
515
|
if (!certificateMatchesPrivateKey(certificate, privateKey)) {
|
|
514
516
|
// certificate doesn't match privateKey
|
|
515
|
-
|
|
517
|
+
warningLog("certificate doesn't match privateKey");
|
|
516
518
|
return { statusCode: StatusCodes.BadSecurityChecksFailed };
|
|
517
519
|
}
|
|
518
520
|
|