@decaf-ts/for-fabric 0.0.22 → 0.0.24
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/lib/client/fabric-hsm.cjs +8 -5
- package/lib/client/fabric-hsm.d.ts +2 -1
- package/lib/client/fabric-hsm.js.map +1 -1
- package/lib/client/services/FabricEnrollmentService.cjs +15 -4
- package/lib/client/services/FabricEnrollmentService.js.map +1 -1
- package/lib/esm/client/fabric-hsm.d.ts +2 -1
- package/lib/esm/client/fabric-hsm.js +8 -5
- package/lib/esm/client/fabric-hsm.js.map +1 -1
- package/lib/esm/client/services/FabricEnrollmentService.js +15 -4
- package/lib/esm/client/services/FabricEnrollmentService.js.map +1 -1
- package/lib/esm/shared/types.d.ts +2 -2
- package/lib/esm/shared/utils.d.ts +7 -1
- package/lib/esm/shared/utils.js +42 -4
- package/lib/esm/shared/utils.js.map +1 -1
- package/lib/esm/version.d.ts +1 -1
- package/lib/esm/version.js +1 -1
- package/lib/shared/types.d.ts +2 -2
- package/lib/shared/utils.cjs +42 -4
- package/lib/shared/utils.d.ts +7 -1
- package/lib/shared/utils.js.map +1 -1
- package/lib/version.cjs +1 -1
- package/lib/version.d.ts +1 -1
- package/package.json +1 -1
|
@@ -9,7 +9,7 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
const errors_1 = require("./../shared/errors.cjs");
|
|
11
11
|
const crypto_1 = __importDefault(require("crypto"));
|
|
12
|
-
const nist_1 =
|
|
12
|
+
const nist_1 = require("@noble/curves/nist");
|
|
13
13
|
class HSMSignerFactoryCustom {
|
|
14
14
|
static #pkcs11 = null;
|
|
15
15
|
static #initialized = false;
|
|
@@ -125,8 +125,8 @@ class HSMSignerFactoryCustom {
|
|
|
125
125
|
const compactSignature = await HSMSignerFactoryCustom.#pkcs11.C_SignAsync(session, Buffer.from(digest),
|
|
126
126
|
// EC signatures have length of 2n according to the PKCS11 spec:
|
|
127
127
|
// https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/pkcs11-spec-v3.1.html
|
|
128
|
-
Buffer.alloc(nist_1.
|
|
129
|
-
return nist_1.
|
|
128
|
+
Buffer.alloc(nist_1.p256.Point.Fn.BYTES * 2));
|
|
129
|
+
return nist_1.p256.Signature.fromBytes(compactSignature, "compact")
|
|
130
130
|
.normalizeS()
|
|
131
131
|
.toBytes("der");
|
|
132
132
|
},
|
|
@@ -148,12 +148,15 @@ class HSMSignerFactoryCustom {
|
|
|
148
148
|
const prefix = Buffer.from("04", "hex");
|
|
149
149
|
return Buffer.concat([prefix, x, y]);
|
|
150
150
|
}
|
|
151
|
-
|
|
151
|
+
getSKIFromCertificatePath(certPath) {
|
|
152
152
|
const p = certPath.endsWith(".pem")
|
|
153
153
|
? certPath
|
|
154
154
|
: path_1.default.join(certPath, "cert.pem");
|
|
155
155
|
const credentials = fs_1.default.readFileSync(p);
|
|
156
|
-
|
|
156
|
+
return this.getSKIFromCertificate(credentials);
|
|
157
|
+
}
|
|
158
|
+
getSKIFromCertificate(cert) {
|
|
159
|
+
const certificate = new crypto_1.default.X509Certificate(cert);
|
|
157
160
|
const uncompressedPoint = this.getUncompressedPointOnCurve(certificate.publicKey);
|
|
158
161
|
return crypto_1.default.createHash("sha256").update(uncompressedPoint).digest();
|
|
159
162
|
}
|
|
@@ -14,7 +14,8 @@ export declare class HSMSignerFactoryCustom {
|
|
|
14
14
|
};
|
|
15
15
|
private assertDefined;
|
|
16
16
|
private getUncompressedPointOnCurve;
|
|
17
|
-
|
|
17
|
+
getSKIFromCertificatePath(certPath: string): Buffer<ArrayBufferLike>;
|
|
18
|
+
getSKIFromCertificate(cert: string | NonSharedBuffer): Buffer;
|
|
18
19
|
}
|
|
19
20
|
export interface HSMConfig {
|
|
20
21
|
label: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fabric-hsm.js","sourceRoot":"","sources":["../../src/client/fabric-hsm.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA8B;AAC9B,4CAAoB;AACpB,gDAAwB;AACxB,mDAAqD;AACrD,oDAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"fabric-hsm.js","sourceRoot":"","sources":["../../src/client/fabric-hsm.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,15 +83,26 @@ class FabricEnrollmentService extends LoggedService_1.LoggedService {
|
|
|
83
83
|
async User() {
|
|
84
84
|
if (this.user)
|
|
85
85
|
return this.user;
|
|
86
|
-
const { caName, caCert, caKey, url } = this.caConfig;
|
|
86
|
+
const { caName, caCert, caKey, url, hsm } = this.caConfig;
|
|
87
87
|
const log = this.log.for(this.User);
|
|
88
88
|
log.debug(`Creating CA user for ${caName} at ${url}`);
|
|
89
89
|
log.debug(`Retrieving CA certificate from ${caCert}`);
|
|
90
90
|
const certificate = await utils_1.CoreUtils.getFirstDirFileNameContent(caCert);
|
|
91
|
-
|
|
92
|
-
|
|
91
|
+
let key;
|
|
92
|
+
if (!hsm) {
|
|
93
|
+
if (!caKey) {
|
|
94
|
+
throw new db_decorators_1.InternalError(`Missing caKey configuration for CA ${caName}. Provide a key directory or configure HSM support.`);
|
|
95
|
+
}
|
|
96
|
+
log.debug(`Retrieving CA key from ${caKey}`);
|
|
97
|
+
key = await utils_1.CoreUtils.getFirstDirFileNameContent(caKey);
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
log.debug(`Using HSM configuration for CA ${caName} with library ${hsm.library}`);
|
|
101
|
+
}
|
|
93
102
|
log.debug(`Loading Admin user for ca ${caName}`);
|
|
94
|
-
this.user = await utils_1.CoreUtils.getCAUser("admin", key, certificate, caName
|
|
103
|
+
this.user = await utils_1.CoreUtils.getCAUser("admin", key, certificate, caName, {
|
|
104
|
+
hsm,
|
|
105
|
+
});
|
|
95
106
|
return this.user;
|
|
96
107
|
}
|
|
97
108
|
async CA() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FabricEnrollmentService.js","sourceRoot":"","sources":["../../../src/client/services/FabricEnrollmentService.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAgD;AAWhD,gEAAuD;AACvD,yCAAoD;AACpD,2DAIiC;AACjC,oDAA+C;AAE/C,sDAAkD;AAOlD,sDAAwD;AACxD,uDAAgD;AAEhD;;;;;;GAMG;AACH,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,uCAAmB,CAAA;IACnB,qCAAiB,CAAA;IACjB,iCAAa,CAAA;IACb,mCAAe,CAAA;AACjB,CAAC,EANW,gBAAgB,gCAAhB,gBAAgB,QAM3B;AAiBD;;;;;;GAMG;AACH,IAAY,sBAQX;AARD,WAAY,sBAAsB;IAChC,iEAAuC,CAAA;IACvC,iFAAuD,CAAA;IACvD,2EAAiD,CAAA;IACjD,gEAAsC,CAAA;IACtC,kDAAwB,CAAA;IACxB,gEAAsC,CAAA;IACtC,gDAAsB,CAAA;AACxB,CAAC,EARW,sBAAsB,sCAAtB,sBAAsB,QAQjC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAa,uBAAwB,SAAQ,6BAAa;IAaxD,YAAoB,QAAkB;QACpC,KAAK,EAAE,CAAC;QADU,aAAQ,GAAR,QAAQ,CAAU;IAEtC,CAAC;IAES,KAAK,CAAC,IAAI;QAClB,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC,IAAI,CAAC;QAChC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"FabricEnrollmentService.js","sourceRoot":"","sources":["../../../src/client/services/FabricEnrollmentService.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAgD;AAWhD,gEAAuD;AACvD,yCAAoD;AACpD,2DAIiC;AACjC,oDAA+C;AAE/C,sDAAkD;AAOlD,sDAAwD;AACxD,uDAAgD;AAEhD;;;;;;GAMG;AACH,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,uCAAmB,CAAA;IACnB,qCAAiB,CAAA;IACjB,iCAAa,CAAA;IACb,mCAAe,CAAA;AACjB,CAAC,EANW,gBAAgB,gCAAhB,gBAAgB,QAM3B;AAiBD;;;;;;GAMG;AACH,IAAY,sBAQX;AARD,WAAY,sBAAsB;IAChC,iEAAuC,CAAA;IACvC,iFAAuD,CAAA;IACvD,2EAAiD,CAAA;IACjD,gEAAsC,CAAA;IACtC,kDAAwB,CAAA;IACxB,gEAAsC,CAAA;IACtC,gDAAsB,CAAA;AACxB,CAAC,EARW,sBAAsB,sCAAtB,sBAAsB,QAQjC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAa,uBAAwB,SAAQ,6BAAa;IAaxD,YAAoB,QAAkB;QACpC,KAAK,EAAE,CAAC;QADU,aAAQ,GAAR,QAAQ,CAAU;IAEtC,CAAC;IAES,KAAK,CAAC,IAAI;QAClB,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC,IAAI,CAAC;QAChC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,GAAG,CAAC,KAAK,CAAC,wBAAwB,MAAM,OAAO,GAAG,EAAE,CAAC,CAAC;QACtD,GAAG,CAAC,KAAK,CAAC,kCAAkC,MAAM,EAAE,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,MAAM,iBAAS,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;QACvE,IAAI,GAAuB,CAAC;QAC5B,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,6BAAa,CACrB,sCAAsC,MAAM,qDAAqD,CAClG,CAAC;YACJ,CAAC;YACD,GAAG,CAAC,KAAK,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAC;YAC7C,GAAG,GAAG,MAAM,iBAAS,CAAC,0BAA0B,CAAC,KAAK,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,KAAK,CACP,kCAAkC,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,CACvE,CAAC;QACJ,CAAC;QACD,GAAG,CAAC,KAAK,CAAC,6BAA6B,MAAM,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,GAAG,MAAM,iBAAS,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE;YACvE,GAAG;SACJ,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAES,KAAK,CAAC,EAAE;QAChB,IAAI,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QAE3C,gFAAgF;QAChF,wCAAwC;QACxC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,GAAiB,CAAC;QAEjD,MAAM,GAAG,KAAK,CAAC;QAEf,MAAM,IAAI,GAAI,YAAyB,CAAC,CAAC,CAAW,CAAC;QACrD,GAAG,CAAC,KAAK,CAAC,kCAAkC,IAAI,UAAU,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAE3E,MAAM,WAAW,GAAG,MAAM,iBAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACzD,GAAG,CAAC,KAAK,CAAC,6BAA6B,MAAM,UAAU,GAAG,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,EAAE,GAAG,IAAI,0BAAgB,CAC5B,GAAG,EACH;YACE,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;YACtC,MAAM;SACO,EACf,MAAM,CACP,CAAC;QACF,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;IAES,KAAK,CAAC,MAAM;QACpB,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC;QACpC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAI,EAAU,CAAC,mBAAmB,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAES,KAAK,CAAC,WAAW;QACzB,IAAI,CAAC,IAAI,CAAC,kBAAkB;YAC1B,IAAI,CAAC,kBAAkB,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,qBAAqB,EAAE,CAAC;QAC1E,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAES,KAAK,CAAC,YAAY;QAC1B,IAAI,CAAC,IAAI,CAAC,kBAAkB;YAC1B,IAAI,CAAC,kBAAkB,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,qBAAqB,EAAE,CAAC;QACtE,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAES,KAAK,CAAC,UAAU;QACxB,IAAI,CAAC,IAAI,CAAC,eAAe;YACvB,IAAI,CAAC,eAAe,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,kBAAkB,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,eAAe,CACnB,OAAgC,EAChC,KAAK,GAAG,IAAI;QAEZ,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC/C,GAAG,CAAC,KAAK,CACP,0BAA0B,OAAO,CAAC,CAAC,CAAC,QAAQ,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAC/F,CAAC;QACF,MAAM,QAAQ,GAAwB,CACpC,MAAM,kBAAkB,CAAC,eAAe,CAAC,OAAO,IAAI,EAAE,EAAE,IAAI,CAAC,CAC9D,CAAC,MAAM,CAAC;QACT,GAAG,CAAC,KAAK,CACP,SAAS,QAAQ,CAAC,KAAK,CAAC,MAAM,kBAAkB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAC3E,CAAC;QACF,OAAO,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC7D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,aAAa;QACjB,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAClD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC7C,GAAG,CAAC,KAAK,CAAC,kCAAkC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QACpE,MAAM,QAAQ,GAAqB,CACjC,MAAM,iBAAiB,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,CAClD,CAAC,MAAM,CAAC;QACT,GAAG,CAAC,KAAK,CACP,SAAS,QAAQ,CAAC,UAAU,CAAC,MAAM,gBAAgB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAC9E,CAAC;QACF,OAAO,QAAQ,CAAC,UAAU,CAAC;IAC7B,CAAC;IAES,UAAU,CAAC,CAAQ;QAC3B,MAAM,MAAM,GAAG,2CAA2C,CAAC;QAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,0BAAiB,CAAC,CAAC,CAAC,CAAC;QAC5C,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC;QAChC,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,IAAI,CAAC;YACV,KAAK,IAAI;gBACP,OAAO,IAAI,6BAAa,CAAC,OAAO,CAAC,CAAC;YACpC,KAAK,IAAI;gBACP,OAAO,IAAI,yBAAkB,CAAC,OAAO,CAAC,CAAC;YACzC;gBACE,OAAO,IAAI,0BAAiB,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,eAAe;QACnB,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC/C,GAAG,CAAC,KAAK,CAAC,oCAAoC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAG,CAAC,MAAM,kBAAkB,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;aAClE,MAAM,CAAC;QACV,GAAG,CAAC,KAAK,CACP,SAAS,QAAQ,CAAC,CAAC,CAAC,MAAM,kBAAkB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CACvE,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,IAAI,CAAC,YAAoB;QAC7B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAC/B,IAAI,MAAwB,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,EAAE,CAAC,kBAAkB,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QACpE,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,MAAM,IAAI,6BAAa,CACrB,oCAAoC,YAAY,KAAK,CAAC,EAAE,CACzD,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,OAAO;YACjB,MAAM,IAAI,6BAAa,CACrB,oCAAoC,YAAY,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAChF,CAAC;QAEJ,OAAO,MAAM,CAAC,MAAwB,CAAC;IACzC,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,QAAQ,CACZ,KAAkB,EAClB,cAAuB,KAAK,EAC5B,cAAsB,EAAE,EACxB,QAA2B,EAC3B,KAA0B,EAC1B,cAAuB;QAEvB,IAAI,YAAoB,CAAC;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;YACrC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG;gBACZ,YAAY,EAAE,QAAkB;gBAChC,gBAAgB,EAAE,QAAQ;gBAC1B,WAAW,EAAE,WAAW;gBACxB,QAAQ,EAAE,QAAQ;gBAClB,KAAK,EAAE,KAAK;gBACZ,cAAc,EAAE,cAAc;aACX,CAAC;YACtB,YAAY,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC9C,GAAG,CAAC,IAAI,CACN,oBAAoB,QAAQ,2BAA2B,QAAQ,IAAI,gBAAgB,IAAI,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5H,CAAC;QACJ,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,MAAM,CAAC,sBAAsB,CACrC,UAA2B,EAC3B,KAAa;QAEb,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC;QACzD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACtD,GAAG,CAAC,KAAK,CACP,wCAAwC,WAAW,WAAW,KAAK,EAAE,CACtE,CAAC;QACF,MAAM,QAAQ,GAAG,oBAAW,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;QAClE,MAAM,EAAE,GAAG,oBAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxC,GAAG,CAAC,KAAK,CAAC,YAAY,QAAQ,kBAAkB,EAAE,EAAE,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,OAAO,IAAI,mBAAQ,CAAC;YAClB,EAAE,EAAE,EAAE;YACN,WAAW,EAAE;gBACX,EAAE,EAAE,EAAE;gBACN,WAAW,EAAE,WAAW;gBACxB,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE;gBACzB,eAAe,EAAE,eAAe;gBAChC,SAAS,EAAE,GAAG;gBACd,SAAS,EAAE,GAAG;aACf;YACD,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,GAAG;SACf,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,MAAM,CAAC,YAAoB,EAAE,YAAoB;QACrD,IAAI,QAAkB,CAAC;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,EAAE,CAAC;YAC3B,GAAG,CAAC,KAAK,CAAC,aAAa,YAAY,EAAE,CAAC,CAAC;YACvC,MAAM,UAAU,GAAoB,MAAM,EAAE,CAAC,MAAM,CAAC;gBAClD,YAAY,EAAE,YAAY;gBAC1B,gBAAgB,EAAE,YAAY;aAC/B,CAAC,CAAC;YACH,QAAQ,GAAG,uBAAuB,CAAC,sBAAsB,CACvD,UAAU,EACV,IAAI,CAAC,QAAQ,CAAC,MAAM,CACrB,CAAC;YACF,GAAG,CAAC,IAAI,CACN,yBAAyB,YAAY,UAAU,IAAI,CAAC,QAAQ,CAAC,MAAM,OAAO,QAAQ,CAAC,EAAE,EAAE,CACxF,CAAC;QACJ,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,iBAAiB,CACrB,KAAkB,EAClB,cAAuB,KAAK,EAC5B,cAAsB,EAAE,EACxB,QAA2B,EAC3B,KAA0B,EAC1B,cAAuB;QAEvB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,CACtC,KAAK,EACL,WAAW,EACX,WAAW,EACX,QAAQ,EACR,KAAK,EACL,cAAc,CACf,CAAC;QACF,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;QAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,QAAkB,EAAE,YAAY,CAAC,CAAC;IACvD,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,MAAM,CAAC,YAAoB;QAC/B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ;YACX,MAAM,IAAI,6BAAa,CACrB,qCAAqC,YAAY,EAAE,CACpD,CAAC;QACJ,IAAI,MAAwB,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,CACtB,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,iBAAiB,EAAE,EACxD,IAAI,CACL,CAAC;QACJ,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,MAAM,IAAI,6BAAa,CACrB,uCAAuC,YAAY,KAAK,CAAC,EAAE,CAC5D,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,OAAO;YACjB,MAAM,IAAI,6BAAa,CACrB,uCAAuC,YAAY,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACnF,CAAC;QACJ,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAhXD,0DAgXC"}
|
|
@@ -14,7 +14,8 @@ export declare class HSMSignerFactoryCustom {
|
|
|
14
14
|
};
|
|
15
15
|
private assertDefined;
|
|
16
16
|
private getUncompressedPointOnCurve;
|
|
17
|
-
|
|
17
|
+
getSKIFromCertificatePath(certPath: string): Buffer<ArrayBufferLike>;
|
|
18
|
+
getSKIFromCertificate(cert: string | NonSharedBuffer): Buffer;
|
|
18
19
|
}
|
|
19
20
|
export interface HSMConfig {
|
|
20
21
|
label: string;
|
|
@@ -3,7 +3,7 @@ import fs from "fs";
|
|
|
3
3
|
import path from "path";
|
|
4
4
|
import { MissingPKCSS11Lib } from "./../shared/errors.js";
|
|
5
5
|
import crypto from "crypto";
|
|
6
|
-
import
|
|
6
|
+
import { p256 } from "@noble/curves/nist";
|
|
7
7
|
export class HSMSignerFactoryCustom {
|
|
8
8
|
static #pkcs11 = null;
|
|
9
9
|
static #initialized = false;
|
|
@@ -119,8 +119,8 @@ export class HSMSignerFactoryCustom {
|
|
|
119
119
|
const compactSignature = await HSMSignerFactoryCustom.#pkcs11.C_SignAsync(session, Buffer.from(digest),
|
|
120
120
|
// EC signatures have length of 2n according to the PKCS11 spec:
|
|
121
121
|
// https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/pkcs11-spec-v3.1.html
|
|
122
|
-
Buffer.alloc(
|
|
123
|
-
return
|
|
122
|
+
Buffer.alloc(p256.Point.Fn.BYTES * 2));
|
|
123
|
+
return p256.Signature.fromBytes(compactSignature, "compact")
|
|
124
124
|
.normalizeS()
|
|
125
125
|
.toBytes("der");
|
|
126
126
|
},
|
|
@@ -142,12 +142,15 @@ export class HSMSignerFactoryCustom {
|
|
|
142
142
|
const prefix = Buffer.from("04", "hex");
|
|
143
143
|
return Buffer.concat([prefix, x, y]);
|
|
144
144
|
}
|
|
145
|
-
|
|
145
|
+
getSKIFromCertificatePath(certPath) {
|
|
146
146
|
const p = certPath.endsWith(".pem")
|
|
147
147
|
? certPath
|
|
148
148
|
: path.join(certPath, "cert.pem");
|
|
149
149
|
const credentials = fs.readFileSync(p);
|
|
150
|
-
|
|
150
|
+
return this.getSKIFromCertificate(credentials);
|
|
151
|
+
}
|
|
152
|
+
getSKIFromCertificate(cert) {
|
|
153
|
+
const certificate = new crypto.X509Certificate(cert);
|
|
151
154
|
const uncompressedPoint = this.getUncompressedPointOnCurve(certificate.publicKey);
|
|
152
155
|
return crypto.createHash("sha256").update(uncompressedPoint).digest();
|
|
153
156
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fabric-hsm.js","sourceRoot":"","sources":["../../../src/client/fabric-hsm.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,8BAAyB;AACrD,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,IAAI,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"fabric-hsm.js","sourceRoot":"","sources":["../../../src/client/fabric-hsm.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,15 +77,26 @@ export class FabricEnrollmentService extends LoggedService {
|
|
|
77
77
|
async User() {
|
|
78
78
|
if (this.user)
|
|
79
79
|
return this.user;
|
|
80
|
-
const { caName, caCert, caKey, url } = this.caConfig;
|
|
80
|
+
const { caName, caCert, caKey, url, hsm } = this.caConfig;
|
|
81
81
|
const log = this.log.for(this.User);
|
|
82
82
|
log.debug(`Creating CA user for ${caName} at ${url}`);
|
|
83
83
|
log.debug(`Retrieving CA certificate from ${caCert}`);
|
|
84
84
|
const certificate = await CoreUtils.getFirstDirFileNameContent(caCert);
|
|
85
|
-
|
|
86
|
-
|
|
85
|
+
let key;
|
|
86
|
+
if (!hsm) {
|
|
87
|
+
if (!caKey) {
|
|
88
|
+
throw new InternalError(`Missing caKey configuration for CA ${caName}. Provide a key directory or configure HSM support.`);
|
|
89
|
+
}
|
|
90
|
+
log.debug(`Retrieving CA key from ${caKey}`);
|
|
91
|
+
key = await CoreUtils.getFirstDirFileNameContent(caKey);
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
log.debug(`Using HSM configuration for CA ${caName} with library ${hsm.library}`);
|
|
95
|
+
}
|
|
87
96
|
log.debug(`Loading Admin user for ca ${caName}`);
|
|
88
|
-
this.user = await CoreUtils.getCAUser("admin", key, certificate, caName
|
|
97
|
+
this.user = await CoreUtils.getCAUser("admin", key, certificate, caName, {
|
|
98
|
+
hsm,
|
|
99
|
+
});
|
|
89
100
|
return this.user;
|
|
90
101
|
}
|
|
91
102
|
async CA() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FabricEnrollmentService.js","sourceRoot":"","sources":["../../../../src/client/services/FabricEnrollmentService.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,kBAAkB,CAAC;AAWhD,OAAO,EAAE,QAAQ,EAAE,yCAAoC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EACL,aAAa,EACb,aAAa,EACb,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,gCAA2B;AAE/C,OAAO,EAAE,WAAW,EAAE,iCAA4B;AAOlD,OAAO,EAAE,iBAAiB,EAAE,iCAA4B;AACxD,OAAO,EAAE,aAAa,EAAE,2BAAwB;AAEhD;;;;;;GAMG;AACH,MAAM,CAAN,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,uCAAmB,CAAA;IACnB,qCAAiB,CAAA;IACjB,iCAAa,CAAA;IACb,mCAAe,CAAA;AACjB,CAAC,EANW,gBAAgB,KAAhB,gBAAgB,QAM3B;AAiBD;;;;;;GAMG;AACH,MAAM,CAAN,IAAY,sBAQX;AARD,WAAY,sBAAsB;IAChC,iEAAuC,CAAA;IACvC,iFAAuD,CAAA;IACvD,2EAAiD,CAAA;IACjD,gEAAsC,CAAA;IACtC,kDAAwB,CAAA;IACxB,gEAAsC,CAAA;IACtC,gDAAsB,CAAA;AACxB,CAAC,EARW,sBAAsB,KAAtB,sBAAsB,QAQjC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,OAAO,uBAAwB,SAAQ,aAAa;IAaxD,YAAoB,QAAkB;QACpC,KAAK,EAAE,CAAC;QADU,aAAQ,GAAR,QAAQ,CAAU;IAEtC,CAAC;IAES,KAAK,CAAC,IAAI;QAClB,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC,IAAI,CAAC;QAChC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"FabricEnrollmentService.js","sourceRoot":"","sources":["../../../../src/client/services/FabricEnrollmentService.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,7 +64,7 @@ export type FabricFlags = RepositoryFlags;
|
|
|
64
64
|
* @property {string} caName - Path to the directory containing certificates
|
|
65
65
|
* @property {string} tlsCertPath - Path to the TLS certificate
|
|
66
66
|
* @property {string} caCert - Endpoint URL for the peer
|
|
67
|
-
* @property {string} caKey - Host alias for the peer
|
|
67
|
+
* @property {string} [caKey] - Host alias for the peer or directory containing the admin private key
|
|
68
68
|
* @memberOf module:for-fabric.shared
|
|
69
69
|
*/
|
|
70
70
|
export type CAConfig = {
|
|
@@ -72,7 +72,7 @@ export type CAConfig = {
|
|
|
72
72
|
tls?: TLSOptions;
|
|
73
73
|
caName: string;
|
|
74
74
|
caCert: string;
|
|
75
|
-
caKey
|
|
75
|
+
caKey?: string;
|
|
76
76
|
hsm?: HSMOptions;
|
|
77
77
|
};
|
|
78
78
|
/**
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Identity, Signer } from "@hyperledger/fabric-gateway";
|
|
2
2
|
import { User } from "fabric-common";
|
|
3
|
+
import { HSMOptions } from "./types";
|
|
3
4
|
/**
|
|
4
5
|
* @description Normalizes imports to handle both CommonJS and ESModule formats.
|
|
5
6
|
* @summary Utility function to handle module import differences between formats.
|
|
@@ -51,7 +52,12 @@ export declare class CoreUtils {
|
|
|
51
52
|
* @param {string} mspId - Membership Service Provider identifier
|
|
52
53
|
* @return {Promise<User>} The enrolled Fabric User instance
|
|
53
54
|
*/
|
|
54
|
-
static getCAUser(userName: string, privateKey: string, certificate: string, mspId: string
|
|
55
|
+
static getCAUser(userName: string, privateKey: string | undefined, certificate: string, mspId: string, options?: {
|
|
56
|
+
hsm?: HSMOptions;
|
|
57
|
+
}): Promise<User>;
|
|
58
|
+
private static getSoftwareEnrollmentKey;
|
|
59
|
+
private static getHSMEnrollmentKey;
|
|
60
|
+
static getCertificateSKI(certificate: string): Promise<Buffer>;
|
|
55
61
|
/**
|
|
56
62
|
* @description Build a Fabric Gateway Identity from an MSP ID and certificate
|
|
57
63
|
* @summary Reads a certificate from a directory path or accepts raw content and returns an Identity object suitable for the Fabric Gateway.
|
package/lib/esm/shared/utils.js
CHANGED
|
@@ -70,15 +70,53 @@ export class CoreUtils {
|
|
|
70
70
|
* @param {string} mspId - Membership Service Provider identifier
|
|
71
71
|
* @return {Promise<User>} The enrolled Fabric User instance
|
|
72
72
|
*/
|
|
73
|
-
static async getCAUser(userName, privateKey, certificate, mspId) {
|
|
73
|
+
static async getCAUser(userName, privateKey, certificate, mspId, options) {
|
|
74
74
|
this.logger.debug(stringFormat("Creating CA {0} user {1} with certificate {2}", mspId, userName, certificate));
|
|
75
75
|
const user = new User(userName);
|
|
76
|
-
const cryptoSuite = User.newCryptoSuite(
|
|
76
|
+
const cryptoSuite = User.newCryptoSuite(options?.hsm
|
|
77
|
+
? {
|
|
78
|
+
software: false,
|
|
79
|
+
lib: options.hsm.library,
|
|
80
|
+
slot: options.hsm.slot,
|
|
81
|
+
label: options.hsm.tokenLabel,
|
|
82
|
+
pin: options.hsm.pin,
|
|
83
|
+
}
|
|
84
|
+
: undefined);
|
|
77
85
|
user.setCryptoSuite(cryptoSuite);
|
|
78
|
-
const
|
|
79
|
-
|
|
86
|
+
const enrollmentKey = options?.hsm
|
|
87
|
+
? await this.getHSMEnrollmentKey(cryptoSuite, certificate, options.hsm)
|
|
88
|
+
: this.getSoftwareEnrollmentKey(cryptoSuite, privateKey);
|
|
89
|
+
await user.setEnrollment(enrollmentKey, certificate, mspId);
|
|
80
90
|
return user;
|
|
81
91
|
}
|
|
92
|
+
static getSoftwareEnrollmentKey(cryptoSuite, privateKey) {
|
|
93
|
+
if (!privateKey) {
|
|
94
|
+
throw new Error("Private key must be provided when HSM configuration is not supplied");
|
|
95
|
+
}
|
|
96
|
+
return cryptoSuite.createKeyFromRaw(privateKey);
|
|
97
|
+
}
|
|
98
|
+
static async getHSMEnrollmentKey(cryptoSuite, certificate, hsm) {
|
|
99
|
+
const ski = hsm.keyIdHex && hsm.keyIdHex.trim().length > 0
|
|
100
|
+
? Buffer.from(hsm.keyIdHex, "hex")
|
|
101
|
+
: await this.getCertificateSKI(certificate);
|
|
102
|
+
const key = await cryptoSuite.getKey(ski);
|
|
103
|
+
if (!key || (typeof key.isPrivate === "function" && !key.isPrivate())) {
|
|
104
|
+
throw new Error("Unable to resolve private key from HSM");
|
|
105
|
+
}
|
|
106
|
+
return key;
|
|
107
|
+
}
|
|
108
|
+
static async getCertificateSKI(certificate) {
|
|
109
|
+
const crypto = await normalizeImport(import("crypto"));
|
|
110
|
+
const x509 = new crypto.X509Certificate(certificate);
|
|
111
|
+
const jwk = x509.publicKey.export({ format: "jwk" });
|
|
112
|
+
const prefix = Buffer.from([0x04]);
|
|
113
|
+
const x = Buffer.from(jwk.x || "", "base64url");
|
|
114
|
+
const y = Buffer.from(jwk.y || "", "base64url");
|
|
115
|
+
return crypto
|
|
116
|
+
.createHash("sha256")
|
|
117
|
+
.update(Buffer.concat([prefix, x, y]))
|
|
118
|
+
.digest();
|
|
119
|
+
}
|
|
82
120
|
/**
|
|
83
121
|
* @description Build a Fabric Gateway Identity from an MSP ID and certificate
|
|
84
122
|
* @summary Reads a certificate from a directory path or accepts raw content and returns an Identity object suitable for the Fabric Gateway.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/shared/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAmB,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAoB,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/shared/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "0.0.
|
|
1
|
+
export declare const VERSION = "0.0.23";
|
|
2
2
|
export declare const PACKAGE_NAME = "@decaf-ts/for-fabric";
|
package/lib/esm/version.js
CHANGED
package/lib/shared/types.d.ts
CHANGED
|
@@ -64,7 +64,7 @@ export type FabricFlags = RepositoryFlags;
|
|
|
64
64
|
* @property {string} caName - Path to the directory containing certificates
|
|
65
65
|
* @property {string} tlsCertPath - Path to the TLS certificate
|
|
66
66
|
* @property {string} caCert - Endpoint URL for the peer
|
|
67
|
-
* @property {string} caKey - Host alias for the peer
|
|
67
|
+
* @property {string} [caKey] - Host alias for the peer or directory containing the admin private key
|
|
68
68
|
* @memberOf module:for-fabric.shared
|
|
69
69
|
*/
|
|
70
70
|
export type CAConfig = {
|
|
@@ -72,7 +72,7 @@ export type CAConfig = {
|
|
|
72
72
|
tls?: TLSOptions;
|
|
73
73
|
caName: string;
|
|
74
74
|
caCert: string;
|
|
75
|
-
caKey
|
|
75
|
+
caKey?: string;
|
|
76
76
|
hsm?: HSMOptions;
|
|
77
77
|
};
|
|
78
78
|
/**
|
package/lib/shared/utils.cjs
CHANGED
|
@@ -107,15 +107,53 @@ class CoreUtils {
|
|
|
107
107
|
* @param {string} mspId - Membership Service Provider identifier
|
|
108
108
|
* @return {Promise<User>} The enrolled Fabric User instance
|
|
109
109
|
*/
|
|
110
|
-
static async getCAUser(userName, privateKey, certificate, mspId) {
|
|
110
|
+
static async getCAUser(userName, privateKey, certificate, mspId, options) {
|
|
111
111
|
this.logger.debug((0, decorator_validation_1.stringFormat)("Creating CA {0} user {1} with certificate {2}", mspId, userName, certificate));
|
|
112
112
|
const user = new fabric_common_1.User(userName);
|
|
113
|
-
const cryptoSuite = fabric_common_1.User.newCryptoSuite(
|
|
113
|
+
const cryptoSuite = fabric_common_1.User.newCryptoSuite(options?.hsm
|
|
114
|
+
? {
|
|
115
|
+
software: false,
|
|
116
|
+
lib: options.hsm.library,
|
|
117
|
+
slot: options.hsm.slot,
|
|
118
|
+
label: options.hsm.tokenLabel,
|
|
119
|
+
pin: options.hsm.pin,
|
|
120
|
+
}
|
|
121
|
+
: undefined);
|
|
114
122
|
user.setCryptoSuite(cryptoSuite);
|
|
115
|
-
const
|
|
116
|
-
|
|
123
|
+
const enrollmentKey = options?.hsm
|
|
124
|
+
? await this.getHSMEnrollmentKey(cryptoSuite, certificate, options.hsm)
|
|
125
|
+
: this.getSoftwareEnrollmentKey(cryptoSuite, privateKey);
|
|
126
|
+
await user.setEnrollment(enrollmentKey, certificate, mspId);
|
|
117
127
|
return user;
|
|
118
128
|
}
|
|
129
|
+
static getSoftwareEnrollmentKey(cryptoSuite, privateKey) {
|
|
130
|
+
if (!privateKey) {
|
|
131
|
+
throw new Error("Private key must be provided when HSM configuration is not supplied");
|
|
132
|
+
}
|
|
133
|
+
return cryptoSuite.createKeyFromRaw(privateKey);
|
|
134
|
+
}
|
|
135
|
+
static async getHSMEnrollmentKey(cryptoSuite, certificate, hsm) {
|
|
136
|
+
const ski = hsm.keyIdHex && hsm.keyIdHex.trim().length > 0
|
|
137
|
+
? Buffer.from(hsm.keyIdHex, "hex")
|
|
138
|
+
: await this.getCertificateSKI(certificate);
|
|
139
|
+
const key = await cryptoSuite.getKey(ski);
|
|
140
|
+
if (!key || (typeof key.isPrivate === "function" && !key.isPrivate())) {
|
|
141
|
+
throw new Error("Unable to resolve private key from HSM");
|
|
142
|
+
}
|
|
143
|
+
return key;
|
|
144
|
+
}
|
|
145
|
+
static async getCertificateSKI(certificate) {
|
|
146
|
+
const crypto = await normalizeImport(Promise.resolve().then(() => __importStar(require("crypto"))));
|
|
147
|
+
const x509 = new crypto.X509Certificate(certificate);
|
|
148
|
+
const jwk = x509.publicKey.export({ format: "jwk" });
|
|
149
|
+
const prefix = Buffer.from([0x04]);
|
|
150
|
+
const x = Buffer.from(jwk.x || "", "base64url");
|
|
151
|
+
const y = Buffer.from(jwk.y || "", "base64url");
|
|
152
|
+
return crypto
|
|
153
|
+
.createHash("sha256")
|
|
154
|
+
.update(Buffer.concat([prefix, x, y]))
|
|
155
|
+
.digest();
|
|
156
|
+
}
|
|
119
157
|
/**
|
|
120
158
|
* @description Build a Fabric Gateway Identity from an MSP ID and certificate
|
|
121
159
|
* @summary Reads a certificate from a directory path or accepts raw content and returns an Identity object suitable for the Fabric Gateway.
|
package/lib/shared/utils.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Identity, Signer } from "@hyperledger/fabric-gateway";
|
|
2
2
|
import { User } from "fabric-common";
|
|
3
|
+
import { HSMOptions } from "./types";
|
|
3
4
|
/**
|
|
4
5
|
* @description Normalizes imports to handle both CommonJS and ESModule formats.
|
|
5
6
|
* @summary Utility function to handle module import differences between formats.
|
|
@@ -51,7 +52,12 @@ export declare class CoreUtils {
|
|
|
51
52
|
* @param {string} mspId - Membership Service Provider identifier
|
|
52
53
|
* @return {Promise<User>} The enrolled Fabric User instance
|
|
53
54
|
*/
|
|
54
|
-
static getCAUser(userName: string, privateKey: string, certificate: string, mspId: string
|
|
55
|
+
static getCAUser(userName: string, privateKey: string | undefined, certificate: string, mspId: string, options?: {
|
|
56
|
+
hsm?: HSMOptions;
|
|
57
|
+
}): Promise<User>;
|
|
58
|
+
private static getSoftwareEnrollmentKey;
|
|
59
|
+
private static getHSMEnrollmentKey;
|
|
60
|
+
static getCertificateSKI(certificate: string): Promise<Buffer>;
|
|
55
61
|
/**
|
|
56
62
|
* @description Build a Fabric Gateway Identity from an MSP ID and certificate
|
|
57
63
|
* @summary Reads a certificate from a directory path or accepts raw content and returns an Identity object suitable for the Fabric Gateway.
|
package/lib/shared/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/version.cjs
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PACKAGE_NAME = exports.VERSION = void 0;
|
|
4
4
|
const decoration_1 = require("@decaf-ts/decoration");
|
|
5
|
-
exports.VERSION = "0.0.
|
|
5
|
+
exports.VERSION = "0.0.23";
|
|
6
6
|
exports.PACKAGE_NAME = "@decaf-ts/for-fabric";
|
|
7
7
|
decoration_1.Metadata.registerLibrary(exports.PACKAGE_NAME, exports.VERSION);
|
|
8
8
|
//# sourceMappingURL=version.js.map
|
package/lib/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "0.0.
|
|
1
|
+
export declare const VERSION = "0.0.23";
|
|
2
2
|
export declare const PACKAGE_NAME = "@decaf-ts/for-fabric";
|