node-opcua-server 2.165.2 → 2.167.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/base_server.js +1 -3
- package/dist/base_server.js.map +1 -1
- package/dist/extract_password_from_blob.d.ts +29 -0
- package/dist/extract_password_from_blob.js +55 -0
- package/dist/extract_password_from_blob.js.map +1 -0
- package/dist/opcua_server.js +6 -6
- package/dist/opcua_server.js.map +1 -1
- package/dist/register_server_manager.d.ts +8 -8
- package/dist/register_server_manager.js +40 -40
- package/dist/register_server_manager.js.map +1 -1
- package/dist/server_end_point.d.ts +2 -2
- package/dist/server_end_point.js +5 -12
- package/dist/server_end_point.js.map +1 -1
- package/package.json +42 -41
- package/source/base_server.ts +2 -4
- package/source/extract_password_from_blob.ts +74 -0
- package/source/opcua_server.ts +21 -15
- package/source/register_server_manager.ts +75 -72
- package/source/server_end_point.ts +16 -23
package/dist/base_server.js
CHANGED
|
@@ -274,9 +274,7 @@ class OPCUABaseServer extends node_opcua_common_1.OPCUASecureObject {
|
|
|
274
274
|
// recreate with current hostnames
|
|
275
275
|
await this.createDefaultCertificate();
|
|
276
276
|
// invalidate cached cert so next getCertificate() reloads from disk
|
|
277
|
-
|
|
278
|
-
priv.$$certificate = null;
|
|
279
|
-
priv.$$certificateChain = null;
|
|
277
|
+
(0, node_opcua_common_1.invalidateCachedSecrets)(this);
|
|
280
278
|
}
|
|
281
279
|
_checkCertificateSanMismatch() {
|
|
282
280
|
try {
|
package/dist/base_server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base_server.js","sourceRoot":"","sources":["../source/base_server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"base_server.js","sourceRoot":"","sources":["../source/base_server.ts"],"names":[],"mappings":";AAAA;;GAEG;AACH,4BAA4B;;;;;;AAE5B,sDAAyB;AACzB,sDAAyB;AACzB,0DAA6B;AAC7B,uCAAgC;AAChC,sDAA+C;AAC/C,kDAA0B;AAC1B,kDAA0B;AAC1B,yDAA2C;AAC3C,mFAAyH;AACzH,yDAAkE;AAClE,yDAAmI;AACnI,+CAA2D;AAC3D,iEAA4D;AAC5D,+DAAwG;AACxG,uDAAkI;AAClI,6DAO6B;AAE7B,+EAAuF;AACvF,+EAA6G;AAC7G,yFAAiE;AACjE,mEAAsE;AAEtE,uDAA0E;AAK1E,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,UAAU,CAAC,CAAC;AAE/C,MAAM,mBAAmB,GAAG;IACxB,mFAAmF;IACnF,wDAAwD;IACxD,cAAc,EAAE,IAAA,sCAAkB,EAAC,iBAAE,CAAC,QAAQ,EAAE,EAAE,kBAAkB,CAAC;IAErE,kDAAkD;IAClD,UAAU,EAAE,kBAAkB;IAE9B,oDAAoD;IACpD,eAAe,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE;IACpD,eAAe,EAAE,8CAAe,CAAC,MAAM;IACvC,gBAAgB,EAAE,EAAE;IAEpB,mBAAmB,EAAE,EAAE;IAEvB,aAAa,EAAE,EAAE;CACpB,CAAC;AAEF,SAAS,eAAe,CAAC,QAA6B;IAClD,IAAI,QAAQ,CAAC,eAAe,EAAE,CAAC;QAC3B,IAAA,0BAAM,EAAC,OAAO,QAAQ,CAAC,eAAe,KAAK,UAAU,CAAC,CAAC;QACvD,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;QAChE,QAAQ,CAAC,eAAe,GAAG,SAAS,CAAC;IACzC,CAAC;IAED,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAC7B,IAAA,0BAAM,EAAC,OAAO,QAAQ,CAAC,iBAAiB,KAAK,UAAU,CAAC,CAAC;QACzD,QAAQ,CAAC,cAAc,CAAC,cAAc,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QACpE,QAAQ,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAC3C,CAAC;IACD,IAAI,QAAQ,CAAC,qBAAqB,EAAE,CAAC;QACjC,IAAA,0BAAM,EAAC,OAAO,QAAQ,CAAC,qBAAqB,KAAK,UAAU,CAAC,CAAC;QAC7D,QAAQ,CAAC,cAAc,CAAC,mBAAmB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAC7E,QAAQ,CAAC,qBAAqB,GAAG,SAAS,CAAC;IAC/C,CAAC;IACD,IAAI,QAAQ,CAAC,4BAA4B,EAAE,CAAC;QACxC,IAAA,0BAAM,EAAC,OAAO,QAAQ,CAAC,4BAA4B,KAAK,UAAU,CAAC,CAAC;QACpE,QAAQ,CAAC,cAAc,CAAC,0BAA0B,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;QAC3F,QAAQ,CAAC,4BAA4B,GAAG,SAAS,CAAC;IACtD,CAAC;AACL,CAAC;AAgBD,MAAM,aAAa,GAAG,GAAG,EAAE;IACvB,WAAW;AACf,CAAC,CAAC;AAEF,MAAa,eAAgB,SAAQ,qCAAiB;IAC3C,MAAM,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAElD;;OAEG;IACH,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;IAC3C,CAAC;IAEM,UAAU,CAAyB;IACnC,SAAS,CAAwB;IACxB,wBAAwB,CAA0B;IAC3D,mBAAmB,CAAW;IAC3B,YAAY,CAA0B;IAEtC,OAAO,CAAyB;IAE1C,YAAY,OAAgC;QACxC,OAAO,GAAG,OAAO,IAAK,EAA6B,CAAC;QAEpD,IAAI,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC;YACpC,OAAO,CAAC,wBAAwB,GAAG,IAAA,6DAA4B,EAAC,KAAK,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,wBAAwB,CAAC,UAAU,CAAC;QAC/F,OAAO,CAAC,eAAe;YACnB,OAAO,CAAC,eAAe,IAAI,mBAAI,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;QAEhH,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,wBAAwB,CAAC;QACjE,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QAEvB,MAAM,UAAU,GAAkC;YAC9C,GAAG,mBAAmB;YACtB,GAAG,OAAO,CAAC,UAAU;SACxB,CAAC;QACF,UAAU,CAAC,eAAe,GAAG,IAAA,2CAAmB,EAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAC7E,IAAI,CAAC,UAAU,GAAG,IAAI,qDAAsB,CAAC,UAAU,CAAC,CAAC;QAEzD,IAAI,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3D,QAAQ,CAAC,mDAAmD,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9G,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,IAAI,IAAI,CAAC;QAExF,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;YAC1C,UAAU,CACN,yEAAyE,EACzE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE,CAC7C,CAAC;QACN,CAAC;QAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,cAAc,IAAI,EAAE,CAAC;QAEzD,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE;YACrD,GAAG,EAAE,GAAG,EAAE,CAAC,IAAA,qDAA+B,EAAC,gBAAgB,CAAC;YAC5D,YAAY,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC9B,MAAM,IAAA,qDAA+B,GAAE,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC9B,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC9B,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;;;;;;OASG;IACO,sBAAsB;QAC5B,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACO,gBAAgB;QACtB,OAAO,EAAE,CAAC;IACd,CAAC;IAES,KAAK,CAAC,wBAAwB;QACpC,IAAI,iBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YACtC,OAAO;QACX,CAAC;QAED,IAAI,CAAC,IAAA,+CAA4B,EAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YACtD,MAAM,IAAA,uBAAQ,EAAC,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,eAAe,QAAQ,EAAE,EAAE,KAAK,IAAI,EAAE;gBACvE,IAAI,IAAA,+CAA4B,EAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;oBACrD,OAAO;gBACX,CAAC;gBACD,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,IAAI,2BAA2B,CAAC;gBACrF,MAAM,IAAI,GAAG,IAAA,iDAA2B,GAAE,CAAC;gBAC3C,MAAM,QAAQ,GAAG,IAAA,iCAAW,GAAE,CAAC;gBAC/B,MAAM,GAAG,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAEpF,gEAAgE;gBAChE,oEAAoE;gBACpE,oEAAoE;gBACpE,qEAAqE;gBACrE,qEAAqE;gBACrE,oEAAoE;gBACpE,4DAA4D;gBAC5D,mEAAmE;gBACnE,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAA,oCAAc,GAAE,EAAE,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAElF,MAAM,IAAI,CAAC,wBAAwB,CAAC,2BAA2B,CAAC;oBAC5D,cAAc;oBACd,GAAG;oBACH,EAAE;oBACF,UAAU,EAAE,IAAI,CAAC,eAAe;oBAEhC,OAAO,EAAE,IAAA,4CAAW,EAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,IAAI,4BAA4B,EAAE,QAAQ,CAAC;oBAEpG,SAAS,EAAE,IAAI,IAAI,EAAE;oBACrB,QAAQ,EAAE,GAAG,GAAG,EAAE,CAAC,WAAW;iBACjC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,YAAY;QACrB,MAAM,IAAI,CAAC,wBAAwB,CAAC,UAAU,EAAE,CAAC;QACjD,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACtC,QAAQ,CAAC,oBAAoB,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAC9F,QAAQ,CAAC,oBAAoB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACrD,IAAI,CAAC,4BAA4B,EAAE,CAAC;QACpC,MAAM,IAAA,iDAA6B,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,UAAU,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;IAC7H,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACI,mBAAmB;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAC;QACzC,MAAM,MAAM,GAAa,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,cAAc,EAAE,OAAO,IAAI,EAAE,CAAC;QACvF,MAAM,SAAS,GAAa,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,cAAc,EAAE,SAAS,IAAI,EAAE,CAAC;QAE5F,MAAM,IAAI,GAAG,IAAA,iDAA2B,GAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,IAAA,iCAAW,GAAE,CAAC;QAC/B,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAE5F,iEAAiE;QACjE,oEAAoE;QACpE,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAEjE,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,8DAA8D;QAC9D,gGAAgG;QAChG,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;YACzC,MAAM,MAAM,GAAG,IAAA,eAAI,EAAC,EAAE,CAAC,CAAC;YACxB,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;gBACf,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAA,+BAAS,EAAC,EAAE,CAAC,CAAC,CAAC;YAC9C,CAAC;YACD,yFAAyF;YACzF,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,UAAU,EAAE,GAAG,UAAU,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,+BAA+B;QACxC,sDAAsD;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;QAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU,IAAI,MAAM,CAAC,gBAAgB,KAAK,OAAO,CAAC,gBAAgB,CAAC;QACtH,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,+FAA+F,CAAC,CAAC;QACrH,CAAC;QAED,kBAAkB;QAClB,IAAI,iBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YACtC,iBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACxC,CAAC;QACD,kCAAkC;QAClC,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACtC,oEAAoE;QACpE,IAAA,2CAAuB,EAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAEO,4BAA4B;QAChC,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3C,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,UAAU,CACN,uFAAuF,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;oBAC7G,uFAAuF;oBACvF,2DAA2D,CAC9D,CAAC;YACN,CAAC;QACL,CAAC;QAAC,OAAO,IAAI,EAAE,CAAC;YACZ,4DAA4D;QAChE,CAAC;IACL,CAAC;IAOM,KAAK,CAAC,GAAG,IAAgC;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;QAC7B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,UAAU,EAAE;iBACZ,IAAI,CAAC,GAAG,EAAE;gBACP,QAAQ,EAAE,CAAC;YACf,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QACvC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,wBAAwB;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,IAAI,EAAE,CAAC;QACjB,CAAC;IACL,CAAC;IAES,KAAK,CAAC,UAAU;QACtB,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAEtC,IAAA,0BAAM,EAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QACtC,IAAA,0BAAM,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,gCAAgC,CAAC,CAAC;QAEpE,IAAA,qDAA8B,GAAE,CAAC;QACjC,4DAA4D;QAC5D,MAAM,MAAM,GAAG,IAAI,CAAC;QACpB,MAAM,eAAe,GAAG,UAAqC,OAAiC;YAC1F,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC7C,CAAC,CAAC;QAEF,MAAM,iBAAiB,GAAG,UAAqC,OAAiC;YAC5F,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC/C,CAAC,CAAC;QAEF,MAAM,qBAAqB,GAAG,UAAqC,UAAuB;YACtF,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QACvD,CAAC,CAAC;QAEF,MAAM,4BAA4B,GAAG,UAEjC,UAAuB,EACvB,WAAyB;YAEzB,MAAM,CAAC,IAAI,CAAC,0BAA0B,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;QAC3E,CAAC,CAAC;QAEF,MAAM,QAAQ,GAAoB,EAAE,CAAC;QAErC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpC,IAAA,0BAAM,EAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAEpC,QAAQ,CAAC,eAAe,GAAG,eAAe,CAAC;YAC3C,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;YAEpD,QAAQ,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;YAC/C,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAExD,QAAQ,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;YACvD,QAAQ,CAAC,EAAE,CAAC,mBAAmB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;YAEjE,QAAQ,CAAC,4BAA4B,GAAG,4BAA4B,CAAC;YACrE,QAAQ,CAAC,EAAE,CAAC,0BAA0B,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;YAE/E,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACpH,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACI,QAAQ,CAAC,IAAkC;QAC9C,IAAA,0BAAM,EAAC,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC;QACnC,IAAA,uDAAgC,GAAE,CAAC;QACnC,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YAC9C,QAAQ,CAAC,mCAAmC,CAAC,CAAC;YAC9C,eAAK,CAAC,OAAO,CACT,IAAI,CAAC,SAAS,EACd,CAAC,QAA6B,EAAE,QAA+B,EAAE,EAAE;gBAC/D,eAAe,CAAC,QAAQ,CAAC,CAAC;gBAC1B,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAChC,CAAC,EACD,CAAC,GAAkB,EAAE,EAAE;gBACnB,QAAQ,CAAC,oBAAoB,CAAC,CAAC;gBAC/B,IAAI,CAAC,GAAG,CAAC,CAAC;YACd,CAAC,CACJ,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAIM,gBAAgB,CAAC,QAAuC;QAC3D,IAAA,0BAAM,EAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC;QACvC,iBAAiB;QACjB,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC3D,QAAQ,CAAC,kCAAkC,CAAC,CAAC;QAC7C,eAAK,CAAC,OAAO,CACT,IAAI,CAAC,SAAS,EACd,CAAC,QAA6B,EAAE,cAA4C,EAAE,EAAE;YAC5E,QAAQ,CAAC,0BAA0B,EAAE,QAAQ,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YACrF,eAAK,CAAC,MAAM,CACR;gBACI,oEAAoE;gBACpE,iEAAiE;gBACjE,yBAAyB;gBACzB,CAAC,SAAuC,EAAE,EAAE;oBACxC,QAAQ,CAAC,yBAAyB,EAAE,CAAC;oBACrC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACjC,CAAC;gBACD,gEAAgE;gBAChE,4DAA4D;gBAC5D,oBAAoB;aACvB,EACD,cAAc,CACjB,CAAC;QACN,CAAC,EACD,QAAQ,CACX,CAAC;IACN,CAAC;IAED;;OAEG;IACI,UAAU,CAAC,OAAgB,EAAE,OAAiC;QACjE,IAAA,0BAAM,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxB,IAAA,0BAAM,EAAC,OAAO,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC;QAChC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAEhC,4FAA4F;QAC5F,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YACxB,OAAO,CAAC,YAAY,GAAG,CAAC,IAAY,EAAE,SAAmB,CAAC,4BAA4B,EAAE,EAAE;gBACtF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,CAAC,CAAC;QACN,CAAC;QAED,kBAAkB;QAClB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE/B,IAAI,OAAO,EAAE,CAAC;YACV,QAAQ,CACJ,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,0DAA0D,CAAC,EAC5E,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,MAAM,CAAC,IAAI,CACtB,CAAC;QACN,CAAC;QAED,IAAI,UAAkB,CAAC;QACvB,IAAI,QAAkB,CAAC;QAEvB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEvC,IAAI,CAAC;YACD,4CAA4C;YAC5C,MAAM,OAAO,GAAI,IAA2C,CAAC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3F,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;gBAChC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YACzC,CAAC;iBAAM,CAAC;gBACJ,UAAU,GAAG,0CAA0C,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC7E,UAAU,CAAC,UAAU,CAAC,CAAC;gBACvB,QAAQ,CAAC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;gBACrC,QAAQ,GAAG,gBAAgB,CAAC,oCAAW,CAAC,qBAAqB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC7E,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;YACnE,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,oBAAoB;YACpB,MAAM,WAAW,GAAG,iEAAiE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAC3G,UAAU,CAAC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;YACxC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/B,IAAA,kDAA+B,EAAC,GAAY,CAAC,CAAC;YAE9C,IAAI,mBAAmB,GAAG,EAAE,CAAC;YAC7B,mBAAmB,CAAC,IAAI,CAAC,iDAAiD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YACjG,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;gBACvB,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACtC,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;oBACZ,mBAAmB,GAAG,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC5E,CAAC;YACL,CAAC;YACD,QAAQ,GAAG,gBAAgB,CAAC,oCAAW,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;YAE/E,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QACnE,CAAC;IACL,CAAC;IAED;;;;;;;;;;;OAWG;IACI,qBAAqB,CAAC,WAA2B;QACpD,IAAI,SAAS,GAA0B,EAAE,CAAC;QAC1C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpC,MAAM,EAAE,GAAG,QAAQ,CAAC,oBAAoB,EAAE,CAAC;YAC3C,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,2BAAQ,EAAC,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7F,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IACD;;OAEG;IACI,cAAc;QACjB,OAAO,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC;IAC7D,CAAC;IAEM,gBAAgB;QACnB,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAsB,EAAE,EAAE;YAChE,OAAO,CAAC,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC;QACzD,CAAC,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACzB,CAAC;IAEM,UAAU,CAAC,QAAkC;QAChD,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxD,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,OAAO,OAAO,CAAC;IACnB,CAAC;IAWM,gBAAgB,CAAC,QAAuC;QAC3D,oBAAoB;QACpB,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACtC,CAAC;QACD,eAAK,CAAC,OAAO,CACT,IAAI,CAAC,SAAS,EACd,CAAC,EAAuB,EAAE,eAAe,EAAE,EAAE;YACzC,oBAAoB;YACpB,IAAI,OAAO,EAAE,CAAC;gBACV,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YACtE,CAAC;YAED,EAAE,CAAC,iBAAiB,CAAC,CAAC,GAAkB,EAAE,EAAE;gBACxC,oBAAoB;gBACpB,IAAI,OAAO,EAAE,CAAC;oBACV,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;gBACrE,CAAC;gBACD,eAAe,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;QACP,CAAC,EACD,CAAC,GAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CACxC,CAAC;IACN,CAAC;IASM,eAAe,CAAC,QAAuC;QAC1D,iBAAiB;QACjB,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC3D,eAAK,CAAC,OAAO,CACT,IAAI,CAAC,SAAS,EACd,CAAC,EAAuB,EAAE,eAAe,EAAE,EAAE;YACzC,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAC1C,CAAC,EACD,CAAC,GAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CACxC,CAAC;IACN,CAAC;IAES,OAAO,CAAC,QAAiB,EAAE,QAAkC;QACnE,WAAW;IACf,CAAC;IAED;;OAEG;IACO,uBAAuB,CAAC,OAAgB,EAAE,OAAiC;QACjF,MAAM,OAAO,GAAG,OAAO,CAAC,OAA8B,CAAC;QAEvD,IAAA,0BAAM,EAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,qBAAqB,CAAC,CAAC;QAEtD,MAAM,QAAQ,GAAG,IAAI,mDAAoB,CAAC,EAAE,CAAC,CAAC;QAE9C;;;;;;;;;;;WAWG;QACH,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QACxD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,QAA6B,EAAE,EAAE,CACzE,IAAA,2BAAQ,EAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,CACtD,CAAC;YACF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC;YAClC,CAAC;QACL,CAAC;QACD,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAC1C,CAAC,QAA6B,EAAE,EAAE,CAAC,CAAE,QAA+C,CAAC,UAAU,CAClG,CAAC;QAEF,gBAAgB;QAChB,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;YACxC,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAC1C,CAAC,QAA6B,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAC5F,CAAC;QACN,CAAC;QAED,uEAAuE;QACvE,iDAAiD;QACjD,yCAAyC;QACzC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAA6B,EAAE,EAAE;YACzD,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,GAAG,OAAO,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IACnE,CAAC;IAED;;OAEG;IACO,sBAAsB,CAAC,OAAgB,EAAE,OAAiC;QAChF,uDAAuD;QACvD,0GAA0G;QAC1G,wGAAwG;QACxG,yGAAyG;QACzG,wFAAwF;QAExF,MAAM,UAAU,GAAG,GAAG,CAAC,CAAC,eAAe;QACvC,UAAU,CAAC,GAAG,EAAE;YACZ,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAChC,IAAA,0BAAM,EAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,oBAAoB,CAAC,CAAC;YACrD,IAAI,CAAC,CAAC,OAAO,YAAY,iDAAkB,CAAC,EAAE,CAAC;gBAC3C,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAC5C,CAAC;YAED,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACvC,gBAAgB;YAChB,SAAS;YACT,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;gBACtC,gFAAgF;gBAChF,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,YAAoC,EAAE,EAAE;oBAC9D,OAAO,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;gBAChE,CAAC,CAAC,CAAC;YACP,CAAC;YAED,SAAS,KAAK,CAAC,sBAA8C;gBACzD,OAAO,IAAI,qDAAsB,CAAC;oBAC9B,eAAe,EAAE,sBAAsB,CAAC,eAAe;oBACvD,eAAe,EAAE,sBAAsB,CAAC,eAAe;oBACvD,cAAc,EAAE,sBAAsB,CAAC,cAAc;oBACrD,mBAAmB,EAAE,sBAAsB,CAAC,mBAAmB;oBAC/D,aAAa,EAAE,sBAAsB,CAAC,aAAa;oBACnD,gBAAgB,EAAE,sBAAsB,CAAC,gBAAgB;oBACzD,UAAU,EAAE,sBAAsB,CAAC,UAAU;iBAChD,CAAC,CAAC;YACP,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,kDAAmB,CAAC;gBACrC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;aAC9B,CAAC,CAAC;YAEH,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QACnE,CAAC,EAAE,UAAU,CAAC,CAAC;IACnB,CAAC;IAED;;OAEG;IACO,WAAW;QACjB,IAAI,QAAQ,GAA+B,EAAE,CAAC;QAE9C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpC,MAAM,CAAC,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;YACjC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;;AArpBL,0CAspBC;AAED;;GAEG;AACH,SAAS,gBAAgB,CAAC,UAAsB,EAAE,QAAkB;IAChE,MAAM,QAAQ,GAAG,IAAI,gDAAY,EAAE,CAAC;IACpC,QAAQ,CAAC,cAAc,CAAC,aAAa,GAAG,UAAU,CAAC;IACnD,oGAAoG;IAEpG,IAAA,0BAAM,EAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChC,IAAA,0BAAM,EAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;IAExC,QAAQ,CAAC,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC;IAC/C,4BAA4B;IAC5B,UAAU,CAAC,eAAK,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,iCAAiC;AACjC,2CAA0C;AAE1C,MAAM,IAAI,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;AAClC,eAAe,CAAC,SAAS,CAAC,eAAe,GAAG,IAAA,yBAAY,EAAC,eAAe,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;AAC1G,eAAe,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAA,yBAAY,EAAC,eAAe,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;AAC5G,eAAe,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAA,yBAAY,EAAC,eAAe,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module node-opcua-server
|
|
3
|
+
*/
|
|
4
|
+
import type { Nonce } from "node-opcua-crypto/web";
|
|
5
|
+
export interface ExtractPasswordResult {
|
|
6
|
+
valid: boolean;
|
|
7
|
+
password: string;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Extract the password from a decrypted UserNameIdentityToken
|
|
11
|
+
* password blob.
|
|
12
|
+
*
|
|
13
|
+
* The plaintext layout (OPC UA Part 4 §7.36.3) is:
|
|
14
|
+
*
|
|
15
|
+
* ┌─────────────────┬──────────────┬──────────────┐
|
|
16
|
+
* │ UInt32 length │ password │ serverNonce │
|
|
17
|
+
* │ (LE, 4 bytes) │ (variable) │ (32 bytes) │
|
|
18
|
+
* └─────────────────┴──────────────┴──────────────┘
|
|
19
|
+
*
|
|
20
|
+
* `length` = password.length + serverNonce.length
|
|
21
|
+
*
|
|
22
|
+
* After extracting the password, the trailing bytes **must**
|
|
23
|
+
* equal the session's `serverNonce` to confirm nonce binding.
|
|
24
|
+
*
|
|
25
|
+
* @param decryptedBuffer - the RSA-decrypted blob
|
|
26
|
+
* @param serverNonce - the nonce that was sent during
|
|
27
|
+
* CreateSession / last ActivateSession
|
|
28
|
+
*/
|
|
29
|
+
export declare function extractPasswordFromDecryptedBlob(decryptedBuffer: Buffer, serverNonce: Nonce): ExtractPasswordResult;
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.extractPasswordFromDecryptedBlob = extractPasswordFromDecryptedBlob;
|
|
4
|
+
/**
|
|
5
|
+
* Extract the password from a decrypted UserNameIdentityToken
|
|
6
|
+
* password blob.
|
|
7
|
+
*
|
|
8
|
+
* The plaintext layout (OPC UA Part 4 §7.36.3) is:
|
|
9
|
+
*
|
|
10
|
+
* ┌─────────────────┬──────────────┬──────────────┐
|
|
11
|
+
* │ UInt32 length │ password │ serverNonce │
|
|
12
|
+
* │ (LE, 4 bytes) │ (variable) │ (32 bytes) │
|
|
13
|
+
* └─────────────────┴──────────────┴──────────────┘
|
|
14
|
+
*
|
|
15
|
+
* `length` = password.length + serverNonce.length
|
|
16
|
+
*
|
|
17
|
+
* After extracting the password, the trailing bytes **must**
|
|
18
|
+
* equal the session's `serverNonce` to confirm nonce binding.
|
|
19
|
+
*
|
|
20
|
+
* @param decryptedBuffer - the RSA-decrypted blob
|
|
21
|
+
* @param serverNonce - the nonce that was sent during
|
|
22
|
+
* CreateSession / last ActivateSession
|
|
23
|
+
*/
|
|
24
|
+
function extractPasswordFromDecryptedBlob(decryptedBuffer, serverNonce) {
|
|
25
|
+
const invalidResult = {
|
|
26
|
+
valid: false,
|
|
27
|
+
password: ""
|
|
28
|
+
};
|
|
29
|
+
// need at least 4 bytes for the length field
|
|
30
|
+
if (!decryptedBuffer || decryptedBuffer.length < 4) {
|
|
31
|
+
return invalidResult;
|
|
32
|
+
}
|
|
33
|
+
const totalLength = decryptedBuffer.readUInt32LE(0);
|
|
34
|
+
const passwordLength = totalLength - serverNonce.length;
|
|
35
|
+
// bounds check: password length must be non-negative
|
|
36
|
+
// and the buffer must be large enough
|
|
37
|
+
if (passwordLength < 0) {
|
|
38
|
+
return invalidResult;
|
|
39
|
+
}
|
|
40
|
+
const expectedBufferSize = 4 + passwordLength + serverNonce.length;
|
|
41
|
+
if (decryptedBuffer.length < expectedBufferSize) {
|
|
42
|
+
return invalidResult;
|
|
43
|
+
}
|
|
44
|
+
const password = decryptedBuffer
|
|
45
|
+
.subarray(4, 4 + passwordLength)
|
|
46
|
+
.toString("utf-8");
|
|
47
|
+
// verify that the trailing bytes match the server nonce
|
|
48
|
+
// (nonce binding — ensures session integrity)
|
|
49
|
+
const trailingNonce = decryptedBuffer.subarray(4 + passwordLength, 4 + passwordLength + serverNonce.length);
|
|
50
|
+
if (!trailingNonce.equals(serverNonce)) {
|
|
51
|
+
return invalidResult;
|
|
52
|
+
}
|
|
53
|
+
return { valid: true, password };
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=extract_password_from_blob.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"extract_password_from_blob.js","sourceRoot":"","sources":["../source/extract_password_from_blob.ts"],"names":[],"mappings":";;AA8BA,4EA2CC;AA/DD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAgB,gCAAgC,CAC5C,eAAuB,EACvB,WAAkB;IAElB,MAAM,aAAa,GAA0B;QACzC,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,EAAE;KACf,CAAC;IAEF,6CAA6C;IAC7C,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjD,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,MAAM,WAAW,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACpD,MAAM,cAAc,GAAG,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC;IAExD,qDAAqD;IACrD,sCAAsC;IACtC,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,MAAM,kBAAkB,GAAG,CAAC,GAAG,cAAc,GAAG,WAAW,CAAC,MAAM,CAAC;IACnE,IAAI,eAAe,CAAC,MAAM,GAAG,kBAAkB,EAAE,CAAC;QAC9C,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe;SAC3B,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC;SAC/B,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEvB,wDAAwD;IACxD,8CAA8C;IAC9C,MAAM,aAAa,GAAG,eAAe,CAAC,QAAQ,CAC1C,CAAC,GAAG,cAAc,EAClB,CAAC,GAAG,cAAc,GAAG,WAAW,CAAC,MAAM,CAC1C,CAAC;IACF,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QACrC,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AACrC,CAAC"}
|
package/dist/opcua_server.js
CHANGED
|
@@ -41,6 +41,7 @@ const node_opcua_utils_1 = require("node-opcua-utils");
|
|
|
41
41
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
42
42
|
const thenify_ex_1 = require("thenify-ex");
|
|
43
43
|
const base_server_1 = require("./base_server");
|
|
44
|
+
const extract_password_from_blob_1 = require("./extract_password_from_blob");
|
|
44
45
|
const factory_1 = require("./factory");
|
|
45
46
|
const monitored_item_1 = require("./monitored_item");
|
|
46
47
|
const register_server_manager_1 = require("./register_server_manager");
|
|
@@ -1214,13 +1215,12 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
|
|
|
1214
1215
|
return;
|
|
1215
1216
|
}
|
|
1216
1217
|
const buff = cryptoFactory.asymmetricDecrypt(password, serverPrivateKey);
|
|
1217
|
-
|
|
1218
|
-
if (!
|
|
1218
|
+
const result = (0, extract_password_from_blob_1.extractPasswordFromDecryptedBlob)(buff, serverNonce);
|
|
1219
|
+
if (!result.valid) {
|
|
1219
1220
|
setImmediate(() => callback(null, false));
|
|
1220
1221
|
return;
|
|
1221
1222
|
}
|
|
1222
|
-
|
|
1223
|
-
password = buff.subarray(4, 4 + length).toString("utf-8");
|
|
1223
|
+
password = result.password;
|
|
1224
1224
|
}
|
|
1225
1225
|
this.userManager
|
|
1226
1226
|
.isValidUser(session, userName, password)
|
|
@@ -1397,7 +1397,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
|
|
|
1397
1397
|
// If the securityPolicyUri is None and none of the UserTokenPolicies requires
|
|
1398
1398
|
// encryption, the Server shall not send an ApplicationInstanceCertificate and the Client
|
|
1399
1399
|
// shall ignore the ApplicationInstanceCertificate.
|
|
1400
|
-
serverCertificate: hasEncryption ? serverCertificateChain : undefined,
|
|
1400
|
+
serverCertificate: hasEncryption && serverCertificateChain.length > 0 ? (0, web_1.combine_der)(serverCertificateChain) : undefined,
|
|
1401
1401
|
// The endpoints provided by the server.
|
|
1402
1402
|
// The Server shall return a set of EndpointDescriptions available for the serverUri
|
|
1403
1403
|
// specified in the request.[...]
|
|
@@ -2619,7 +2619,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
|
|
|
2619
2619
|
disableDiscovery: !!endpointOptions.disableDiscovery,
|
|
2620
2620
|
// xx hostname,
|
|
2621
2621
|
resourcePath: serverOption.resourcePath || "",
|
|
2622
|
-
advertisedEndpoints: endpointOptions.advertisedEndpoints
|
|
2622
|
+
advertisedEndpoints: endpointOptions.advertisedEndpoints
|
|
2623
2623
|
// TODO userTokenTypes: endpointOptions.userTokenTypes || undefined,
|
|
2624
2624
|
// TODO allowUnsecurePassword: endpointOptions.allowUnsecurePassword || false
|
|
2625
2625
|
});
|