node-opcua-client 2.107.0 → 2.109.0

package/source/private/opcua_client_impl.ts

@@ -1,19 +1,14 @@
 /**
  * @module node-opcua-client-private
  */
-// tslint:disable:variable-name
-// tslint:disable:no-console
-// tslint:disable:no-empty
-
-import * as crypto from "crypto";
-import { createPublicKey } from "crypto";
 import { callbackify } from "util";
+import { randomBytes, createPublicKey } from "crypto";
 import * as async from "async";
 import chalk from "chalk";
 
 import { assert } from "node-opcua-assert";
 import { createFastUninitializedBuffer } from "node-opcua-buffer-utils";
-import { Certificate, exploreCertificate, extractPublicKeyFromCertificateSync, Nonce, PrivateKey, toPem } from "node-opcua-crypto";
+import { Certificate, exploreCertificate, extractPublicKeyFromCertificateSync, makePrivateKeyFromPem, PrivateKey, Nonce, toPem } from "node-opcua-crypto";
 
 import { LocalizedText } from "node-opcua-data-model";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
@@ -312,7 +307,7 @@ function _adjustRevisedSessionTimeout(revisedSessionTimeout: number, requestedTi
  */
 export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
     public static minimumRevisedSessionTimeout = 100.0;
-    private _retryCreateSessionTimer?: NodeJS.Timer;
+    private _retryCreateSessionTimer?: NodeJS.Timeout;
 
     public static create(options: OPCUAClientOptions): OPCUAClient {
         return new OPCUAClientImpl(options);
@@ -849,7 +844,7 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
 
         // note : do not confuse CreateSessionRequest.clientNonce with OpenSecureChannelRequest.clientNonce
         //        which are two different nonce, with different size (although they share the same name )
-        this.clientNonce = crypto.randomBytes(32);
+        this.clientNonce = randomBytes(32);
 
         // recycle session name if already exists
         const sessionName = session.name;
@@ -1262,7 +1257,7 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
 
                 case UserTokenType.Certificate: {
                     const certificate = userIdentityInfo.certificateData;
-                    const privateKey = crypto.createPrivateKey(userIdentityInfo.privateKey);
+                    const privateKey = makePrivateKeyFromPem(userIdentityInfo.privateKey);
                     ({ userIdentityToken, userTokenSignature } = createX509IdentityToken(context, certificate, privateKey));
                     break;
                 }

package/source/reconnection.ts

@@ -475,10 +475,11 @@ export function repair_client_session(client: IClientBase, session: ClientSessio
                 return;
             }
 
-            console.log("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! DELETE ME");
             privateSession._reconnecting.reconnecting = false;
-            errorLog("Session has been restored");
+
+            // warningLog("Session has been restored");
             doDebug && debugLog(chalk.yellow("session has been restored"), session.sessionId.toString());
+           
             session.emit("session_restored");
             const otherCallbacks = privateSession._reconnecting.pendingCallbacks;
             privateSession._reconnecting.pendingCallbacks = [];

package/source/verify.ts

@@ -1,15 +1,14 @@
-import { createPrivateKey } from "crypto";
 import { OPCUACertificateManager } from "node-opcua-certificate-manager";
 import { OPCUASecureObject } from "node-opcua-common";
 
 import {
     Certificate,
-    convertPEMtoDER,
     exploreCertificate,
     explorePrivateKey,
     publicKeyAndPrivateKeyMatches
 } from "node-opcua-crypto";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
+import { VerifyCertificateOptions } from "node-opcua-pki";
 
 const doDebug = checkDebugFlag(__filename);
 const debugLog = make_debugLog(__filename);
@@ -152,7 +151,14 @@ export async function performCertificateSanityCheck(
     }
     // verify that the certificate has a valid date and has expected extensions fields such as DNS and IP.
     const status1 = await certificateManager.trustCertificate(certificate);
-    const status = await certificateManager.verifyCertificateAsync(certificate);
+
+    const options: VerifyCertificateOptions = {
+        acceptOutdatedCertificate: false,
+        acceptOutDatedIssuerCertificate: false,
+        acceptPendingCertificate: false,
+    };
+
+    const status = await certificateManager.verifyCertificate(certificate, options);
 
     if (status !== "Good") {
         warningLog("[NODE-OPCUA-W04] Warning: the certificate status is = ", status, " file = ", secureObject.certificateFile);