node-opcua-server-configuration 2.108.0 → 2.109.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.d.ts +2 -2
- package/dist/clientTools/push_certificate_management_client.js.map +1 -1
- package/dist/push_certificate_manager.d.ts +3 -3
- package/dist/server/install_push_certitifate_management.js.map +1 -1
- package/dist/server/push_certificate_manager_server_impl.js +18 -45
- package/dist/server/push_certificate_manager_server_impl.js.map +1 -1
- package/package.json +26 -26
- package/source/clientTools/push_certificate_management_client.ts +2 -3
- package/source/push_certificate_manager.ts +3 -3
- package/source/server/install_push_certitifate_management.ts +8 -1
- package/source/server/push_certificate_manager_server_impl.ts +23 -53
|
@@ -8,7 +8,7 @@ import { IBasicSession } from "node-opcua-pseudo-session";
|
|
|
8
8
|
import { StatusCode } from "node-opcua-status-code";
|
|
9
9
|
import { ClientFile } from "node-opcua-file-transfer";
|
|
10
10
|
import { QualifiedNameLike } from "node-opcua-data-model";
|
|
11
|
-
import { Certificate
|
|
11
|
+
import { Certificate } from "node-opcua-crypto";
|
|
12
12
|
import { TrustListDataType } from "node-opcua-types";
|
|
13
13
|
import { CreateSigningRequestResult, GetRejectedListResult, PushCertificateManager, UpdateCertificateResult } from "../push_certificate_manager";
|
|
14
14
|
import { ITrustList } from "../trust_list";
|
|
@@ -141,7 +141,7 @@ export declare class ClientPushCertificateManagement implements PushCertificateM
|
|
|
141
141
|
* @param privateKey - The Private Key encoded in the privateKeyFormat
|
|
142
142
|
*
|
|
143
143
|
*/
|
|
144
|
-
updateCertificate(certificateGroupId: NodeId | string, certificateTypeId: NodeId | string, certificate: Buffer, issuerCertificates: Buffer[], privateKeyFormat: string, privateKey:
|
|
144
|
+
updateCertificate(certificateGroupId: NodeId | string, certificateTypeId: NodeId | string, certificate: Buffer, issuerCertificates: Buffer[], privateKeyFormat: string, privateKey: string | Buffer): Promise<UpdateCertificateResult>;
|
|
145
145
|
/**
|
|
146
146
|
* ApplyChanges tells the Server to apply any security changes.
|
|
147
147
|
* This Method should only be called if a previous call to a Method that changed the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push_certificate_management_client.js","sourceRoot":"","sources":["../../source/clientTools/push_certificate_management_client.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,yDAAsE;AAEtE,mEAAiE;AACjE,2DAA6E;AAC7E,uEAAoE;AACpE,iEAA4G;AAC5G,uGAA0E;AAE1E,uDAAqD;AACrD,uEAAwD;AAYxD,MAAM,yBAAyB,GAAG,IAAA,iCAAa,EAAC,qBAAqB,CAAC,CAAC;AACvE,MAAM,0BAA0B,GAAG,IAAA,iCAAa,EAAC,0CAA0C,CAAC,CAAC;AAC7F,MAAM,qBAAqB,GAAG,IAAA,iCAAa,EAAC,qCAAqC,CAAC,CAAC;AACnF,MAAM,uBAAuB,GAAG,IAAA,iCAAa,EAAC,uCAAuC,CAAC,CAAC;AACvF,MAAM,iBAAiB,GAAG,IAAA,iCAAa,EAAC,uCAAuC,CAAC,CAAC;AACjF,MAAM,kBAAkB,GAAG,IAAA,iCAAa,EAAC,kCAAkC,CAAC,CAAC;AAC7E,MAAM,gCAAgC,GAAG,IAAA,iCAAa,EAAC,gDAAgD,CAAC,CAAC;AAEzG,MAAM,uBAAuB,GAAG,IAAA,iCAAa,EAAC,+DAA+D,CAAC,CAAC;AAC/G,MAAM,iBAAiB,GAAG,IAAA,iCAAa,EAAC,yDAAyD,CAAC,CAAC;AACnG,MAAM,qBAAqB,GAAG,IAAA,iCAAa,EAAC,6DAA6D,CAAC,CAAC;AAE3G,SAAS,wBAAwB,CAAC,sBAA8B;IAC5D,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,0BAA0B,CAAC,gBAAiC;IACjE,IAAI,gBAAgB,YAAY,0BAAM,EAAE;QACpC,OAAO,gBAAgB,CAAC;KAC3B;IACD,QAAQ,gBAAgB,EAAE;QACtB,KAAK,yBAAyB;YAC1B,OAAO,uBAAuB,CAAC;QACnC,KAAK,mBAAmB;YACpB,OAAO,iBAAiB,CAAC;QAC7B,KAAK,uBAAuB;YACxB,OAAO,qBAAqB,CAAC;QACjC;YACI,OAAO,IAAA,iCAAa,EAAC,gBAAgB,CAAC,CAAC;KAC9C;AACL,CAAC;AAED,SAAS,2BAA2B,CAAC,iBAAkC;IACnE,IAAI,iBAAiB,YAAY,0BAAM,EAAE;QACrC,OAAO,iBAAiB,CAAC;KAC5B;IACD,OAAO,IAAA,iCAAa,EAAC,iBAAiB,CAAC,CAAC;AAC5C,CAAC;AAED,MAAa,eAAgB,SAAQ,qCAAU;IAM3C,YAAY,OAAsB,EAAS,MAAc;QACrD,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QADgB,WAAM,GAAN,MAAM,CAAQ;IAEzD,CAAC;IACD;;OAEG;IACG,iBAAiB;;YACnB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC;gBACzD,IAAA,yDAAc,EAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,CAAC;gBAC9C,IAAA,yDAAc,EAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,CAAC;gBAC9C,IAAA,yDAAc,EAAC,IAAI,CAAC,MAAM,EAAE,oBAAoB,CAAC;gBACjD,IAAA,yDAAc,EAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,0BAA0B;aAC3E,CAAC,CAAC;YAEH,IAAI,CAAC,oBAAoB,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,OAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YAClE,IAAI,CAAC,oBAAoB,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,OAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YAClE,IAAI,CAAC,uBAAuB,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,OAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YACrE,IAAI,CAAC,mBAAmB,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,OAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YAEjE,uBAAuB;YACvB,IAAI,CAAC,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,EAAE;gBACjE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;aAC1E;QACL,CAAC;KAAA;IAEe,iBAAiB;;;;;YAC7B,MAAM,OAAM,iBAAiB,WAAE,CAAC;YAChC,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACnC,CAAC;KAAA;IAEK,aAAa,CAAC,aAA6B;;YAC7C,uBAAuB;YACvB,IAAI,IAAI,CAAC,UAAU,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;aACjD;YACD,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC/B,uBAAuB;YACvB,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE;gBAC3B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;aAClD;YACD,MAAM,cAAc,GAAG,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;YAC7E,MAAM,YAAY,GAA0B;gBACxC,cAAc;gBACd,QAAQ,EAAE,IAAI,CAAC,mBAAmB;gBAClC,QAAQ,EAAE,IAAI,CAAC,MAAM;aACxB,CAAC;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC/D,IAAI,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE;gBACzC,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACrD;YACD,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAC,eAAgB,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC;YACvE,OAAO,IAAI,CAAC,UAAU,CAAC;QAC3B,CAAC;KAAA;IAEK,cAAc,CAAC,oBAA6B;;YAC9C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBAClB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;aACpD;YACD,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;aACzD;YACD,MAAM,cAAc,GAAG;gBACnB,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE;gBACrD,EAAE,QAAQ,EAAE,6BAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,oBAAoB,EAAE;aAChE,CAAC;YACF,MAAM,YAAY,GAA0B;gBACxC,cAAc;gBACd,QAAQ,EAAE,IAAI,CAAC,oBAAoB;gBACnC,QAAQ,EAAE,IAAI,CAAC,MAAM;aACxB,CAAC;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC/D,IAAI,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE;gBACzC,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACrD;YACD,OAAO,gBAAgB,CAAC,eAAgB,CAAC,CAAC,CAAC,CAAC,KAAgB,CAAC;QACjE,CAAC;KAAA;IAEK,cAAc,CAAC,WAAwB,EAAE,oBAA6B;;YACxE,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAE/B,MAAM,cAAc,GAAkB;gBAClC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE;gBACrD,EAAE,QAAQ,EAAE,6BAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,oBAAoB,EAAE;aAChE,CAAC;YACF,MAAM,YAAY,GAA0B;gBACxC,cAAc;gBACd,QAAQ,EAAE,IAAI,CAAC,oBAAoB;gBACnC,QAAQ,EAAE,IAAI,CAAC,MAAM;aACxB,CAAC;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC/D,OAAO,gBAAgB,CAAC,UAAU,CAAC;QACvC,CAAC;KAAA;IAEK,iBAAiB,CAAC,UAAkB,EAAE,oBAA6B;;YACrE,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAE/B,MAAM,cAAc,GAAkB;gBAClC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE;gBAChD,EAAE,QAAQ,EAAE,6BAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,oBAAoB,EAAE;aAChE,CAAC;YACF,MAAM,YAAY,GAA0B;gBACxC,cAAc;gBACd,QAAQ,EAAE,IAAI,CAAC,uBAAuB;gBACtC,QAAQ,EAAE,IAAI,CAAC,MAAM;aACxB,CAAC;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC/D,OAAO,gBAAgB,CAAC,UAAU,CAAC;QACvC,CAAC;KAAA;IAED;;;OAGG;IACG,0BAA0B;;YAC5B,kCAAkC;YAClC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,uCAAY,CAAC,IAAI,CAAC,CAAC;YACtD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACnB,MAAM,MAAM,GAAG,IAAI,uCAAY,CAAC,IAAI,CAAC,CAAC;YACtC,MAAM,SAAS,GAAsB,IAAI,oCAAiB,EAAE,CAAC;YAC7D,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACzB,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IACK,mCAAmC,CAAC,aAA6B;;YACnE,kCAAkC;YAClC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;YAC3D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACnB,MAAM,MAAM,GAAG,IAAI,uCAAY,CAAC,IAAI,CAAC,CAAC;YACtC,MAAM,SAAS,GAAsB,IAAI,oCAAiB,EAAE,CAAC;YAC7D,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACzB,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IAEK,2BAA2B,CAAC,WAA8B;;YAC5D,MAAM,IAAI,CAAC,IAAI,CAAC,uCAAY,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,CAAC,GAAG,WAAW,CAAC,eAAe,EAAE,CAAC;YACxC,MAAM,MAAM,GAAG,IAAI,uCAAY,CAAC,CAAC,CAAC,CAAC;YACnC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC3B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;KAAA;CACJ;AApJD,0CAoJC;AACD,MAAa,gBAAgB;IACzB,YAAmB,OAAsB,EAAS,MAAc;QAA7C,YAAO,GAAP,OAAO,CAAe;QAAS,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAC9D,mBAAmB;;YACrB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAA,yDAAc,EAAC,IAAI,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;YAClH,IAAI,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE;gBACzC,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACrD;YACD,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,OAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YACrE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,sBAAsB,EAAE,WAAW,EAAE,oCAAY,CAAC,KAAK,EAAE,CAAC,CAAC;YAC/G,IAAI,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACrD;YACD,OAAO,SAAS,CAAC,KAAK,CAAC,KAAiB,CAAC;QAC7C,CAAC;KAAA;IACK,YAAY;;YACd,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAA,yDAAc,EAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;YAC3G,IAAI,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE;gBACzC,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACrD;YACD,MAAM,eAAe,GAAG,gBAAgB,CAAC,OAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YAC9D,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC9D,CAAC;KAAA;CACJ;AAtBD,4CAsBC;AACD,MAAa,+BAA+B;IAKxC,YAAY,OAAsB;QAC9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IACU,oBAAoB,CAC7B,kBAAmC,EACnC,iBAAkC,EAClC,WAA0B,EAC1B,oBAA8B,EAC9B,KAAkB;;YAElB,KAAK,GAAG,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAEjC,MAAM,cAAc,GAAG;gBACnB,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,0BAA0B,CAAC,kBAAkB,CAAC,EAAE;gBACpF,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,2BAA2B,CAAC,iBAAiB,CAAC,EAAE;gBACpF,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE;gBACjD,EAAE,QAAQ,EAAE,6BAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,oBAAoB,EAAE;gBAC7D,EAAE,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE;aAClD,CAAC;YACF,MAAM,YAAY,GAA0B;gBACxC,cAAc;gBACd,QAAQ,EAAE,0BAA0B;gBACpC,QAAQ,EAAE,yBAAyB;aACtC,CAAC;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAE/D,IAAI,gBAAgB,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE;gBACtC,+CAA+C;gBAC/C,OAAO;oBACH,yBAAyB,EAAE,gBAAgB,CAAC,eAAgB,CAAC,CAAC,CAAC,CAAC,KAAK;oBACrE,UAAU,EAAE,gBAAgB,CAAC,UAAU;iBAC1C,CAAC;aACL;iBAAM;gBACH,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,UAAU,EAAE,CAAC;aACtD;QACL,CAAC;KAAA;IAED;;;;;;;;;;OAUG;IACU,eAAe;;YACxB,MAAM,cAAc,GAAkB,EAAE,CAAC;YACzC,MAAM,YAAY,GAA0B;gBACxC,cAAc;gBACd,QAAQ,EAAE,qBAAqB;gBAC/B,QAAQ,EAAE,yBAAyB;aACtC,CAAC;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC/D,IAAI,gBAAgB,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE;gBACtC,IAAI,gBAAgB,CAAC,eAAgB,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,6BAAQ,CAAC,UAAU,EAAE;oBACvE,OAAO,EAAE,UAAU,EAAE,oCAAW,CAAC,kBAAkB,EAAE,CAAC;iBACzD;gBACD,OAAO;oBACH,YAAY,EAAE,gBAAgB,CAAC,eAAgB,CAAC,CAAC,CAAC,CAAC,KAAK;oBACxD,UAAU,EAAE,gBAAgB,CAAC,UAAU;iBAC1C,CAAC;aACL;iBAAM;gBACH,OAAO;oBACH,UAAU,EAAE,gBAAgB,CAAC,UAAU;iBAC1C,CAAC;aACL;QACL,CAAC;KAAA;IAyDY,iBAAiB,CAC1B,kBAAmC,EACnC,iBAAkC,EAClC,WAAmB,EACnB,kBAA4B,EAC5B,gBAAyB,EACzB,UAAyC;;YAGzC,MAAM,cAAc,GAAkB;gBAClC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,0BAA0B,CAAC,kBAAkB,CAAC,EAAE;gBACpF,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,2BAA2B,CAAC,iBAAiB,CAAC,EAAE;gBACpF,EAAE,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE;gBACrD,EAAE,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,SAAS,EAAE,qCAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAE;gBAC/F,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,gBAAgB,IAAI,EAAE,EAAE;gBAC5D,EAAE,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;aAC5F,CAAC;YACF,MAAM,YAAY,GAA0B;gBACxC,cAAc;gBACd,QAAQ,EAAE,uBAAuB;gBACjC,QAAQ,EAAE,yBAAyB;aACtC,CAAC;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC/D,IAAI,gBAAgB,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE;gBACtC,IAAI,CAAC,gBAAgB,CAAC,eAAe,IAAI,gBAAgB,CAAC,eAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;oBACrF,OAAO;wBACH,UAAU,EAAE,oCAAW,CAAC,gBAAgB;qBAC3C,CAAC;oBACF,4DAA4D;iBAC/D;gBACD,OAAO;oBACH,oBAAoB,EAAE,gBAAgB,CAAC,eAAgB,CAAC,CAAC,CAAC,CAAC,KAAK;oBAChE,UAAU,EAAE,gBAAgB,CAAC,UAAU;iBAC1C,CAAC;aACL;iBAAM;gBACH,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,UAAU,EAAE,CAAC;aACtD;QACL,CAAC;KAAA;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACU,YAAY;;YACrB,MAAM,YAAY,GAA0B;gBACxC,cAAc,EAAE,EAAE;gBAClB,QAAQ,EAAE,kBAAkB;gBAC5B,QAAQ,EAAE,yBAAyB;aACtC,CAAC;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAE/D,IAAI,gBAAgB,CAAC,eAAe,IAAI,gBAAgB,CAAC,eAAe,CAAC,MAAM,EAAE;gBAC7E,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;aAChD;YACD,OAAO,gBAAgB,CAAC,UAAU,CAAC;QACvC,CAAC;KAAA;IAEY,6BAA6B;;YACtC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;gBACtC,WAAW,EAAE,oCAAY,CAAC,KAAK;gBAC/B,MAAM,EAAE,gCAAgC;aAC3C,CAAC,CAAC;YACH,OAAO,SAAS,CAAC,KAAK,CAAC,KAAiB,CAAC;QAC7C,CAAC;KAAA;IAEY,qBAAqB,CAAC,oBAA4B;;YAC3D,IAAI,oBAAoB,KAAK,yBAAyB,EAAE;gBACpD,OAAO,uBAAuB,CAAC;aAClC;YACD,OAAO;YACP,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC3C,CAAC;KAAA;IAED;;;OAGG;IACU,mBAAmB,CAC5B,UAAmF;;YAEnF,UAAU,GAAG,IAAA,2CAAmB,EAAC,UAAU,CAAC,CAAC;YAC7C,IAAI,UAAU,CAAC,QAAQ,EAAE,KAAK,yBAAyB,EAAE;gBACrD,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;aACtE;YACD,IAAI,UAAU,CAAC,QAAQ,EAAE,KAAK,uBAAuB,EAAE;gBACnD,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;aACpE;YACD,uBAAuB;YACvB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC3C,CAAC;KAAA;IACY,mBAAmB;;YAC5B,OAAO,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,CAAC;QAC/D,CAAC;KAAA;IACY,iBAAiB;;YAC1B,OAAO,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;QAC7D,CAAC;KAAA;;AA1RL,0EA2RC;AA1RiB,mEAAmC,GAAW,IAAA,iCAAa,EAAC,SAAS,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"push_certificate_management_client.js","sourceRoot":"","sources":["../../source/clientTools/push_certificate_management_client.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,9 +19,9 @@ export interface UpdateCertificateResult {
|
|
|
19
19
|
}
|
|
20
20
|
export interface PushCertificateManager {
|
|
21
21
|
/**
|
|
22
|
-
* The SupportedPrivateKeyFormats specifies the
|
|
22
|
+
* The SupportedPrivateKeyFormats specifies the private key formats supported by the Server.
|
|
23
23
|
* Possible values include “PEM” (see RFC 5958) or “PFX” (see PKCS #12). The array is empty
|
|
24
|
-
* if the Server does not allow external Clients to update the
|
|
24
|
+
* if the Server does not allow external Clients to update the private key
|
|
25
25
|
*/
|
|
26
26
|
getSupportedPrivateKeyFormats(): Promise<string[]>;
|
|
27
27
|
/**
|
|
@@ -54,7 +54,7 @@ export interface PushCertificateManager {
|
|
|
54
54
|
* Result Code Description
|
|
55
55
|
* BadInvalidArgument The certificateTypeId or certificateGroupId is not valid.
|
|
56
56
|
* BadCertificateInvalid The Certificate is invalid or the format is not supported.
|
|
57
|
-
* BadNotSupported The
|
|
57
|
+
* BadNotSupported The private key is invalid or the format is not supported.
|
|
58
58
|
* BadUserAccessDenied The current user does not have the rights required.
|
|
59
59
|
* BadSecurityChecksFailed Some failure occurred verifying the integrity of the Certificate.
|
|
60
60
|
*
|
|
@@ -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,uCAAyB;AACzB,uCAAyB;AACzB,2CAA6B;AAE7B,+BAA6B;AAC7B,kDAA0B;AAG1B,yDAA2C;AAE3C,
|
|
1
|
+
{"version":3,"file":"install_push_certitifate_management.js","sourceRoot":"","sources":["../../source/server/install_push_certitifate_management.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,6 @@ const node_opcua_crypto_1 = require("node-opcua-crypto");
|
|
|
57
57
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
58
58
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
59
59
|
const node_opcua_certificate_manager_1 = require("node-opcua-certificate-manager");
|
|
60
|
-
const node_opcua_crypto_2 = require("node-opcua-crypto");
|
|
61
60
|
// node 14 onward : import { readFile, writeFile, readdir } from "fs/promises";
|
|
62
61
|
const { readFile, writeFile, readdir } = fs.promises;
|
|
63
62
|
const debugLog = (0, node_opcua_debug_1.make_debugLog)("ServerConfiguration");
|
|
@@ -67,39 +66,6 @@ const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("ServerConfiguration");
|
|
|
67
66
|
const defaultApplicationGroup = (0, node_opcua_nodeid_1.resolveNodeId)("ServerConfiguration_CertificateGroups_DefaultApplicationGroup");
|
|
68
67
|
const defaultHttpsGroup = (0, node_opcua_nodeid_1.resolveNodeId)("ServerConfiguration_CertificateGroups_DefaultHttpsGroup");
|
|
69
68
|
const defaultUserTokenGroup = (0, node_opcua_nodeid_1.resolveNodeId)("ServerConfiguration_CertificateGroups_DefaultUserTokenGroup");
|
|
70
|
-
// async function coercePrivateKey(privateKey: Buffer | string | PrivateKey | CryptoKey): Promise<PrivateKey> {
|
|
71
|
-
// const crypto = getCrypto();
|
|
72
|
-
// const KeyObject = crypto.KeyObject;
|
|
73
|
-
// if (privateKey instanceof Buffer) {
|
|
74
|
-
// const privateKey1 = await derToPrivateKey(privateKey); //
|
|
75
|
-
// return KeyObject.from(privateKey1);
|
|
76
|
-
// } else if (typeof privateKey === "string") {
|
|
77
|
-
// try {
|
|
78
|
-
// // privateKey = privateKey.replace(/RSA PRIVATE KEY-----\n.*/mg, "RSA PRIVATE KEY-----");
|
|
79
|
-
// const privateKey1 = await pemToPrivateKey(privateKey);
|
|
80
|
-
// return KeyObject.from(privateKey1);
|
|
81
|
-
// } catch (err) {
|
|
82
|
-
// console.log(privateKey);
|
|
83
|
-
// throw err;
|
|
84
|
-
// }
|
|
85
|
-
// } else if (privateKey instanceof KeyObject) {
|
|
86
|
-
// return privateKey;
|
|
87
|
-
// }
|
|
88
|
-
// throw new Error("Invalid privateKey");
|
|
89
|
-
// }
|
|
90
|
-
function privateKeyToPEM2(privateKey) {
|
|
91
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
92
|
-
if (privateKey instanceof Buffer) {
|
|
93
|
-
return (0, node_opcua_crypto_1.toPem2)(privateKey, "RSA PRIVATE KEY");
|
|
94
|
-
}
|
|
95
|
-
else if (typeof privateKey === "string") {
|
|
96
|
-
return privateKey;
|
|
97
|
-
}
|
|
98
|
-
return (0, node_opcua_crypto_1.toPem2)(privateKey, "PRIVATE KEY");
|
|
99
|
-
// privateKey.export({ format: "pem", type: "pkcs1" }});
|
|
100
|
-
// return (await privateKeyToPEM(privateKey)).privPem;
|
|
101
|
-
});
|
|
102
|
-
}
|
|
103
69
|
function findCertificateGroupName(certificateGroupNodeId) {
|
|
104
70
|
if (typeof certificateGroupNodeId === "string") {
|
|
105
71
|
return certificateGroupNodeId;
|
|
@@ -257,7 +223,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
|
|
|
257
223
|
subjectName = subjectToString(e.tbsCertificate.subject);
|
|
258
224
|
warningLog("reusing existing certificate subjectAltName = ", subjectName);
|
|
259
225
|
}
|
|
260
|
-
// todo : at this time regenerate
|
|
226
|
+
// todo : at this time regenerate private key is not supported
|
|
261
227
|
if (regeneratePrivateKey) {
|
|
262
228
|
// The Server shall create a new Private Key which it stores until the
|
|
263
229
|
// matching signed Certificate is uploaded with the UpdateCertificate Method.
|
|
@@ -364,7 +330,7 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
|
|
|
364
330
|
// Result Code Description
|
|
365
331
|
// BadInvalidArgument The certificateTypeId or certificateGroupId is not valid.
|
|
366
332
|
// BadCertificateInvalid The Certificate is invalid or the format is not supported.
|
|
367
|
-
// BadNotSupported The
|
|
333
|
+
// BadNotSupported The Private Key is invalid or the format is not supported.
|
|
368
334
|
// BadUserAccessDenied The current user does not have the rights required.
|
|
369
335
|
// BadSecurityChecksFailed Some failure occurred verifying the integrity of the Certificate.
|
|
370
336
|
const certificateManager = this.getCertificateManager(certificateGroupId);
|
|
@@ -393,9 +359,12 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
|
|
|
393
359
|
(0, node_opcua_assert_1.assert)(privateKeyFormat.toUpperCase() === "PEM");
|
|
394
360
|
const ownPrivateFolder = path.join(certificateManager.rootDir, "own/private");
|
|
395
361
|
const privateKeyFilePEM = path.join(ownPrivateFolder, `_pending_private_key${fileCounter++}.pem`);
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
362
|
+
if (privateKey) {
|
|
363
|
+
const privateKey1 = (0, node_opcua_crypto_1.coercePEMorDerToPrivateKey)(privateKey);
|
|
364
|
+
const privateKeyPEM = yield (0, node_opcua_crypto_1.coercePrivateKeyPem)(privateKey1);
|
|
365
|
+
yield writeFile(privateKeyFilePEM, privateKeyPEM, "utf-8");
|
|
366
|
+
self.addPendingTask(() => moveFileWithBackup(privateKeyFilePEM, certificateManager.privateKey));
|
|
367
|
+
}
|
|
399
368
|
});
|
|
400
369
|
}
|
|
401
370
|
// OPC Unified Architecture, Part 12 42 Release 1.04:
|
|
@@ -429,13 +398,13 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
|
|
|
429
398
|
debugLog(" updateCertificate ", (0, node_opcua_crypto_1.makeSHA1Thumbprint)(certificate).toString("hex"));
|
|
430
399
|
if (!privateKeyFormat || !privateKey) {
|
|
431
400
|
// first of all we need to find the future private key;
|
|
432
|
-
// this one may have been created during the creation of the
|
|
401
|
+
// this one may have been created during the creation of the certificate signing request
|
|
433
402
|
// but is not active yet
|
|
434
|
-
const
|
|
403
|
+
const privateKey1 = (0, node_opcua_crypto_1.readPrivateKey)(this._tmpCertificateManager ? this._tmpCertificateManager.privateKey : certificateManager.privateKey);
|
|
435
404
|
// The Server shall report an error if the public key does not match the existing Certificate and
|
|
436
405
|
// the privateKey was not provided.
|
|
437
406
|
// privateKey is not provided, so check that the public key matches the existing certificate
|
|
438
|
-
if (!(0, node_opcua_crypto_1.certificateMatchesPrivateKey)(certificate,
|
|
407
|
+
if (!(0, node_opcua_crypto_1.certificateMatchesPrivateKey)(certificate, privateKey1)) {
|
|
439
408
|
// certificate doesn't match privateKey
|
|
440
409
|
warningLog("certificate doesn't match privateKey");
|
|
441
410
|
/* debug code */
|
|
@@ -471,15 +440,19 @@ class PushCertificateManagerServerImpl extends events_1.EventEmitter {
|
|
|
471
440
|
warningLog("in NodeOPCUA we only support PEM for the moment privateKeyFormat =" + privateKeyFormat);
|
|
472
441
|
return { statusCode: node_opcua_basic_types_1.StatusCodes.BadNotSupported };
|
|
473
442
|
}
|
|
474
|
-
|
|
443
|
+
let privateKey1;
|
|
444
|
+
if (privateKey && (privateKey instanceof Buffer || typeof privateKey === "string")) {
|
|
475
445
|
if (privateKey instanceof Buffer) {
|
|
476
446
|
(0, node_opcua_assert_1.assert)(privateKeyFormat === "PEM");
|
|
477
447
|
privateKey = privateKey.toString("utf-8");
|
|
478
448
|
}
|
|
479
|
-
|
|
449
|
+
privateKey1 = (0, node_opcua_crypto_1.coercePEMorDerToPrivateKey)(privateKey);
|
|
450
|
+
}
|
|
451
|
+
if (!privateKey1) {
|
|
452
|
+
return { statusCode: node_opcua_basic_types_1.StatusCodes.BadNotSupported };
|
|
480
453
|
}
|
|
481
454
|
// privateKey is provided, so check that the public key matches provided private key
|
|
482
|
-
if (!(0, node_opcua_crypto_1.certificateMatchesPrivateKey)(certificate,
|
|
455
|
+
if (!(0, node_opcua_crypto_1.certificateMatchesPrivateKey)(certificate, privateKey1)) {
|
|
483
456
|
// certificate doesn't match privateKey
|
|
484
457
|
warningLog("certificate doesn't match privateKey");
|
|
485
458
|
return { statusCode: node_opcua_basic_types_1.StatusCodes.BadSecurityChecksFailed };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push_certificate_manager_server_impl.js","sourceRoot":"","sources":["../../source/server/push_certificate_manager_server_impl.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"push_certificate_manager_server_impl.js","sourceRoot":"","sources":["../../source/server/push_certificate_manager_server_impl.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-server-configuration",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.109.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module server-configuration",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "tsc -b",
|
|
@@ -12,36 +12,36 @@
|
|
|
12
12
|
"types": "./dist/index.d.ts",
|
|
13
13
|
"dependencies": {
|
|
14
14
|
"chalk": "4.1.2",
|
|
15
|
-
"memfs": "^4.2.
|
|
16
|
-
"node-opcua-address-space": "2.
|
|
17
|
-
"node-opcua-address-space-base": "2.
|
|
15
|
+
"memfs": "^4.2.1",
|
|
16
|
+
"node-opcua-address-space": "2.109.0",
|
|
17
|
+
"node-opcua-address-space-base": "2.109.0",
|
|
18
18
|
"node-opcua-assert": "2.105.0",
|
|
19
|
-
"node-opcua-basic-types": "2.
|
|
20
|
-
"node-opcua-binary-stream": "2.
|
|
21
|
-
"node-opcua-certificate-manager": "2.
|
|
22
|
-
"node-opcua-client": "2.
|
|
23
|
-
"node-opcua-common": "2.
|
|
19
|
+
"node-opcua-basic-types": "2.109.0",
|
|
20
|
+
"node-opcua-binary-stream": "2.109.0",
|
|
21
|
+
"node-opcua-certificate-manager": "2.109.0",
|
|
22
|
+
"node-opcua-client": "2.109.0",
|
|
23
|
+
"node-opcua-common": "2.109.0",
|
|
24
24
|
"node-opcua-constants": "2.98.1",
|
|
25
|
-
"node-opcua-crypto": "
|
|
26
|
-
"node-opcua-data-model": "2.
|
|
27
|
-
"node-opcua-debug": "2.
|
|
28
|
-
"node-opcua-file-transfer": "2.
|
|
25
|
+
"node-opcua-crypto": "4.1.0",
|
|
26
|
+
"node-opcua-data-model": "2.109.0",
|
|
27
|
+
"node-opcua-debug": "2.109.0",
|
|
28
|
+
"node-opcua-file-transfer": "2.109.0",
|
|
29
29
|
"node-opcua-hostname": "2.105.0",
|
|
30
|
-
"node-opcua-nodeid": "2.
|
|
31
|
-
"node-opcua-pki": "4.
|
|
32
|
-
"node-opcua-pseudo-session": "2.
|
|
33
|
-
"node-opcua-secure-channel": "2.
|
|
34
|
-
"node-opcua-server": "2.
|
|
35
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
36
|
-
"node-opcua-status-code": "2.
|
|
37
|
-
"node-opcua-types": "2.
|
|
38
|
-
"node-opcua-variant": "2.
|
|
30
|
+
"node-opcua-nodeid": "2.109.0",
|
|
31
|
+
"node-opcua-pki": "4.3.0",
|
|
32
|
+
"node-opcua-pseudo-session": "2.109.0",
|
|
33
|
+
"node-opcua-secure-channel": "2.109.0",
|
|
34
|
+
"node-opcua-server": "2.109.0",
|
|
35
|
+
"node-opcua-service-translate-browse-path": "2.109.0",
|
|
36
|
+
"node-opcua-status-code": "2.109.0",
|
|
37
|
+
"node-opcua-types": "2.109.0",
|
|
38
|
+
"node-opcua-variant": "2.109.0",
|
|
39
39
|
"rimraf": "3.0.2"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"node-opcua-data-value": "2.
|
|
43
|
-
"node-opcua-leak-detector": "2.
|
|
44
|
-
"node-opcua-nodesets": "2.
|
|
42
|
+
"node-opcua-data-value": "2.109.0",
|
|
43
|
+
"node-opcua-leak-detector": "2.109.0",
|
|
44
|
+
"node-opcua-nodesets": "2.109.0",
|
|
45
45
|
"should": "^13.2.3"
|
|
46
46
|
},
|
|
47
47
|
"author": "Etienne Rossignon",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"internet of things"
|
|
60
60
|
],
|
|
61
61
|
"homepage": "http://node-opcua.github.io/",
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "50cfa07779d4c07b299176ac9c27527fcd97d079",
|
|
63
63
|
"files": [
|
|
64
64
|
"dist",
|
|
65
65
|
"source"
|
|
@@ -402,7 +402,7 @@ export class ClientPushCertificateManagement implements PushCertificateManager {
|
|
|
402
402
|
certificate: Buffer,
|
|
403
403
|
issuerCertificates: Buffer[],
|
|
404
404
|
privateKeyFormat: string,
|
|
405
|
-
privateKey:
|
|
405
|
+
privateKey: string | Buffer
|
|
406
406
|
): Promise<UpdateCertificateResult>;
|
|
407
407
|
public async updateCertificate(
|
|
408
408
|
certificateGroupId: NodeId | string,
|
|
@@ -410,9 +410,8 @@ export class ClientPushCertificateManagement implements PushCertificateManager {
|
|
|
410
410
|
certificate: Buffer,
|
|
411
411
|
issuerCertificates: Buffer[],
|
|
412
412
|
privateKeyFormat?: string,
|
|
413
|
-
privateKey?:
|
|
413
|
+
privateKey?: string | Buffer
|
|
414
414
|
): Promise<UpdateCertificateResult> {
|
|
415
|
-
|
|
416
415
|
const inputArguments: VariantLike[] = [
|
|
417
416
|
{ dataType: DataType.NodeId, value: findCertificateGroupNodeId(certificateGroupId) },
|
|
418
417
|
{ dataType: DataType.NodeId, value: findCertificateTypeIdNodeId(certificateTypeId) },
|
|
@@ -23,9 +23,9 @@ export interface UpdateCertificateResult {
|
|
|
23
23
|
export interface PushCertificateManager {
|
|
24
24
|
|
|
25
25
|
/**
|
|
26
|
-
* The SupportedPrivateKeyFormats specifies the
|
|
26
|
+
* The SupportedPrivateKeyFormats specifies the private key formats supported by the Server.
|
|
27
27
|
* Possible values include “PEM” (see RFC 5958) or “PFX” (see PKCS #12). The array is empty
|
|
28
|
-
* if the Server does not allow external Clients to update the
|
|
28
|
+
* if the Server does not allow external Clients to update the private key
|
|
29
29
|
*/
|
|
30
30
|
getSupportedPrivateKeyFormats(): Promise<string[]>;
|
|
31
31
|
|
|
@@ -59,7 +59,7 @@ export interface PushCertificateManager {
|
|
|
59
59
|
* Result Code Description
|
|
60
60
|
* BadInvalidArgument The certificateTypeId or certificateGroupId is not valid.
|
|
61
61
|
* BadCertificateInvalid The Certificate is invalid or the format is not supported.
|
|
62
|
-
* BadNotSupported The
|
|
62
|
+
* BadNotSupported The private key is invalid or the format is not supported.
|
|
63
63
|
* BadUserAccessDenied The current user does not have the rights required.
|
|
64
64
|
* BadSecurityChecksFailed Some failure occurred verifying the integrity of the Certificate.
|
|
65
65
|
*
|
|
@@ -11,7 +11,14 @@ import chalk from "chalk";
|
|
|
11
11
|
import { UAServerConfiguration, AddressSpace } from "node-opcua-address-space";
|
|
12
12
|
import { assert } from "node-opcua-assert";
|
|
13
13
|
import { OPCUACertificateManager } from "node-opcua-certificate-manager";
|
|
14
|
-
import {
|
|
14
|
+
import {
|
|
15
|
+
Certificate,
|
|
16
|
+
convertPEMtoDER,
|
|
17
|
+
makeSHA1Thumbprint,
|
|
18
|
+
PrivateKey,
|
|
19
|
+
readPrivateKey,
|
|
20
|
+
split_der
|
|
21
|
+
} from "node-opcua-crypto";
|
|
15
22
|
import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
|
|
16
23
|
import { getFullyQualifiedDomainName } from "node-opcua-hostname";
|
|
17
24
|
import { ICertificateKeyPairProviderPriv } from "node-opcua-common";
|
|
@@ -19,9 +19,9 @@ import {
|
|
|
19
19
|
PrivateKey,
|
|
20
20
|
certificateMatchesPrivateKey,
|
|
21
21
|
readCertificate,
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
22
|
+
coercePEMorDerToPrivateKey,
|
|
23
|
+
toPem2,
|
|
24
|
+
coercePrivateKeyPem
|
|
25
25
|
} from "node-opcua-crypto";
|
|
26
26
|
|
|
27
27
|
import { DirectoryName } from "node-opcua-crypto";
|
|
@@ -30,7 +30,6 @@ import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "n
|
|
|
30
30
|
import { NodeId, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
|
|
31
31
|
import { CertificateManager } from "node-opcua-certificate-manager";
|
|
32
32
|
import { StatusCode } from "node-opcua-status-code";
|
|
33
|
-
import { coercePrivateKey } from "node-opcua-crypto";
|
|
34
33
|
|
|
35
34
|
import {
|
|
36
35
|
CreateSigningRequestResult,
|
|
@@ -39,7 +38,6 @@ import {
|
|
|
39
38
|
UpdateCertificateResult
|
|
40
39
|
} from "../push_certificate_manager";
|
|
41
40
|
|
|
42
|
-
|
|
43
41
|
// node 14 onward : import { readFile, writeFile, readdir } from "fs/promises";
|
|
44
42
|
const { readFile, writeFile, readdir } = fs.promises;
|
|
45
43
|
|
|
@@ -52,40 +50,7 @@ const defaultApplicationGroup = resolveNodeId("ServerConfiguration_CertificateGr
|
|
|
52
50
|
const defaultHttpsGroup = resolveNodeId("ServerConfiguration_CertificateGroups_DefaultHttpsGroup");
|
|
53
51
|
const defaultUserTokenGroup = resolveNodeId("ServerConfiguration_CertificateGroups_DefaultUserTokenGroup");
|
|
54
52
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
// const crypto = getCrypto();
|
|
58
|
-
// const KeyObject = crypto.KeyObject;
|
|
59
|
-
|
|
60
|
-
// if (privateKey instanceof Buffer) {
|
|
61
|
-
// const privateKey1 = await derToPrivateKey(privateKey); //
|
|
62
|
-
// return KeyObject.from(privateKey1);
|
|
63
|
-
// } else if (typeof privateKey === "string") {
|
|
64
|
-
// try {
|
|
65
|
-
// // privateKey = privateKey.replace(/RSA PRIVATE KEY-----\n.*/mg, "RSA PRIVATE KEY-----");
|
|
66
|
-
// const privateKey1 = await pemToPrivateKey(privateKey);
|
|
67
|
-
// return KeyObject.from(privateKey1);
|
|
68
|
-
// } catch (err) {
|
|
69
|
-
// console.log(privateKey);
|
|
70
|
-
// throw err;
|
|
71
|
-
// }
|
|
72
|
-
// } else if (privateKey instanceof KeyObject) {
|
|
73
|
-
// return privateKey;
|
|
74
|
-
// }
|
|
75
|
-
// throw new Error("Invalid privateKey");
|
|
76
|
-
// }
|
|
77
|
-
|
|
78
|
-
async function privateKeyToPEM2(privateKey: Buffer | string | PrivateKey): Promise<string> {
|
|
79
|
-
if (privateKey instanceof Buffer) {
|
|
80
|
-
return toPem2(privateKey, "RSA PRIVATE KEY");
|
|
81
|
-
} else if (typeof privateKey === "string") {
|
|
82
|
-
return privateKey;
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
return toPem2(privateKey, "PRIVATE KEY");
|
|
86
|
-
// privateKey.export({ format: "pem", type: "pkcs1" }});
|
|
87
|
-
// return (await privateKeyToPEM(privateKey)).privPem;
|
|
88
|
-
}
|
|
53
|
+
|
|
89
54
|
|
|
90
55
|
function findCertificateGroupName(certificateGroupNodeId: NodeId | string): string {
|
|
91
56
|
if (typeof certificateGroupNodeId === "string") {
|
|
@@ -275,7 +240,7 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
275
240
|
warningLog("reusing existing certificate subjectAltName = ", subjectName);
|
|
276
241
|
}
|
|
277
242
|
|
|
278
|
-
// todo : at this time regenerate
|
|
243
|
+
// todo : at this time regenerate private key is not supported
|
|
279
244
|
if (regeneratePrivateKey) {
|
|
280
245
|
// The Server shall create a new Private Key which it stores until the
|
|
281
246
|
// matching signed Certificate is uploaded with the UpdateCertificate Method.
|
|
@@ -409,12 +374,12 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
409
374
|
certificate: Buffer,
|
|
410
375
|
issuerCertificates: ByteString[],
|
|
411
376
|
privateKeyFormat?: string,
|
|
412
|
-
privateKey?: Buffer |
|
|
377
|
+
privateKey?: Buffer | string
|
|
413
378
|
): Promise<UpdateCertificateResult> {
|
|
414
379
|
// Result Code Description
|
|
415
380
|
// BadInvalidArgument The certificateTypeId or certificateGroupId is not valid.
|
|
416
381
|
// BadCertificateInvalid The Certificate is invalid or the format is not supported.
|
|
417
|
-
// BadNotSupported The
|
|
382
|
+
// BadNotSupported The Private Key is invalid or the format is not supported.
|
|
418
383
|
// BadUserAccessDenied The current user does not have the rights required.
|
|
419
384
|
// BadSecurityChecksFailed Some failure occurred verifying the integrity of the Certificate.
|
|
420
385
|
const certificateManager = this.getCertificateManager(certificateGroupId)!;
|
|
@@ -448,11 +413,12 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
448
413
|
const ownPrivateFolder = path.join(certificateManager.rootDir, "own/private");
|
|
449
414
|
const privateKeyFilePEM = path.join(ownPrivateFolder, `_pending_private_key${fileCounter++}.pem`);
|
|
450
415
|
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
416
|
+
if (privateKey) {
|
|
417
|
+
const privateKey1 = coercePEMorDerToPrivateKey(privateKey);
|
|
418
|
+
const privateKeyPEM = await coercePrivateKeyPem(privateKey1);
|
|
419
|
+
await writeFile(privateKeyFilePEM, privateKeyPEM, "utf-8");
|
|
420
|
+
self.addPendingTask(() => moveFileWithBackup(privateKeyFilePEM, certificateManager.privateKey));
|
|
421
|
+
}
|
|
456
422
|
}
|
|
457
423
|
|
|
458
424
|
// OPC Unified Architecture, Part 12 42 Release 1.04:
|
|
@@ -501,16 +467,16 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
501
467
|
|
|
502
468
|
if (!privateKeyFormat || !privateKey) {
|
|
503
469
|
// first of all we need to find the future private key;
|
|
504
|
-
// this one may have been created during the creation of the
|
|
470
|
+
// this one may have been created during the creation of the certificate signing request
|
|
505
471
|
// but is not active yet
|
|
506
|
-
const
|
|
472
|
+
const privateKey1 = readPrivateKey(
|
|
507
473
|
this._tmpCertificateManager ? this._tmpCertificateManager.privateKey : certificateManager.privateKey
|
|
508
474
|
);
|
|
509
475
|
|
|
510
476
|
// The Server shall report an error if the public key does not match the existing Certificate and
|
|
511
477
|
// the privateKey was not provided.
|
|
512
478
|
// privateKey is not provided, so check that the public key matches the existing certificate
|
|
513
|
-
if (!certificateMatchesPrivateKey(certificate,
|
|
479
|
+
if (!certificateMatchesPrivateKey(certificate, privateKey1)) {
|
|
514
480
|
// certificate doesn't match privateKey
|
|
515
481
|
warningLog("certificate doesn't match privateKey");
|
|
516
482
|
/* debug code */
|
|
@@ -547,15 +513,19 @@ export class PushCertificateManagerServerImpl extends EventEmitter implements Pu
|
|
|
547
513
|
return { statusCode: StatusCodes.BadNotSupported };
|
|
548
514
|
}
|
|
549
515
|
|
|
550
|
-
|
|
516
|
+
let privateKey1: PrivateKey | undefined;
|
|
517
|
+
if (privateKey && (privateKey instanceof Buffer || typeof privateKey === "string")) {
|
|
551
518
|
if (privateKey instanceof Buffer) {
|
|
552
519
|
assert(privateKeyFormat === "PEM");
|
|
553
520
|
privateKey = privateKey.toString("utf-8");
|
|
554
521
|
}
|
|
555
|
-
|
|
522
|
+
privateKey1 = coercePEMorDerToPrivateKey(privateKey);
|
|
523
|
+
}
|
|
524
|
+
if (!privateKey1) {
|
|
525
|
+
return { statusCode: StatusCodes.BadNotSupported };
|
|
556
526
|
}
|
|
557
527
|
// privateKey is provided, so check that the public key matches provided private key
|
|
558
|
-
if (!certificateMatchesPrivateKey(certificate,
|
|
528
|
+
if (!certificateMatchesPrivateKey(certificate, privateKey1!)) {
|
|
559
529
|
// certificate doesn't match privateKey
|
|
560
530
|
warningLog("certificate doesn't match privateKey");
|
|
561
531
|
return { statusCode: StatusCodes.BadSecurityChecksFailed };
|