node-opcua-secure-channel - npm Package Compare versions

Comparing version 2.1.5 to 2.1.6

dist/source/client/client_secure_channel_layer.d.ts

@@ -0,0 +0,0 @@ /// <reference types="node" />

dist/source/client/client_secure_channel_layer.js

@@ -0,0 +0,0 @@ "use strict";

dist/source/common.d.ts

@@ -0,0 +0,0 @@ /**

dist/source/common.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=common.js.map

dist/source/index.d.ts

@@ -0,0 +0,0 @@ /**

dist/source/index.js

@@ -0,0 +0,0 @@ "use strict";

dist/source/message_builder.d.ts

@@ -0,0 +0,0 @@ /**

dist/source/message_builder.js

@@ -0,0 +0,0 @@ "use strict";

dist/source/message_chunker.d.ts

@@ -0,0 +0,0 @@ /**

dist/source/message_chunker.js

@@ -0,0 +0,0 @@ "use strict";

dist/source/message_header_to_string.d.ts

@@ -0,0 +0,0 @@ /// <reference types="node" />

dist/source/message_header_to_string.js

@@ -0,0 +0,0 @@ "use strict";

dist/source/secure_channel_service.d.ts

@@ -0,0 +0,0 @@ /**

dist/source/secure_channel_service.js

@@ -0,0 +0,0 @@ "use strict";

dist/source/secure_message_chunk_manager.d.ts

@@ -0,0 +0,0 @@ /// <reference types="node" />

dist/source/secure_message_chunk_manager.js

@@ -0,0 +0,0 @@ "use strict";

dist/source/security_policy.d.ts

@@ -65,6 +65,4 @@ /**
     Basic128 = "http://opcfoundation.org/UA/SecurityPolicy#Basic128",
-    Basic128Rsa15 = "http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15",
     Basic192 = "http://opcfoundation.org/UA/SecurityPolicy#Basic192",
     Basic192Rsa15 = "http://opcfoundation.org/UA/SecurityPolicy#Basic192Rsa15",
-    Basic256 = "http://opcfoundation.org/UA/SecurityPolicy#Basic256",
     Basic256Rsa15 = "http://opcfoundation.org/UA/SecurityPolicy#Basic256Rsa15",
@@ -74,3 +72,5 @@ Basic256Sha256 = "http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256",
     PubSub_Aes128_CTR = "http://opcfoundation.org/UA/SecurityPolicy#PubSub_Aes128_CTR",
-    PubSub_Aes256_CTR = "http://opcfoundation.org/UA/SecurityPolicy#PubSub_Aes256_CTR"
+    PubSub_Aes256_CTR = "http://opcfoundation.org/UA/SecurityPolicy#PubSub_Aes256_CTR",
+    Basic128Rsa15 = "http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15",
+    Basic256 = "http://opcfoundation.org/UA/SecurityPolicy#Basic256"
 }
@@ -77,0 +77,0 @@ export declare function fromURI(uri: string | null): SecurityPolicy;

dist/source/security_policy.js

@@ -74,6 +74,4 @@ "use strict";
     SecurityPolicy["Basic128"] = "http://opcfoundation.org/UA/SecurityPolicy#Basic128";
-    SecurityPolicy["Basic128Rsa15"] = "http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15";
     SecurityPolicy["Basic192"] = "http://opcfoundation.org/UA/SecurityPolicy#Basic192";
     SecurityPolicy["Basic192Rsa15"] = "http://opcfoundation.org/UA/SecurityPolicy#Basic192Rsa15";
-    SecurityPolicy["Basic256"] = "http://opcfoundation.org/UA/SecurityPolicy#Basic256";
     SecurityPolicy["Basic256Rsa15"] = "http://opcfoundation.org/UA/SecurityPolicy#Basic256Rsa15";
@@ -85,2 +83,5 @@ SecurityPolicy["Basic256Sha256"] = "http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256";
     SecurityPolicy["PubSub_Aes256_CTR"] = "http://opcfoundation.org/UA/SecurityPolicy#PubSub_Aes256_CTR";
+    // obsoletes
+    SecurityPolicy["Basic128Rsa15"] = "http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15";
+    SecurityPolicy["Basic256"] = "http://opcfoundation.org/UA/SecurityPolicy#Basic256";
 })(SecurityPolicy = exports.SecurityPolicy || (exports.SecurityPolicy = {}));
@@ -87,0 +88,0 @@ function fromURI(uri) {

dist/source/sequence_number_generator.d.ts

@@ -0,0 +0,0 @@ /**

dist/source/sequence_number_generator.js

@@ -0,0 +0,0 @@ "use strict";

dist/source/server/server_secure_channel_layer.d.ts

@@ -87,3 +87,2 @@ /**
      * @property hashKey
-     * @type {String}
      */
@@ -100,3 +99,10 @@ readonly hashKey: number;
     clientNonce: Buffer | null;
+    /**
+     * the channel message security mode
+     */
     securityMode: MessageSecurityMode;
+    /**
+     * the channel message security policy
+     */
+    securityPolicy: SecurityPolicy;
     securityHeader: AsymmetricAlgorithmSecurityHeader | null;
@@ -103,0 +109,0 @@ clientSecurityHeader?: SecurityHeader;

dist/source/server/server_secure_channel_layer.js

@@ -80,59 +80,8 @@ "use strict";
 class ServerSecureChannelLayer extends events_1.EventEmitter {
-    get securityTokenCount() {
-        node_opcua_assert_1.assert(_.isNumber(this.lastTokenId));
-        return this.lastTokenId;
-    }
-    get remoteAddress() {
-        return this._remoteAddress;
-    }
-    get remotePort() {
-        return this._remotePort;
-    }
-    /**
-     *
-     */
-    get aborted() {
-        return this._abort_has_been_called;
-    }
-    /**
-     * the number of bytes read so far by this channel
-     */
-    get bytesRead() {
-        return this.transport ? this.transport.bytesRead : 0;
-    }
-    /**
-     * the number of bytes written so far by this channel
-     */
-    get bytesWritten() {
-        return this.transport ? this.transport.bytesWritten : 0;
-    }
-    get transactionsCount() {
-        return this._transactionsCount;
-    }
-    /**
-     * true when the secure channel has been opened successfully
-     *
-     */
-    get isOpened() {
-        return !!this.clientCertificate;
-    }
-    /**
-     * true when the secure channel is assigned to a active session
-     */
-    get hasSession() {
-        return Object.keys(this.sessionTokens).length > 0;
-    }
-    get certificateManager() {
-        return this.parent.certificateManager;
-    }
-    /**
-     * The unique hash key to identify this secure channel
-     * @property hashKey
-     * @type {String}
-     */
-    get hashKey() {
-        return this.__hash;
-    }
     constructor(options) {
         super();
+        /**
+         * the channel message security policy
+         */
+        this.securityPolicy = security_policy_1.SecurityPolicy.Invalid;
         this._on_response = null;
@@ -203,2 +152,56 @@ this.__verifId = {};
     }
+    get securityTokenCount() {
+        node_opcua_assert_1.assert(_.isNumber(this.lastTokenId));
+        return this.lastTokenId;
+    }
+    get remoteAddress() {
+        return this._remoteAddress;
+    }
+    get remotePort() {
+        return this._remotePort;
+    }
+    /**
+     *
+     */
+    get aborted() {
+        return this._abort_has_been_called;
+    }
+    /**
+     * the number of bytes read so far by this channel
+     */
+    get bytesRead() {
+        return this.transport ? this.transport.bytesRead : 0;
+    }
+    /**
+     * the number of bytes written so far by this channel
+     */
+    get bytesWritten() {
+        return this.transport ? this.transport.bytesWritten : 0;
+    }
+    get transactionsCount() {
+        return this._transactionsCount;
+    }
+    /**
+     * true when the secure channel has been opened successfully
+     *
+     */
+    get isOpened() {
+        return !!this.clientCertificate;
+    }
+    /**
+     * true when the secure channel is assigned to a active session
+     */
+    get hasSession() {
+        return Object.keys(this.sessionTokens).length > 0;
+    }
+    get certificateManager() {
+        return this.parent.certificateManager;
+    }
+    /**
+     * The unique hash key to identify this secure channel
+     * @property hashKey
+     */
+    get hashKey() {
+        return this.__hash;
+    }
     dispose() {
@@ -967,2 +970,3 @@ debugLog("ServerSecureChannelLayer#dispose");
         this.securityMode = request.securityMode;
+        this.securityPolicy = securityPolicy;
         this.messageBuilder.securityMode = this.securityMode;
@@ -969,0 +973,0 @@ const hasEndpoint = this.has_endpoint_for_security_mode_and_policy(this.securityMode, securityPolicy);

dist/source/services.d.ts

@@ -0,0 +0,0 @@ /**

dist/source/services.js

@@ -0,0 +0,0 @@ "use strict";

dist/test_helpers/decompose_message_body_in_chunks.d.ts

@@ -0,0 +0,0 @@ /// <reference types="node" />

dist/test_helpers/decompose_message_body_in_chunks.js

@@ -0,0 +0,0 @@ "use strict";

dist/test_helpers/fake_message_chunk_factory.d.ts

@@ -0,0 +0,0 @@ /// <reference types="node" />

dist/test_helpers/fake_message_chunk_factory.js

@@ -0,0 +0,0 @@ "use strict";

dist/test_helpers/index.d.ts

@@ -0,0 +0,0 @@ export * from "./fake_message_chunk_factory";

dist/test_helpers/index.js

@@ -0,0 +0,0 @@ "use strict";

dist/test_helpers/mock/mock_transport.d.ts

@@ -0,0 +0,0 @@ /// <reference types="node" />

dist/test_helpers/mock/mock_transport.js

@@ -0,0 +0,0 @@ "use strict";

dist/test_helpers/signature_helpers.d.ts

@@ -0,0 +0,0 @@ /// <reference types="node" />

dist/test_helpers/signature_helpers.js

@@ -0,0 +0,0 @@ "use strict";

dist/test_helpers/verify_message_chunk.d.ts

@@ -0,0 +0,0 @@ /// <reference types="node" />

dist/test_helpers/verify_message_chunk.js

@@ -0,0 +0,0 @@ "use strict";

package.json

 {
  "name": "node-opcua-secure-channel",
- "version": "2.1.5",
+ "version": "2.1.6",
  "description": "pure nodejs OPCUA SDK - module -secure-channel",
@@ -17,23 +17,23 @@ "main": "./dist/source/index.js",
   "node-opcua-assert": "^2.0.0",
-  "node-opcua-basic-types": "^2.1.5",
+  "node-opcua-basic-types": "^2.1.6",
   "node-opcua-binary-stream": "^2.1.0",
-  "node-opcua-certificate-manager": "^2.1.5",
-  "node-opcua-chunkmanager": "^2.1.5",
-  "node-opcua-common": "^2.1.5",
+  "node-opcua-certificate-manager": "^2.1.6",
+  "node-opcua-chunkmanager": "^2.1.6",
+  "node-opcua-common": "^2.1.6",
   "node-opcua-crypto": "^1.1.2",
   "node-opcua-debug": "^2.1.0",
   "node-opcua-enum": "^2.1.0",
-  "node-opcua-factory": "^2.1.5",
-  "node-opcua-nodeid": "^2.1.5",
+  "node-opcua-factory": "^2.1.6",
+  "node-opcua-nodeid": "^2.1.6",
   "node-opcua-object-registry": "^2.1.0",
-  "node-opcua-packet-analyzer": "^2.1.5",
-  "node-opcua-service-secure-channel": "^2.1.5",
-  "node-opcua-status-code": "^2.1.5",
-  "node-opcua-transport": "^2.1.5",
-  "node-opcua-types": "^2.1.5",
-  "node-opcua-utils": "^2.1.5",
+  "node-opcua-packet-analyzer": "^2.1.6",
+  "node-opcua-service-secure-channel": "^2.1.6",
+  "node-opcua-status-code": "^2.1.6",
+  "node-opcua-transport": "^2.1.6",
+  "node-opcua-types": "^2.1.6",
+  "node-opcua-utils": "^2.1.6",
   "underscore": "^1.9.1"
  },
  "devDependencies": {
-  "@types/node": "^12.7.1",
+  "@types/node": "^12.7.4",
   "@types/underscore": "^1.9.2",
@@ -43,11 +43,11 @@ "async": "^3.1.0",
   "node-opcua-leak-detector": "^2.1.0",
-  "node-opcua-packet-analyzer": "^2.1.2",
-  "node-opcua-service-browse": "^2.1.5",
-  "node-opcua-service-endpoints": "^2.1.5",
-  "node-opcua-service-read": "^2.1.5",
-  "node-opcua-service-session": "^2.1.5",
+  "node-opcua-packet-analyzer": "^2.1.5",
+  "node-opcua-service-browse": "^2.1.6",
+  "node-opcua-service-endpoints": "^2.1.6",
+  "node-opcua-service-read": "^2.1.6",
+  "node-opcua-service-session": "^2.1.6",
   "node-opcua-test-fixtures": "^2.1.5",
   "node-opcua-test-helpers": "^2.0.0",
   "should": "13.2.3",
-  "sinon": "^7.4.1",
+  "sinon": "^7.4.2",
   "source-map-support": "^0.5.13",
@@ -71,3 +71,3 @@ "sprintf-js": "^1.1.2"
  "homepage": "http://node-opcua.github.io/",
- "gitHead": "18e171c2f17e0fbbc7a7ea0f383a239a7bbd06d8"
+ "gitHead": "c8e1607923cd5bbb4cd916a5d26d9d8e4948df41"
 }

source/client/client_secure_channel_layer.ts

@@ -0,0 +0,0 @@ /**

source/common.ts

@@ -0,0 +0,0 @@ /**

source/index.ts

@@ -0,0 +0,0 @@ /**

source/message_builder.ts

@@ -0,0 +0,0 @@ /**

source/message_chunker.ts

@@ -0,0 +0,0 @@ /**

source/message_header_to_string.ts

@@ -0,0 +0,0 @@ /**

source/secure_channel_service.ts

@@ -0,0 +0,0 @@ /**

source/secure_message_chunk_manager.ts

@@ -0,0 +0,0 @@ /**

source/security_policy.ts

@@ -99,6 +99,4 @@ /**
     Basic128 = "http://opcfoundation.org/UA/SecurityPolicy#Basic128",
-    Basic128Rsa15 = "http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15", // Obsolete
     Basic192 = "http://opcfoundation.org/UA/SecurityPolicy#Basic192",
     Basic192Rsa15 = "http://opcfoundation.org/UA/SecurityPolicy#Basic192Rsa15",
-    Basic256 = "http://opcfoundation.org/UA/SecurityPolicy#Basic256",           // obsolete
     Basic256Rsa15 = "http://opcfoundation.org/UA/SecurityPolicy#Basic256Rsa15",
@@ -110,3 +108,8 @@ Basic256Sha256 = "http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256",
     PubSub_Aes128_CTR = "http://opcfoundation.org/UA/SecurityPolicy#PubSub_Aes128_CTR",
-    PubSub_Aes256_CTR = "http://opcfoundation.org/UA/SecurityPolicy#PubSub_Aes256_CTR"
+    PubSub_Aes256_CTR = "http://opcfoundation.org/UA/SecurityPolicy#PubSub_Aes256_CTR",
+
+    // obsoletes
+    Basic128Rsa15 = "http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15", // Obsolete
+    Basic256 = "http://opcfoundation.org/UA/SecurityPolicy#Basic256",           // obsolete
+
 }
@@ -119,3 +122,3 @@
     }
-    const a: any = uri.split("#");
+    const a: string[] = uri.split("#");
     // istanbul ignore next
@@ -125,3 +128,3 @@ if (a.length < 2) {
     }
-    const v = SecurityPolicy[a[1]];
+    const v = (SecurityPolicy as any)[ a[1] ];
     return v as SecurityPolicy || SecurityPolicy.Invalid;
@@ -132,6 +135,6 @@ }
     if (typeof value === "string") {
-        const a: any = value.split("#");
+        const a: string[] = value.split("#");
         // istanbul ignore next
         if (a.length < 2) {
-            return SecurityPolicy[value as any];
+            return (SecurityPolicy as any)[value as any];
         }
@@ -154,3 +157,3 @@ return value;
     if (value === "Basic128Rsa15" || value === "Basic256" ||  value === "Basic192Rsa15" || value === "None" || value === "Basic256Sha256" || value === "Basic256Rsa15") {
-        return SecurityPolicy[value] as SecurityPolicy;
+        return (SecurityPolicy as any)[value as string] as SecurityPolicy;
     }
@@ -157,0 +160,0 @@ if (!(

source/sequence_number_generator.ts

@@ -0,0 +0,0 @@ /**

source/server/server_secure_channel_layer.ts

@@ -228,5 +228,4 @@ /**
      * @property hashKey
-     * @type {String}
      */
-    public get hashKey() {
+    public get hashKey(): number {
         return this.__hash;
@@ -244,3 +243,10 @@ }
     public clientNonce: Buffer | null;
+    /**
+     * the channel message security mode
+     */
     public securityMode: MessageSecurityMode;
+    /**
+     * the channel message security policy
+     */
+    public securityPolicy: SecurityPolicy = SecurityPolicy.Invalid;
     public securityHeader: AsymmetricAlgorithmSecurityHeader | null;
@@ -1348,2 +1354,4 @@ public clientSecurityHeader?: SecurityHeader;
         this.securityMode = request.securityMode;
+        this.securityPolicy = securityPolicy;
+
         this.messageBuilder.securityMode = this.securityMode;
@@ -1350,0 +1358,0 @@

source/services.ts

@@ -0,0 +0,0 @@ /**

test_helpers/decompose_message_body_in_chunks.ts

@@ -0,0 +0,0 @@ import {  assert } from "node-opcua-assert";

test_helpers/fake_message_chunk_factory.ts

@@ -0,0 +0,0 @@ import * as fs from "fs";

test_helpers/index.ts

@@ -0,0 +0,0 @@ export * from "./fake_message_chunk_factory";

test_helpers/mock/mock_transport.ts

@@ -0,0 +0,0 @@ // tslint:disable:no-console

test_helpers/signature_helpers.ts

@@ -0,0 +0,0 @@ import * as  fs from "fs";

test_helpers/verify_message_chunk.ts

@@ -0,0 +0,0 @@ // tslint:disable:no-console

tsconfig.json

@@ -0,0 +0,0 @@ {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

499931

increased by2.07%

Lines of code

8516

increased by0.22%

Dependency changes

• + Addedis-typed-array@1.1.15(transitive)

• + Addedmath-intrinsics@1.1.0(transitive)

• + Addedobject.assign@4.1.7(transitive)

• + Addedwhich-typed-array@1.1.18(transitive)

• - Removedis-typed-array@1.1.14(transitive)

• - Removedmath-intrinsics@1.0.0(transitive)

• - Removedobject.assign@4.1.5(transitive)

• - Removedwhich-typed-array@1.1.16(transitive)

• Updatednode-opcua-basic-types@^2.1.6

• Updatednode-opcua-certificate-manager@^2.1.6

• Updatednode-opcua-chunkmanager@^2.1.6

• Updatednode-opcua-common@^2.1.6

• Updatednode-opcua-factory@^2.1.6

• Updatednode-opcua-nodeid@^2.1.6

• Updatednode-opcua-packet-analyzer@^2.1.6

• Updatednode-opcua-service-secure-channel@^2.1.6

• Updatednode-opcua-status-code@^2.1.6

• Updatednode-opcua-transport@^2.1.6

• Updatednode-opcua-types@^2.1.6

• Updatednode-opcua-utils@^2.1.6