node-opcua-client 2.84.0 → 2.86.0

package/source/client_session_keepalive_manager.ts

@@ -158,7 +158,7 @@ export class ClientSessionKeepAliveManager extends EventEmitter implements Clien
                     return;
                 }
 
-                if (dataValue.statusCode === StatusCodes.Good) {
+                if (dataValue.statusCode.isGood()) {
                     const newState = dataValue.value.value as ServerState;
                     // istanbul ignore next
                     if (newState !== this.lastKnownState && this.lastKnownState) {

package/source/client_utils.ts

@@ -83,7 +83,7 @@ export function readUAAnalogItem(session: ClientSession, nodeId: NodeIdLike, ...
         const nodesToRead: ReadValueIdOptions[] = [];
 
         function processProperty(browsePathResult: BrowsePathResult, propertyName: string) {
-            if (browsePathResult.statusCode === StatusCodes.Good) {
+            if (browsePathResult.statusCode.isGood()) {
                 browsePathResult.targets = browsePathResult.targets || [];
                 nodesToRead.push({
                     attributeId: AttributeIds.Value,

package/source/private/client_base_impl.ts

@@ -579,9 +579,10 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
                             "the server certificate has changed,  we need to retrieve server certificate again: ",
                             err.message
                         );
+                        const oldServerCertificate = this.serverCertificate;
                         warningLog(
                             "old server certificate ",
-                            this.serverCertificate ? makeSHA1Thumbprint(this.serverCertificate!).toString("hex") : "undefined"
+                            oldServerCertificate ? makeSHA1Thumbprint(oldServerCertificate!).toString("hex") : "undefined"
                         );
                         // the server may have shut down the channel because its certificate
                         // has changed ....
@@ -590,7 +591,19 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
                             if (err1) {
                                 return _failAndRetry(err1, "Failing to fetch new server certificate", callback);
                             }
-                            warningLog("new server certificate ", makeSHA1Thumbprint(this.serverCertificate!).toString("hex"));
+                            const newServerCertificate = this.serverCertificate!;
+                            warningLog("new server certificate ", makeSHA1Thumbprint(newServerCertificate).toString("hex"));
+
+                            const sha1Old = makeSHA1Thumbprint(oldServerCertificate!);
+                            const sha1New = makeSHA1Thumbprint(newServerCertificate);
+                            if (sha1Old === sha1New) {
+                                warningLog("server certificate has not changed, but was expected to have changed");
+                                return _failAndRetry(
+                                    new Error("Server Certificate not changed"),
+                                    "Failing to fetch new server certificate",
+                                    callback
+                                );
+                            }
                             this._internal_create_secure_channel(infiniteConnectionRetry, (err3?: Error | null) => {
                                 if (err3) {
                                     return _failAndRetry(err3, "trying to create new channel with new certificate", callback);

package/source/private/client_monitored_item_impl.ts

@@ -310,7 +310,7 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
         this.statusCode = monitoredItemResult.statusCode;
 
         /* istanbul ignore else */
-        if (monitoredItemResult.statusCode === StatusCodes.Good) {
+        if (monitoredItemResult.statusCode.isGood()) {
             this.result = monitoredItemResult;
             this.monitoredItemId = monitoredItemResult.monitoredItemId;
             this.monitoringParameters.samplingInterval = monitoredItemResult.revisedSamplingInterval;
@@ -348,7 +348,7 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
     public _after_create(monitoredItemResult: MonitoredItemCreateResult): void {
         this._applyResult(monitoredItemResult);
 
-        if (this.statusCode === StatusCodes.Good) {
+        if (this.statusCode.isGood()) {
             /**
              * Notify the observers that the monitored item is now fully initialized.
              * @event initialized
@@ -366,7 +366,7 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
     }
 
     public _terminate_and_emit(err?: Error): void {
-        if (this.statusCode.value === StatusCodes.Bad.value) {
+        if ((this as any)._terminated) {
             return; // already terminated
         }
         if (err) {
@@ -380,8 +380,7 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
          */
         this.emit("terminated", err);
         this.removeAllListeners();
-        this.statusCode = StatusCodes.Bad;
-
+    
         // also remove from subscription
         const clientHandle = this.monitoringParameters.clientHandle;
         delete this.subscription.monitoredItems[clientHandle];

package/source/private/client_session_impl.ts

@@ -520,7 +520,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
      * ```javascript
      *     session.readVariableValue("ns=2;s=Furnace_1.Temperature",function(err,dataValue) {
      *        if(err) { return callback(err); }
-     *        if (dataValue.statusCode === opcua.StatusCodes.Good) {
+     *        if (dataValue.isGood()) {
      *        }
      *        console.log(dataValue.toString());
      *        callback();
@@ -1091,7 +1091,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
      *
      *  ``` javascript
      *  session.readAllAttributes("ns=2;s=Furnace_1.Temperature",function(err,data) {
-     *    if(data.statusCode === StatusCodes.Good) {
+     *    if(data.statusCode.isGood()) {
      *      console.log(" nodeId      = ",data.nodeId.toString());
      *      console.log(" browseName  = ",data.browseName.toString());
      *      console.log(" description = ",data.description.toString());
@@ -2099,7 +2099,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
                 }
 
                 /* istanbul ignore next */
-                if (dataValue.statusCode !== StatusCodes.Good) {
+                if (dataValue.statusCode.isNotGood()) {
                     return callback(new Error("readNamespaceArray : " + dataValue.statusCode.toString()));
                 }
                 assert(dataValue.value.value instanceof Array);

package/source/private/client_subscription_impl.ts

@@ -428,7 +428,7 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
             if (!statusCode) {
                 return callback(new Error("Internal Error"));
             }
-            if (statusCode !== StatusCodes.Good) {
+            if (statusCode.isNotGood()) {
                 return callback(null, statusCode);
             }
             callback(null, StatusCodes.Good);

package/source/private/opcua_client_impl.ts

@@ -6,6 +6,7 @@
 // tslint:disable:no-empty
 
 import * as crypto from "crypto";
+import { createPublicKey } from "crypto";
 import { callbackify } from "util";
 import * as async from "async";
 import * as chalk from "chalk";
@@ -17,13 +18,14 @@ import {
     exploreCertificate,
     extractPublicKeyFromCertificateSync,
     Nonce,
+    PrivateKey,
     PrivateKeyPEM,
     toPem
 } from "node-opcua-crypto";
 
 import { LocalizedText } from "node-opcua-data-model";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
-import { extractFullyQualifiedDomainName, getHostname, resolveFullyQualifiedDomainName } from "node-opcua-hostname";
+import { extractFullyQualifiedDomainName } from "node-opcua-hostname";
 import { ClientSecureChannelLayer, computeSignature, fromURI, getCryptoFactory, SecurityPolicy } from "node-opcua-secure-channel";
 import { ApplicationDescriptionOptions, ApplicationType, EndpointDescription, UserTokenType } from "node-opcua-service-endpoints";
 import { MessageSecurityMode, UserTokenPolicy } from "node-opcua-service-secure-channel";
@@ -31,8 +33,6 @@ import {
     ActivateSessionRequest,
     ActivateSessionResponse,
     AnonymousIdentityToken,
-    CloseSessionRequest,
-    CloseSessionResponse,
     CreateSessionRequest,
     CreateSessionResponse,
     UserNameIdentityToken,
@@ -41,7 +41,7 @@ import {
 import { CallbackT, StatusCode, StatusCodes } from "node-opcua-status-code";
 import { ErrorCallback, Callback } from "node-opcua-status-code";
 
-import { SignatureData, SignatureDataOptions, UserIdentityToken } from "node-opcua-types";
+import { SignatureDataOptions, UserIdentityToken } from "node-opcua-types";
 import { isNullOrUndefined, matchUri } from "node-opcua-utils";
 
 import { ClientSession } from "../client_session";
@@ -132,7 +132,7 @@ interface X509TokenAndSignature {
 function createX509IdentityToken(
     context: IdentityTokenContext,
     certificate: Certificate,
-    privateKey: PrivateKeyPEM
+    privateKey: PrivateKey
 ): X509TokenAndSignature {
     const endpoint = context.endpoint;
     assert(endpoint instanceof EndpointDescription);
@@ -250,7 +250,7 @@ function createUserNameIdentityToken(
 
     assert(serverCertificate instanceof Buffer);
     serverCertificate = toPem(serverCertificate, "CERTIFICATE");
-    const publicKey = extractPublicKeyFromCertificateSync(serverCertificate);
+    const publicKey = createPublicKey(extractPublicKeyFromCertificateSync(serverCertificate));
 
     const serverNonce: Nonce = session.serverNonce || Buffer.alloc(0);
     assert(serverNonce instanceof Buffer);
@@ -1236,7 +1236,7 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
 
                 case UserTokenType.Certificate: {
                     const certificate = userIdentityInfo.certificateData;
-                    const privateKey = userIdentityInfo.privateKey;
+                    const privateKey = crypto.createPrivateKey(userIdentityInfo.privateKey);
                     ({ userIdentityToken, userTokenSignature } = createX509IdentityToken(context, certificate, privateKey));
                     break;
                 }

package/source/reconnection.ts

@@ -8,7 +8,7 @@ import * as chalk from "chalk";
 import { assert } from "node-opcua-assert";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
 import { TransferSubscriptionsRequest, TransferSubscriptionsResponse } from "node-opcua-service-subscription";
-import { CallbackT, StatusCodes } from "node-opcua-status-code";
+import { CallbackT, StatusCode, StatusCodes } from "node-opcua-status-code";
 import { ErrorCallback } from "node-opcua-status-code";
 import { CloseSessionRequest } from "node-opcua-types";
 
@@ -320,7 +320,7 @@ function repair_client_session_by_recreating_a_new_session(
                         // those one need to be recreated and repaired ....
                         for (let i = 0; i < results.length; i++) {
                             const statusCode = results[i].statusCode;
-                            if (statusCode === StatusCodes.BadSubscriptionIdInvalid) {
+                            if (statusCode.equals(StatusCodes.BadSubscriptionIdInvalid)) {
                                 // repair subscription
                                 debugLog(
                                     chalk.red("         WARNING SUBSCRIPTION  "),

package/source/tools/read_history_server_capabilities.ts

@@ -41,7 +41,7 @@ export function readHistoryServerCapabilities(
         if (!result) {
             return callback(new Error("Internal Error"));
         }
-        if (result.statusCode !== StatusCodes.Good) {
+        if (result.statusCode.isNotGood()) {
             return callback(new Error("StatusCode = " + result.statusCode.toString()));
         }
 
@@ -89,7 +89,7 @@ export function readHistoryServerCapabilities(
             }
 
             const nodeIds = results.map((innerResult: BrowsePathResult) =>
-                innerResult.statusCode === StatusCodes.Good && innerResult.targets
+                innerResult.statusCode.isGood() && innerResult.targets
                     ? innerResult.targets[0].targetId
                     : new NodeId()
             );

package/source/verify.ts

@@ -1,3 +1,4 @@
+import { createPrivateKey } from "crypto";
 import { OPCUACertificateManager } from "node-opcua-certificate-manager";
 import { OPCUASecureObject } from "node-opcua-common";
 
@@ -126,7 +127,7 @@ export async function performCertificateSanityCheck(
 ): Promise<void> {
     // verify that certificate is matching private key, and inform the developper if not
     const certificate = this.getCertificate();
-    const privateKey = convertPEMtoDER(this.getPrivateKey());
+    const privateKey = this.getPrivateKey();
     //
     if (!publicKeyAndPrivateKeyMatches(certificate, privateKey)) {
         errorLog("[NODE-OPCUA-E01] Configuration error : the certificate and the private key do not match !");