node-opcua-server-configuration 2.70.2 → 2.72.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.
- package/dist/clientTools/push_certificate_management_client.js +7 -9
- package/dist/clientTools/push_certificate_management_client.js.map +1 -1
- package/dist/server/install_CertificateAlarm.d.ts +8 -2
- package/dist/server/install_CertificateAlarm.js +20 -12
- package/dist/server/install_CertificateAlarm.js.map +1 -1
- package/dist/server/install_certificate_file_watcher.d.ts +5 -0
- package/dist/server/install_certificate_file_watcher.js +24 -0
- package/dist/server/install_certificate_file_watcher.js.map +1 -0
- package/dist/server/install_push_certitifate_management.d.ts +9 -5
- package/dist/server/install_push_certitifate_management.js +1 -2
- package/dist/server/install_push_certitifate_management.js.map +1 -1
- package/dist/server/push_certificate_manager_helpers.d.ts +2 -5
- package/dist/server/push_certificate_manager_helpers.js +119 -16
- package/dist/server/push_certificate_manager_helpers.js.map +1 -1
- package/dist/server/push_certificate_manager_server_impl.d.ts +1 -1
- package/dist/server/push_certificate_manager_server_impl.js +3 -3
- package/dist/server/push_certificate_manager_server_impl.js.map +1 -1
- package/dist/server/tools.js.map +1 -1
- package/dist/server/trust_list_server.js +1 -1
- package/dist/server/trust_list_server.js.map +1 -1
- package/package.json +26 -24
- package/source/clientTools/push_certificate_management_client.ts +16 -37
- package/source/server/install_CertificateAlarm.ts +35 -29
- package/source/server/install_certificate_file_watcher.ts +25 -0
- package/source/server/install_push_certitifate_management.ts +8 -8
- package/source/server/push_certificate_manager_helpers.ts +142 -26
- package/source/server/push_certificate_manager_server_impl.ts +6 -7
- package/source/server/tools.ts +1 -1
- package/source/server/trust_list_server.ts +3 -3
|
@@ -98,9 +98,7 @@ class TrustListClient extends node_opcua_file_transfer_1.ClientFile {
|
|
|
98
98
|
if (!this.openWithMasksNodeId) {
|
|
99
99
|
throw new Error("OpenWithMasks doesn't exist");
|
|
100
100
|
}
|
|
101
|
-
const inputArguments = [
|
|
102
|
-
{ dataType: node_opcua_variant_1.DataType.UInt32, value: trustListMask },
|
|
103
|
-
];
|
|
101
|
+
const inputArguments = [{ dataType: node_opcua_variant_1.DataType.UInt32, value: trustListMask }];
|
|
104
102
|
const methodToCall = {
|
|
105
103
|
inputArguments,
|
|
106
104
|
methodId: this.openWithMasksNodeId,
|
|
@@ -125,7 +123,7 @@ class TrustListClient extends node_opcua_file_transfer_1.ClientFile {
|
|
|
125
123
|
}
|
|
126
124
|
const inputArguments = [
|
|
127
125
|
{ dataType: node_opcua_variant_1.DataType.UInt32, value: this.fileHandle },
|
|
128
|
-
{ dataType: node_opcua_variant_1.DataType.Boolean, value: !!applyChangesRequired }
|
|
126
|
+
{ dataType: node_opcua_variant_1.DataType.Boolean, value: !!applyChangesRequired }
|
|
129
127
|
];
|
|
130
128
|
const methodToCall = {
|
|
131
129
|
inputArguments,
|
|
@@ -144,7 +142,7 @@ class TrustListClient extends node_opcua_file_transfer_1.ClientFile {
|
|
|
144
142
|
yield this.ensureInitialized();
|
|
145
143
|
const inputArguments = [
|
|
146
144
|
{ dataType: node_opcua_variant_1.DataType.ByteString, value: certificate },
|
|
147
|
-
{ dataType: node_opcua_variant_1.DataType.Boolean, value: !!isTrustedCertificate }
|
|
145
|
+
{ dataType: node_opcua_variant_1.DataType.Boolean, value: !!isTrustedCertificate }
|
|
148
146
|
];
|
|
149
147
|
const methodToCall = {
|
|
150
148
|
inputArguments,
|
|
@@ -160,7 +158,7 @@ class TrustListClient extends node_opcua_file_transfer_1.ClientFile {
|
|
|
160
158
|
yield this.ensureInitialized();
|
|
161
159
|
const inputArguments = [
|
|
162
160
|
{ dataType: node_opcua_variant_1.DataType.String, value: thumbprint },
|
|
163
|
-
{ dataType: node_opcua_variant_1.DataType.Boolean, value: !!isTrustedCertificate }
|
|
161
|
+
{ dataType: node_opcua_variant_1.DataType.Boolean, value: !!isTrustedCertificate }
|
|
164
162
|
];
|
|
165
163
|
const methodToCall = {
|
|
166
164
|
inputArguments,
|
|
@@ -441,10 +439,10 @@ class ClientPushCertificateManagement {
|
|
|
441
439
|
return __awaiter(this, void 0, void 0, function* () {
|
|
442
440
|
browseName = (0, node_opcua_data_model_1.coerceQualifiedName)(browseName);
|
|
443
441
|
if (browseName.toString() === "DefaultApplicationGroup") {
|
|
444
|
-
return new CertificateGroup(this.session,
|
|
442
|
+
return new CertificateGroup(this.session, defaultApplicationGroup);
|
|
445
443
|
}
|
|
446
444
|
if (browseName.toString() === "DefaultUserTokenGroup") {
|
|
447
|
-
return new CertificateGroup(this.session,
|
|
445
|
+
return new CertificateGroup(this.session, defaultUserTokenGroup);
|
|
448
446
|
}
|
|
449
447
|
// istanbul ignore next
|
|
450
448
|
throw new Error("Not Implemented yet");
|
|
@@ -457,7 +455,7 @@ class ClientPushCertificateManagement {
|
|
|
457
455
|
}
|
|
458
456
|
getUserTokenGroup() {
|
|
459
457
|
return __awaiter(this, void 0, void 0, function* () {
|
|
460
|
-
return this.getCertificateGroup("
|
|
458
|
+
return this.getCertificateGroup("DefaultUserTokenGroup");
|
|
461
459
|
});
|
|
462
460
|
}
|
|
463
461
|
}
|
|
@@ -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,5 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opcua-server-configuration-server
|
|
3
3
|
*/
|
|
4
|
-
import { AddressSpace } from "node-opcua-address-space";
|
|
5
|
-
|
|
4
|
+
import { AddressSpace, UACertificateExpirationAlarmEx } from "node-opcua-address-space";
|
|
5
|
+
/**
|
|
6
|
+
*
|
|
7
|
+
* @param addressSpace
|
|
8
|
+
* @returns
|
|
9
|
+
* @deprecated
|
|
10
|
+
*/
|
|
11
|
+
export declare function installCertificateExpirationAlarm(addressSpace: AddressSpace): UACertificateExpirationAlarmEx;
|
|
@@ -11,28 +11,36 @@ const node_opcua_variant_1 = require("node-opcua-variant");
|
|
|
11
11
|
const debugLog = (0, node_opcua_debug_1.make_debugLog)("ServerConfiguration");
|
|
12
12
|
const errorLog = (0, node_opcua_debug_1.make_errorLog)("ServerConfiguration");
|
|
13
13
|
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("ServerConfiguration");
|
|
14
|
+
/**
|
|
15
|
+
*
|
|
16
|
+
* @param addressSpace
|
|
17
|
+
* @returns
|
|
18
|
+
* @deprecated
|
|
19
|
+
*/
|
|
14
20
|
function installCertificateExpirationAlarm(addressSpace) {
|
|
15
21
|
var _a;
|
|
16
22
|
debugLog("installCertificateExpirationAlarm");
|
|
23
|
+
/**
|
|
24
|
+
* note: the ServerCertificateAlarm is not in the OPCUA standard
|
|
25
|
+
*/
|
|
17
26
|
const server = addressSpace.rootFolder.objects.server;
|
|
18
27
|
const namespace = addressSpace.getOwnNamespace();
|
|
19
|
-
const certificateExpirationAlarmType = addressSpace.findEventType("CertificateExpirationAlarmType");
|
|
20
28
|
const options = {
|
|
21
29
|
browseName: "ServerCertificateAlarm",
|
|
22
|
-
conditionSource:
|
|
30
|
+
conditionSource: undefined,
|
|
23
31
|
eventSourceOf: server,
|
|
24
32
|
inputNode: new node_opcua_nodeid_1.NodeId(),
|
|
25
|
-
normalState: new node_opcua_nodeid_1.NodeId()
|
|
33
|
+
normalState: new node_opcua_nodeid_1.NodeId(),
|
|
34
|
+
optionals: ["ExpirationLimit"]
|
|
26
35
|
};
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
(
|
|
34
|
-
|
|
35
|
-
alarm.eventId.setValueFromSource({ dataType: node_opcua_variant_1.DataType.ByteString, value: null });
|
|
36
|
+
const certificateExpirationAlarm = node_opcua_address_space_1.UACertificateExpirationAlarmImpl.instantiate(namespace, "CertificateExpirationAlarmType", options);
|
|
37
|
+
certificateExpirationAlarm.currentBranch().setRetain(false);
|
|
38
|
+
certificateExpirationAlarm.activeState.setValue(false);
|
|
39
|
+
certificateExpirationAlarm.ackedState.setValue(false);
|
|
40
|
+
(_a = certificateExpirationAlarm.suppressedState) === null || _a === void 0 ? void 0 : _a.setValue(false);
|
|
41
|
+
certificateExpirationAlarm.certificate.setValueFromSource({ dataType: node_opcua_variant_1.DataType.ByteString, value: null });
|
|
42
|
+
certificateExpirationAlarm.eventId.setValueFromSource({ dataType: node_opcua_variant_1.DataType.ByteString, value: null });
|
|
43
|
+
return certificateExpirationAlarm;
|
|
36
44
|
}
|
|
37
45
|
exports.installCertificateExpirationAlarm = installCertificateExpirationAlarm;
|
|
38
46
|
//# sourceMappingURL=install_CertificateAlarm.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install_CertificateAlarm.js","sourceRoot":"","sources":["../../source/server/install_CertificateAlarm.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,
|
|
1
|
+
{"version":3,"file":"install_CertificateAlarm.js","sourceRoot":"","sources":["../../source/server/install_CertificateAlarm.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,uEAMkC;AAGlC,uDAAgF;AAChF,yDAAuD;AACvD,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;;;;;GAKG;AACH,SAAgB,iCAAiC,CAAC,YAA0B;;IACxE,QAAQ,CAAC,mCAAmC,CAAC,CAAC;IAC9C;;OAEG;IACH,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC;IACtD,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,CAAC;IAEjD,MAAM,OAAO,GAAqC;QAC9C,UAAU,EAAE,wBAAwB;QACpC,eAAe,EAAE,SAAS;QAC1B,aAAa,EAAE,MAAM;QACrB,SAAS,EAAE,IAAI,0BAAM,EAAE;QACvB,WAAW,EAAE,IAAI,0BAAM,EAAE;QACzB,SAAS,EAAE,CAAC,iBAAiB,CAAC;KACjC,CAAC;IACF,MAAM,0BAA0B,GAAG,2DAAgC,CAAC,WAAW,CAC3E,SAAS,EACT,gCAAgC,EAChC,OAAO,CACV,CAAC;IACF,0BAA0B,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC5D,0BAA0B,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvD,0BAA0B,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAA,0BAA0B,CAAC,eAAe,0CAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5D,0BAA0B,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1G,0BAA0B,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAEtG,OAAO,0BAA0B,CAAC;AACtC,CAAC;AA7BD,8EA6BC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { UAObject } from "node-opcua-address-space-base";
|
|
2
|
+
export interface ChangeDetector {
|
|
3
|
+
on(eventName: "certificateChange", handler: () => void): this;
|
|
4
|
+
}
|
|
5
|
+
export declare function installCertificateFileWatcher(node: UAObject, certificateFile: string): ChangeDetector;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.installCertificateFileWatcher = void 0;
|
|
4
|
+
const fs = require("fs");
|
|
5
|
+
const path = require("path");
|
|
6
|
+
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
7
|
+
const debugLog = (0, node_opcua_debug_1.make_debugLog)("ServerConfiguration");
|
|
8
|
+
function installCertificateFileWatcher(node, certificateFile) {
|
|
9
|
+
const fileToWatch = path.basename(certificateFile);
|
|
10
|
+
const fsWatcher = fs.watch(path.dirname(certificateFile), { persistent: false }, (eventType, filename) => {
|
|
11
|
+
/** */
|
|
12
|
+
if (filename === fileToWatch) {
|
|
13
|
+
debugLog("filename changed = ", filename, fileToWatch);
|
|
14
|
+
node.emit("certificateChange");
|
|
15
|
+
}
|
|
16
|
+
});
|
|
17
|
+
const addressSpace = node.addressSpace;
|
|
18
|
+
addressSpace.registerShutdownTask(() => {
|
|
19
|
+
fsWatcher.close();
|
|
20
|
+
});
|
|
21
|
+
return node;
|
|
22
|
+
}
|
|
23
|
+
exports.installCertificateFileWatcher = installCertificateFileWatcher;
|
|
24
|
+
//# sourceMappingURL=install_certificate_file_watcher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"install_certificate_file_watcher.js","sourceRoot":"","sources":["../../source/server/install_certificate_file_watcher.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,6BAA6B;AAE7B,uDAAiD;AAEjD,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,qBAAqB,CAAC,CAAC;AAKtD,SAAgB,6BAA6B,CAAC,IAAc,EAAE,eAAuB;IACjF,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACnD,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC,SAA8B,EAAE,QAAQ,EAAE,EAAE;QAC1H,MAAM;QACN,IAAI,QAAQ,KAAK,WAAW,EAAE;YAC1B,QAAQ,CAAC,qBAAqB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;YACvD,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAClC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,IAAI,CAAC,YAAa,CAAC;IACxC,YAAY,CAAC,oBAAoB,CAAC,GAAG,EAAE;QACnC,SAAS,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IACH,OAAO,IAAiC,CAAC;AAC7C,CAAC;AAdD,sEAcC"}
|
|
@@ -1,15 +1,19 @@
|
|
|
1
|
+
import { AddressSpace } from "node-opcua-address-space";
|
|
1
2
|
import { OPCUACertificateManager } from "node-opcua-certificate-manager";
|
|
2
3
|
import { Certificate, PrivateKeyPEM } from "node-opcua-crypto";
|
|
3
|
-
import {
|
|
4
|
+
import { ICertificateKeyPairProviderPriv } from "node-opcua-common";
|
|
4
5
|
import { OPCUAServer } from "node-opcua-server";
|
|
5
6
|
import { ApplicationDescriptionOptions } from "node-opcua-types";
|
|
6
|
-
export interface OPCUAServerPartial extends
|
|
7
|
+
export interface OPCUAServerPartial extends ICertificateKeyPairProviderPriv {
|
|
7
8
|
serverInfo?: ApplicationDescriptionOptions;
|
|
8
9
|
serverCertificateManager: OPCUACertificateManager;
|
|
9
10
|
privateKeyFile: string;
|
|
10
11
|
certificateFile: string;
|
|
11
|
-
$$
|
|
12
|
-
$$
|
|
13
|
-
$$
|
|
12
|
+
$$certificate: null | Certificate;
|
|
13
|
+
$$certificateChain: null | Certificate;
|
|
14
|
+
$$privateKeyPEM: null | PrivateKeyPEM;
|
|
15
|
+
engine: {
|
|
16
|
+
addressSpace?: AddressSpace;
|
|
17
|
+
};
|
|
14
18
|
}
|
|
15
19
|
export declare function installPushCertificateManagementOnServer(server: OPCUAServer): Promise<void>;
|
|
@@ -143,7 +143,7 @@ function onCertificateChange(server) {
|
|
|
143
143
|
_server.$$certificateChain = (0, node_opcua_crypto_1.convertPEMtoDER)(certificatePEM);
|
|
144
144
|
_server.$$privateKeyPEM = privateKeyPEM;
|
|
145
145
|
// note : $$certificate will be reconstructed on demand
|
|
146
|
-
_server.$$certificate =
|
|
146
|
+
_server.$$certificate = (0, node_opcua_crypto_1.split_der)(_server.$$certificateChain)[0];
|
|
147
147
|
setTimeout(() => __awaiter(this, void 0, void 0, function* () {
|
|
148
148
|
try {
|
|
149
149
|
debugLog(chalk.yellow(" onCertificateChange => shutting down channels"));
|
|
@@ -155,7 +155,6 @@ function onCertificateChange(server) {
|
|
|
155
155
|
debugLog(chalk.yellow("channels have been closed -> client should reconnect "));
|
|
156
156
|
}
|
|
157
157
|
catch (err) {
|
|
158
|
-
// tslint:disable:no-console
|
|
159
158
|
if (err instanceof Error) {
|
|
160
159
|
errorLog("Error in CertificateChanged handler ", err.message);
|
|
161
160
|
}
|
|
@@ -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;AAE7B,+BAA+B;AAG/B,yDAA2C;AAE3C,yDAA+G;AAC/G,uDAAgF;AAChF,6DAAkE;
|
|
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;AAE7B,+BAA+B;AAG/B,yDAA2C;AAE3C,yDAA+G;AAC/G,uDAAgF;AAChF,6DAAkE;AAKlE,yFAAsF;AAGtF,4DAA4D;AAC5D,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,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;QACrB,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,aAAa,GAAG,IAAA,6BAAS,EAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;KACvD;IACD,OAAO,IAAI,CAAC,aAAc,CAAC;AAC/B,CAAC;AAED,SAAS,mBAAmB;IACxB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACrE;IACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;AACnC,CAAC;AAED,SAAS,aAAa;IAClB,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;KAClE;IACD,OAAO,IAAI,CAAC,eAAe,CAAC;AAChC,CAAC;AAED,SAAe,cAAc;;QACzB,MAAM,WAAW,GAAa,EAAE,CAAC;QACjC,MAAM,aAAa,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC;QAC7C,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;YACpD,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE;gBAC/B,SAAS;aACZ;YACD,KAAK,MAAM,SAAS,IAAI,aAAa,CAAC,aAAa,CAAE,EAAE;gBACnD,IAAI,MAAM,KAAK,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,QAAQ,KAAK,KAAK,EAAE;oBAC7D,6DAA6D;oBAC7D,SAAS;iBACZ;gBACD,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;aACvC;SACJ;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;CAAA;AAED;;GAEG;AACH,SAAe,OAAO;;QAClB,QAAQ,CAAC,qCAAqC,EAAE,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;QAEtF,IAAY,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAChG,IAAY,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,GAAG,EAAE,CACnD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAChF,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;YACvB,IAAI,CAAC,eAAe,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,wBAAwB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;SAC3F;QAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC1B,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;YAE7C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBACjC,0CAA0C;gBAC1C,uEAAuE;gBAEvE,MAAM,IAAI,GAAG,MAAM,IAAA,iDAA2B,GAAE,CAAC;gBACjD,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;gBAE3C,MAAM,cAAc,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAW,CAAC,cAAe,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC;gBAEpG,MAAM,OAAO,GAAG;oBACZ,cAAc;oBAEd,GAAG,EAAE,CAAC,IAAI,CAAC;oBACX,EAAE,EAAE,WAAW;oBAEf,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW;oBAE9C,SAAS,EAAE,IAAI,IAAI,EAAE;oBAErB,QAAQ,EAAE,GAAG,GAAG,CAAC;oBAEjB,KAAK;oBACL,UAAU,EAAE,eAAe;iBAC9B,CAAC;gBAEF,QAAQ,CAAC,kCAAkC,EAAE,OAAO,CAAC,CAAC;gBACtD,MAAM,IAAI,CAAC,wBAAwB,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;aAC5E;YACD,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;YAE/D,IAAI,CAAC,kBAAkB,GAAG,IAAA,mCAAe,EAAC,cAAc,CAAC,CAAC;YAE1D,mFAAmF;SACtF;IACL,CAAC;CAAA;AAED,SAAS,qBAAqB;IAC1B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;IAChG,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAG,IAAA,mCAAe,EAAC,cAAc,CAAC,CAAC;IAC3D,MAAM,UAAU,GAAG,IAAA,sCAAkB,EAAC,kBAAkB,CAAC,CAAC;IAE1D,OAAO,kBAAkB,CAAC;AAC9B,CAAC;AAED,SAAS,eAAe;IACpB,MAAM,eAAe,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACpF,OAAO,eAAe,CAAC;AAC3B,CAAC;AAED,SAAe,0BAA0B,CAAC,MAAmB;;QACzD,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,sDAAsD,CAAC,CAAC,CAAC;QAC/E,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAChC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,qDAAqD,CAAC,CAAC,CAAC;IAClF,CAAC;CAAA;AAED;;;;;;;;GAQG;AACH,SAAe,mBAAmB,CAAC,MAAmB;;QAClD,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QAElC,MAAM,OAAO,GAAG,MAAmC,CAAC;QAEpD,OAAO,CAAC,eAAe,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,wBAAwB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC9F,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;QACxG,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAEhE,MAAM,cAAc,GAAG,MAAM,CAAC,wBAAwB,CAAC,UAAU,CAAC;QAClE,MAAM,aAAa,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAC9D,8BAA8B;QAE9B,OAAO,CAAC,kBAAkB,GAAG,IAAA,mCAAe,EAAC,cAAc,CAAC,CAAC;QAC7D,OAAO,CAAC,eAAe,GAAG,aAAa,CAAC;QACxC,uDAAuD;QACvD,OAAO,CAAC,aAAa,GAAG,IAAA,6BAAS,EAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjE,UAAU,CAAC,GAAS,EAAE;YAClB,IAAI;gBACA,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,gDAAgD,CAAC,CAAC,CAAC;gBACzE,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC;gBAChC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,4CAA4C,CAAC,CAAC,CAAC;gBAErE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,6CAA6C,CAAC,CAAC,CAAC;gBACtE,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;gBAC/B,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,4CAA4C,CAAC,CAAC,CAAC;gBAErE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,uDAAuD,CAAC,CAAC,CAAC;aACnF;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,GAAG,YAAY,KAAK,EAAE;oBACtB,QAAQ,CAAC,sCAAsC,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;iBACjE;gBACD,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;aAC3B;QACL,CAAC,CAAA,EAAE,IAAI,CAAC,CAAC;IACb,CAAC;CAAA;AAKD,SAAsB,wCAAwC,CAAC,MAAmB;;QAC9E,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE;YAC/C,MAAM,IAAI,KAAK,CACX,yCAAyC;gBACrC,6FAA6F,CACpG,CAAC;SACL;QACD,MAAM,OAAO,CAAC,IAAI,CAAC,MAAmC,CAAC,CAAC;QAExD,MAAM,CAAC,cAAc,GAAG,cAAc,CAAC;QACvC,MAAM,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QACjD,MAAM,CAAC,aAAa,GAAG,aAAa,CAAC;QAErC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE;YACrC,MAAM,YAAY,GAAG,QAAe,CAAC;YACrC,YAAY,CAAC,iBAAiB,GAAG,IAAI,CAAC;YACtC,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC;YAEhC,QAAQ,CAAC,mBAAmB,GAAG,qBAAqB,CAAC;YACrD,QAAQ,CAAC,aAAa,GAAG,eAAe,CAAC;YAEzC,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,oBAAoB,EAAE,EAAE;gBAC7C,8BAA8B;gBAC7B,CAAS,CAAC,gBAAgB,CAAC,mBAAmB,EAAE;oBAC7C,OAAO,QAAQ,CAAC,cAAc,EAAE,CAAC;gBACrC,CAAC,CAAC,CAAC;aACN;SACJ;QAED,MAAM,IAAA,mEAAgC,EAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE;YAC/D,gBAAgB,EAAE,MAAM,CAAC,wBAAwB;YACjD,cAAc,EAAE,MAAM,CAAC,sBAAsB;YAE7C,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,cAAe,IAAI,YAAY;SACpE,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,qBAAqB,CAAE,CAAC;QACxH,MAAM,uBAAuB,GAAG,mBAA8C,CAAC;QAC/E,IAAA,0BAAM,EAAC,uBAAuB,CAAC,uBAAuB,CAAC,CAAC;QAExD,uBAAuB,CAAC,uBAAuB,CAAC,EAAE,CAAC,0BAA0B,EAAE,CAAC,WAAwB,EAAE,EAAE;YACxG,WAAW,CAAC,IAAI,CAAC,GAAwB,EAAE;gBACvC,QAAQ,CAAC,yCAAyC,CAAC,CAAC;gBACpD,MAAM,0BAA0B,CAAC,MAAM,CAAC,CAAC;gBACzC,QAAQ,CAAC,0CAA0C,CAAC,CAAC;YACzD,CAAC,CAAA,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,uBAAuB,CAAC,uBAAuB,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,WAAwB,EAAE,EAAE;YAClG,WAAW,CAAC,IAAI,CAAC,GAAwB,EAAE;gBACvC,QAAQ,CAAC,mCAAmC,CAAC,CAAC;gBAC9C,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAC;gBAClC,QAAQ,CAAC,oCAAoC,CAAC,CAAC;YACnD,CAAC,CAAA,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AAtDD,4FAsDC"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
* @module node-opcua-server-configuration
|
|
3
|
-
*/
|
|
4
|
-
import { AddressSpace, UAObject } from "node-opcua-address-space";
|
|
1
|
+
import { AddressSpace, UACertificateGroup } from "node-opcua-address-space";
|
|
5
2
|
import { PushCertificateManagerServerOptions } from "./push_certificate_manager_server_impl";
|
|
6
|
-
export declare function promoteCertificateGroup(certificateGroup:
|
|
3
|
+
export declare function promoteCertificateGroup(certificateGroup: UACertificateGroup): Promise<void>;
|
|
7
4
|
export declare function installPushCertificateManagement(addressSpace: AddressSpace, options: PushCertificateManagerServerOptions): Promise<void>;
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
/**
|
|
3
|
-
* @module node-opcua-server-configuration
|
|
4
|
-
*/
|
|
5
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
6
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
7
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -13,17 +10,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
13
10
|
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.installPushCertificateManagement = exports.promoteCertificateGroup = void 0;
|
|
13
|
+
/**
|
|
14
|
+
* @module node-opcua-server-configuration
|
|
15
|
+
*/
|
|
16
|
+
const path = require("path");
|
|
17
|
+
const fs = require("fs");
|
|
18
|
+
const node_opcua_address_space_1 = require("node-opcua-address-space");
|
|
19
|
+
const node_opcua_address_space_base_1 = require("node-opcua-address-space-base");
|
|
16
20
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
17
21
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
18
22
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
19
23
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
20
24
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
21
25
|
const node_opcua_constants_1 = require("node-opcua-constants");
|
|
22
|
-
const
|
|
26
|
+
const node_opcua_crypto_1 = require("node-opcua-crypto");
|
|
23
27
|
const push_certificate_manager_server_impl_1 = require("./push_certificate_manager_server_impl");
|
|
24
28
|
const promote_trust_list_1 = require("./promote_trust_list");
|
|
25
29
|
const tools_1 = require("./tools");
|
|
26
30
|
const roles_and_permissions_1 = require("./roles_and_permissions");
|
|
31
|
+
const install_certificate_file_watcher_1 = require("./install_certificate_file_watcher");
|
|
27
32
|
const debugLog = (0, node_opcua_debug_1.make_debugLog)("ServerConfiguration");
|
|
28
33
|
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("ServerConfiguration");
|
|
29
34
|
const warningLog = (0, node_opcua_debug_1.make_warningLog)("ServerConfiguration");
|
|
@@ -194,34 +199,127 @@ function _applyChanges(inputArguments, context) {
|
|
|
194
199
|
return { statusCode };
|
|
195
200
|
});
|
|
196
201
|
}
|
|
202
|
+
function getCertificateFilename(certificateManager) {
|
|
203
|
+
return path.join(certificateManager.rootDir, "own/certs/certificate.pem"); // to do , find a better way
|
|
204
|
+
}
|
|
205
|
+
function getCertificate(certificateManager) {
|
|
206
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
207
|
+
try {
|
|
208
|
+
const certificateFile = getCertificateFilename(certificateManager);
|
|
209
|
+
if (fs.existsSync(certificateFile)) {
|
|
210
|
+
const certificate = yield (0, node_opcua_crypto_1.readCertificate)(certificateFile);
|
|
211
|
+
return certificate;
|
|
212
|
+
}
|
|
213
|
+
return null;
|
|
214
|
+
}
|
|
215
|
+
catch (err) {
|
|
216
|
+
warningLog("getCertificate Error", err.message);
|
|
217
|
+
return null;
|
|
218
|
+
}
|
|
219
|
+
});
|
|
220
|
+
}
|
|
221
|
+
function bindCertificateGroup(certificateGroup, certificateManager) {
|
|
222
|
+
if (certificateManager) {
|
|
223
|
+
const certificateFile = getCertificateFilename(certificateManager);
|
|
224
|
+
const changeDetector = (0, install_certificate_file_watcher_1.installCertificateFileWatcher)(certificateGroup, certificateFile);
|
|
225
|
+
changeDetector.on("certificateChange", () => {
|
|
226
|
+
debugLog("detecting certificate change", certificateFile);
|
|
227
|
+
updateCertificateAlarm();
|
|
228
|
+
});
|
|
229
|
+
}
|
|
230
|
+
function updateCertificateAlarm() {
|
|
231
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
232
|
+
try {
|
|
233
|
+
debugLog("updateCertificateAlarm", certificateGroup.browseName.toString());
|
|
234
|
+
const certificateExpired = certificateGroup.getComponentByName("CertificateExpired");
|
|
235
|
+
if (certificateExpired && certificateManager) {
|
|
236
|
+
const certificateExpiredEx = certificateExpired;
|
|
237
|
+
const certificate = yield getCertificate(certificateManager);
|
|
238
|
+
certificateExpiredEx.setCertificate(certificate);
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
catch (err) {
|
|
242
|
+
warningLog("updateCertificateAlarm Error", err.message);
|
|
243
|
+
}
|
|
244
|
+
});
|
|
245
|
+
}
|
|
246
|
+
const addressSpace = certificateGroup.addressSpace;
|
|
247
|
+
if (!certificateManager) {
|
|
248
|
+
return;
|
|
249
|
+
}
|
|
250
|
+
const trustList = certificateGroup.getComponentByName("TrustList");
|
|
251
|
+
if (trustList) {
|
|
252
|
+
trustList.$$certificateManager = certificateManager;
|
|
253
|
+
}
|
|
254
|
+
const certificateExpired = certificateGroup.getComponentByName("CertificateExpired");
|
|
255
|
+
if (certificateExpired) {
|
|
256
|
+
certificateExpired.$$certificateManager = certificateManager;
|
|
257
|
+
// install alarm handling
|
|
258
|
+
const timerId = setInterval(updateCertificateAlarm, 60 * 1000);
|
|
259
|
+
addressSpace.registerShutdownTask(() => clearInterval(timerId));
|
|
260
|
+
updateCertificateAlarm();
|
|
261
|
+
}
|
|
262
|
+
}
|
|
197
263
|
function bindCertificateManager(addressSpace, options) {
|
|
198
264
|
const serverConfiguration = addressSpace.rootFolder.objects.server.getChildByName("ServerConfiguration");
|
|
199
265
|
const defaultApplicationGroup = serverConfiguration.certificateGroups.getComponentByName("DefaultApplicationGroup");
|
|
200
266
|
if (defaultApplicationGroup) {
|
|
201
|
-
|
|
202
|
-
if (trustList) {
|
|
203
|
-
trustList.$$certificateManager = options.applicationGroup;
|
|
204
|
-
}
|
|
267
|
+
bindCertificateGroup(defaultApplicationGroup, options.applicationGroup);
|
|
205
268
|
}
|
|
206
269
|
const defaultTokenGroup = serverConfiguration.certificateGroups.getComponentByName("DefaultUserTokenGroup");
|
|
207
270
|
if (defaultTokenGroup) {
|
|
208
|
-
|
|
209
|
-
if (trustList) {
|
|
210
|
-
trustList.$$certificateManager = options.userTokenGroup;
|
|
211
|
-
}
|
|
271
|
+
bindCertificateGroup(defaultTokenGroup, options.userTokenGroup);
|
|
212
272
|
}
|
|
213
273
|
}
|
|
274
|
+
function setNotifierOfChain(childObject) {
|
|
275
|
+
if (!childObject) {
|
|
276
|
+
return;
|
|
277
|
+
}
|
|
278
|
+
const parentObject = childObject.parent;
|
|
279
|
+
if (!parentObject) {
|
|
280
|
+
return;
|
|
281
|
+
}
|
|
282
|
+
const notifierOf = childObject.findReferencesEx("HasNotifier", node_opcua_data_model_1.BrowseDirection.Inverse);
|
|
283
|
+
if (notifierOf.length === 0) {
|
|
284
|
+
const notifierOfNode = childObject.addReference({
|
|
285
|
+
referenceType: "HasNotifier",
|
|
286
|
+
nodeId: parentObject.nodeId,
|
|
287
|
+
isForward: false
|
|
288
|
+
});
|
|
289
|
+
}
|
|
290
|
+
parentObject.setEventNotifier(parentObject.eventNotifier | node_opcua_address_space_base_1.EventNotifierFlags.SubscribeToEvents);
|
|
291
|
+
if (parentObject.nodeId.namespace === 0 && parentObject.nodeId.value === node_opcua_constants_1.ObjectIds.Server) {
|
|
292
|
+
return;
|
|
293
|
+
}
|
|
294
|
+
setNotifierOfChain(parentObject);
|
|
295
|
+
}
|
|
214
296
|
function promoteCertificateGroup(certificateGroup) {
|
|
215
297
|
return __awaiter(this, void 0, void 0, function* () {
|
|
216
298
|
const trustList = certificateGroup.getChildByName("TrustList");
|
|
217
299
|
if (trustList) {
|
|
218
|
-
(0, promote_trust_list_1.promoteTrustList)(trustList);
|
|
300
|
+
yield (0, promote_trust_list_1.promoteTrustList)(trustList);
|
|
301
|
+
}
|
|
302
|
+
if (!certificateGroup.certificateExpired) {
|
|
303
|
+
const namespace = certificateGroup.addressSpace.getOwnNamespace();
|
|
304
|
+
// certificateGroup.
|
|
305
|
+
node_opcua_address_space_1.UACertificateExpirationAlarmImpl.instantiate(namespace, "CertificateExpirationAlarmType", {
|
|
306
|
+
browseName: (0, node_opcua_data_model_1.coerceQualifiedName)("0:CertificateExpired"),
|
|
307
|
+
componentOf: certificateGroup,
|
|
308
|
+
conditionSource: null,
|
|
309
|
+
conditionOf: certificateGroup,
|
|
310
|
+
inputNode: node_opcua_nodeid_1.NodeId.nullNodeId,
|
|
311
|
+
normalState: node_opcua_nodeid_1.NodeId.nullNodeId,
|
|
312
|
+
optionals: ["ExpirationLimit"]
|
|
313
|
+
});
|
|
219
314
|
}
|
|
315
|
+
certificateGroup.setEventNotifier(node_opcua_address_space_base_1.EventNotifierFlags.SubscribeToEvents);
|
|
316
|
+
setNotifierOfChain(certificateGroup);
|
|
220
317
|
});
|
|
221
318
|
}
|
|
222
319
|
exports.promoteCertificateGroup = promoteCertificateGroup;
|
|
223
320
|
function installPushCertificateManagement(addressSpace, options) {
|
|
224
321
|
return __awaiter(this, void 0, void 0, function* () {
|
|
322
|
+
addressSpace.installAlarmsAndConditionsService();
|
|
225
323
|
const serverConfiguration = addressSpace.rootFolder.objects.server.getChildByName("ServerConfiguration");
|
|
226
324
|
const serverConfigurationPriv = serverConfiguration;
|
|
227
325
|
if (serverConfigurationPriv.$pushCertificateManager) {
|
|
@@ -254,8 +352,8 @@ function installPushCertificateManagement(addressSpace, options) {
|
|
|
254
352
|
}
|
|
255
353
|
}
|
|
256
354
|
for (const group of certificateGroups.getComponents()) {
|
|
257
|
-
group
|
|
258
|
-
group
|
|
355
|
+
group.setRolePermissions(roles_and_permissions_1.rolePermissionAdminOnly);
|
|
356
|
+
group.setAccessRestrictions(node_opcua_data_model_1.AccessRestrictionsFlag.SigningRequired | node_opcua_data_model_1.AccessRestrictionsFlag.EncryptionRequired);
|
|
259
357
|
if (group.nodeClass === node_opcua_data_model_1.NodeClass.Object) {
|
|
260
358
|
installAccessRestrictionOnGroup(group);
|
|
261
359
|
}
|
|
@@ -285,7 +383,7 @@ function installPushCertificateManagement(addressSpace, options) {
|
|
|
285
383
|
if (serverConfiguration.applyChanges) {
|
|
286
384
|
serverConfiguration.applyChanges.bindMethod(_applyChanges);
|
|
287
385
|
}
|
|
288
|
-
|
|
386
|
+
//xx installCertificateExpirationAlarm(addressSpace);
|
|
289
387
|
const cg = serverConfiguration.certificateGroups.getComponents();
|
|
290
388
|
const defaultApplicationGroup = serverConfiguration.certificateGroups.getComponentByName("DefaultApplicationGroup");
|
|
291
389
|
const certificateTypes = defaultApplicationGroup.getPropertyByName("CertificateTypes");
|
|
@@ -294,10 +392,15 @@ function installPushCertificateManagement(addressSpace, options) {
|
|
|
294
392
|
arrayType: node_opcua_variant_1.VariantArrayType.Array,
|
|
295
393
|
value: [(0, node_opcua_nodeid_1.resolveNodeId)(node_opcua_constants_1.ObjectTypeIds.RsaSha256ApplicationCertificateType)]
|
|
296
394
|
});
|
|
395
|
+
const certificateGroupType = addressSpace.findObjectType("CertificateGroupType");
|
|
297
396
|
for (const certificateGroup of cg) {
|
|
298
397
|
if (certificateGroup.nodeClass !== node_opcua_data_model_1.NodeClass.Object) {
|
|
299
398
|
continue;
|
|
300
399
|
}
|
|
400
|
+
const o = certificateGroup;
|
|
401
|
+
if (!o.typeDefinitionObj.isSupertypeOf(certificateGroupType)) {
|
|
402
|
+
continue;
|
|
403
|
+
}
|
|
301
404
|
yield promoteCertificateGroup(certificateGroup);
|
|
302
405
|
}
|
|
303
406
|
yield bindCertificateManager(addressSpace, options);
|
|
@@ -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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"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* @module node-opcua-server-configuration-server
|
|
5
5
|
*/
|
|
6
6
|
import { EventEmitter } from "events";
|
|
7
|
+
import { SubjectOptions } from "node-opcua-pki";
|
|
7
8
|
import { ByteString } from "node-opcua-basic-types";
|
|
8
9
|
import { Certificate, PrivateKey } from "node-opcua-crypto";
|
|
9
10
|
import { DirectoryName } from "node-opcua-crypto/dist/source/asn1";
|
|
@@ -11,7 +12,6 @@ import { NodeId } from "node-opcua-nodeid";
|
|
|
11
12
|
import { CertificateManager } from "node-opcua-certificate-manager";
|
|
12
13
|
import { StatusCode } from "node-opcua-status-code";
|
|
13
14
|
import { CreateSigningRequestResult, GetRejectedListResult, PushCertificateManager, UpdateCertificateResult } from "../push_certificate_manager";
|
|
14
|
-
import { SubjectOptions } from "node-opcua-pki";
|
|
15
15
|
export declare function certificateMatchesPrivateKey(certificate: Certificate, privateKey: PrivateKey): boolean;
|
|
16
16
|
export interface PushCertificateManagerServerOptions {
|
|
17
17
|
applicationGroup?: CertificateManager;
|
|
@@ -25,14 +25,14 @@ const fs = require("fs");
|
|
|
25
25
|
const path = require("path");
|
|
26
26
|
const util_1 = require("util");
|
|
27
27
|
const rimraf = require("rimraf");
|
|
28
|
-
// node 14 onward : import { readFile, writeFile, readdir } from "fs/promises";
|
|
29
|
-
const { readFile, writeFile, readdir } = fs.promises;
|
|
30
28
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
31
29
|
const node_opcua_basic_types_1 = require("node-opcua-basic-types");
|
|
32
30
|
const node_opcua_crypto_1 = require("node-opcua-crypto");
|
|
33
31
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
34
32
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
35
33
|
const node_opcua_certificate_manager_1 = require("node-opcua-certificate-manager");
|
|
34
|
+
// node 14 onward : import { readFile, writeFile, readdir } from "fs/promises";
|
|
35
|
+
const { readFile, writeFile, readdir } = fs.promises;
|
|
36
36
|
const debugLog = (0, node_opcua_debug_1.make_debugLog)("ServerConfiguration");
|
|
37
37
|
const errorLog = (0, node_opcua_debug_1.make_errorLog)("ServerConfiguration");
|
|
38
38
|
const warningLog = (0, node_opcua_debug_1.make_warningLog)("ServerConfiguration");
|
|
@@ -235,7 +235,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
|
|
|
235
235
|
if (!fs.existsSync(location)) {
|
|
236
236
|
yield fs.promises.mkdir(location);
|
|
237
237
|
}
|
|
238
|
-
|
|
238
|
+
const destCertificateManager = certificateManager;
|
|
239
239
|
const keySize = certificateManager.keySize; // because keySize is private !
|
|
240
240
|
certificateManager = new node_opcua_certificate_manager_1.CertificateManager({
|
|
241
241
|
keySize,
|