@cef-ebsi/cli 1.0.0 → 1.1.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/LICENSE.txt +289 -0
- package/README.md +6 -6
- package/dist/app.js +42 -5
- package/dist/app.js.map +1 -1
- package/dist/commands/compute.js +13 -29
- package/dist/commands/compute.js.map +1 -1
- package/dist/commands/conformance-v3.js +31 -49
- package/dist/commands/conformance-v3.js.map +1 -1
- package/dist/commands/hardwarewallet.js +36 -0
- package/dist/commands/hardwarewallet.js.map +1 -0
- package/dist/commands/index.js +2 -0
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/tnl.js +82 -0
- package/dist/commands/tnl.js.map +1 -0
- package/dist/config.js +2 -0
- package/dist/config.js.map +1 -1
- package/dist/scripts/accreditAndAuthorize/conformance/step3 +1 -1
- package/dist/scripts/assets/Nodes.json +32 -0
- package/dist/scripts/assets/TrustedNodesList.json +33 -0
- package/dist/scripts/issueVcTnl +28 -0
- package/dist/scripts/verifyVcTnl +8 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/Client.js +32 -34
- package/dist/utils/Client.js.map +1 -1
- package/dist/utils/HardwareWallet.js +251 -0
- package/dist/utils/HardwareWallet.js.map +1 -0
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/utils.js +10 -2
- package/dist/utils/utils.js.map +1 -1
- package/dist/utils/verifiablePresentation.js +18 -19
- package/dist/utils/verifiablePresentation.js.map +1 -1
- package/package.json +8 -1
- package/LICENSE +0 -190
package/dist/utils/Client.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import crypto from "node:crypto";
|
|
2
1
|
import { EbsiWallet } from "@cef-ebsi/wallet-lib";
|
|
3
2
|
import elliptic from "elliptic";
|
|
4
3
|
import { base64url } from "multiformats/bases/base64";
|
|
5
|
-
import { exportJWK, generateKeyPair } from "jose";
|
|
4
|
+
import { exportJWK, generateKeyPair, importJWK, SignJWT } from "jose";
|
|
6
5
|
import { removePrefix0x } from "./utils.js";
|
|
7
6
|
const EC = elliptic.ec;
|
|
8
7
|
export async function generateKeys(alg) {
|
|
@@ -12,19 +11,6 @@ export async function generateKeys(alg) {
|
|
|
12
11
|
privateKeyJwk: await exportJWK(keys.privateKey),
|
|
13
12
|
};
|
|
14
13
|
}
|
|
15
|
-
export async function generateKeysEncryption(alg) {
|
|
16
|
-
let keys;
|
|
17
|
-
if (alg === "EdDSA") {
|
|
18
|
-
keys = crypto.generateKeyPairSync("x25519");
|
|
19
|
-
}
|
|
20
|
-
else {
|
|
21
|
-
keys = await generateKeyPair(alg);
|
|
22
|
-
}
|
|
23
|
-
return {
|
|
24
|
-
publicKeyEncryptionJwk: await exportJWK(keys.publicKey),
|
|
25
|
-
privateKeyEncryptionJwk: await exportJWK(keys.privateKey),
|
|
26
|
-
};
|
|
27
|
-
}
|
|
28
14
|
function getPublicKeyJwk(jwk, alg) {
|
|
29
15
|
switch (alg) {
|
|
30
16
|
case "ES256K":
|
|
@@ -72,6 +58,7 @@ export function getPrivateKeyJwk(privateKeyHex) {
|
|
|
72
58
|
export class Client {
|
|
73
59
|
keys;
|
|
74
60
|
ethWallet;
|
|
61
|
+
hardwareWallet;
|
|
75
62
|
privateKeyHex;
|
|
76
63
|
did;
|
|
77
64
|
didVersion;
|
|
@@ -85,28 +72,16 @@ export class Client {
|
|
|
85
72
|
}
|
|
86
73
|
async createRandom(alg) {
|
|
87
74
|
const { privateKeyJwk } = await generateKeys(alg);
|
|
88
|
-
|
|
75
|
+
this.setJwk(alg, privateKeyJwk);
|
|
89
76
|
}
|
|
90
|
-
|
|
91
|
-
let privateKeyEncryptionJwk;
|
|
92
|
-
let publicKeyEncryptionJwk;
|
|
77
|
+
setJwk(alg, privateKeyJwk) {
|
|
93
78
|
const publicKeyJwk = getPublicKeyJwk(privateKeyJwk, alg);
|
|
94
|
-
if (alg === "ES256K") {
|
|
95
|
-
privateKeyEncryptionJwk = privateKeyJwk;
|
|
96
|
-
publicKeyEncryptionJwk = publicKeyJwk;
|
|
97
|
-
}
|
|
98
|
-
else {
|
|
99
|
-
const pair = await generateKeysEncryption(alg);
|
|
100
|
-
privateKeyEncryptionJwk = pair.privateKeyEncryptionJwk;
|
|
101
|
-
publicKeyEncryptionJwk = pair.publicKeyEncryptionJwk;
|
|
102
|
-
}
|
|
103
79
|
this.keys[alg] = {
|
|
104
80
|
id: "",
|
|
105
81
|
kid: "",
|
|
106
82
|
privateKeyJwk,
|
|
107
83
|
publicKeyJwk,
|
|
108
|
-
|
|
109
|
-
publicKeyEncryptionJwk,
|
|
84
|
+
isHardwareWallet: false,
|
|
110
85
|
};
|
|
111
86
|
}
|
|
112
87
|
generateDidDocument() {
|
|
@@ -138,6 +113,33 @@ export class Client {
|
|
|
138
113
|
});
|
|
139
114
|
return didDocument;
|
|
140
115
|
}
|
|
116
|
+
async signJWT(inputPayload, inputHeader, alg) {
|
|
117
|
+
if (!this.keys[alg])
|
|
118
|
+
throw new Error(`There is no key defined for alg ${alg}`);
|
|
119
|
+
const header = {
|
|
120
|
+
alg,
|
|
121
|
+
typ: "JWT",
|
|
122
|
+
kid: this.keys[alg].kid,
|
|
123
|
+
...(this.didVersion === 2 && {
|
|
124
|
+
jwk: this.keys[alg].publicKeyJwk,
|
|
125
|
+
}),
|
|
126
|
+
...inputHeader,
|
|
127
|
+
};
|
|
128
|
+
const payload = {
|
|
129
|
+
iss: this.did,
|
|
130
|
+
...inputPayload,
|
|
131
|
+
};
|
|
132
|
+
if (this.keys[alg].isHardwareWallet) {
|
|
133
|
+
const jwt = this.hardwareWallet.signJWT(payload, header);
|
|
134
|
+
return jwt;
|
|
135
|
+
}
|
|
136
|
+
const privateKey = await importJWK(this.keys[alg].privateKeyJwk, alg);
|
|
137
|
+
const jwt = await new SignJWT(payload)
|
|
138
|
+
.setProtectedHeader(header)
|
|
139
|
+
// .setIssuer(this.did)
|
|
140
|
+
.sign(privateKey);
|
|
141
|
+
return jwt;
|
|
142
|
+
}
|
|
141
143
|
privateKeysBase64() {
|
|
142
144
|
const keys = [];
|
|
143
145
|
Object.keys(this.keys).forEach((alg) => {
|
|
@@ -150,10 +152,6 @@ export class Client {
|
|
|
150
152
|
alg,
|
|
151
153
|
privateKeyJwk: key.privateKeyJwk,
|
|
152
154
|
publicKeyJwk: key.publicKeyJwk,
|
|
153
|
-
...(alg === "EdDSA" && {
|
|
154
|
-
privateKeyEncryptionJwk: key.privateKeyEncryptionJwk,
|
|
155
|
-
publicKeyEncryptionJwk: key.publicKeyEncryptionJwk,
|
|
156
|
-
}),
|
|
157
155
|
});
|
|
158
156
|
});
|
|
159
157
|
return Buffer.from(JSON.stringify(keys)).toString("base64");
|
package/dist/utils/Client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../src/utils/Client.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../src/utils/Client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,251 @@
|
|
|
1
|
+
import * as asn1 from "asn1js";
|
|
2
|
+
import * as graphene from "graphene-pk11";
|
|
3
|
+
import * as pki from "pkijs";
|
|
4
|
+
import crypto from "crypto";
|
|
5
|
+
import { base64url } from "multiformats/bases/base64";
|
|
6
|
+
import { KeyEncoder } from "@cef-ebsi/key-encoder";
|
|
7
|
+
import { yellow } from "./print.js";
|
|
8
|
+
const { Module } = graphene;
|
|
9
|
+
function convertRawSignatureToDER(rawSignature) {
|
|
10
|
+
if (rawSignature.length !== 64) {
|
|
11
|
+
throw new Error("Raw signature must be 64 bytes (32 bytes for r and 32 bytes for s)");
|
|
12
|
+
}
|
|
13
|
+
// Split raw signature into r and s
|
|
14
|
+
const r = rawSignature.subarray(0, 32);
|
|
15
|
+
const s = rawSignature.subarray(32);
|
|
16
|
+
// Function to add leading zero if needed
|
|
17
|
+
function toDERInteger(value) {
|
|
18
|
+
if (value[0] & 0x80) {
|
|
19
|
+
// If the first byte is >= 0x80, prepend 0x00 to indicate a positive integer
|
|
20
|
+
return Buffer.concat([Buffer.from([0x00]), value]);
|
|
21
|
+
}
|
|
22
|
+
return value;
|
|
23
|
+
}
|
|
24
|
+
// Convert r and s to DER integers
|
|
25
|
+
const rDER = toDERInteger(r);
|
|
26
|
+
const sDER = toDERInteger(s);
|
|
27
|
+
// Create DER-encoded SEQUENCE containing the r and s values
|
|
28
|
+
const derSignature = Buffer.concat([
|
|
29
|
+
Buffer.from([0x30]), // ASN.1 SEQUENCE tag
|
|
30
|
+
Buffer.from([rDER.length + sDER.length + 4]), // Total length of SEQUENCE
|
|
31
|
+
Buffer.from([0x02]), // ASN.1 INTEGER tag for r
|
|
32
|
+
Buffer.from([rDER.length]), // Length of r
|
|
33
|
+
rDER, // r value
|
|
34
|
+
Buffer.from([0x02]), // ASN.1 INTEGER tag for s
|
|
35
|
+
Buffer.from([sDER.length]), // Length of s
|
|
36
|
+
sDER, // s value
|
|
37
|
+
]);
|
|
38
|
+
return derSignature;
|
|
39
|
+
}
|
|
40
|
+
export class HardwareWallet {
|
|
41
|
+
pin = "123456";
|
|
42
|
+
adminPin = "12345678";
|
|
43
|
+
mod;
|
|
44
|
+
slots;
|
|
45
|
+
slot;
|
|
46
|
+
slotNumber;
|
|
47
|
+
session;
|
|
48
|
+
constructor(library) {
|
|
49
|
+
this.mod = Module.load(library, "OpenSC");
|
|
50
|
+
}
|
|
51
|
+
init() {
|
|
52
|
+
this.mod.initialize();
|
|
53
|
+
this.slotNumber = 0;
|
|
54
|
+
// get slots
|
|
55
|
+
this.slots = this.mod.getSlots(true);
|
|
56
|
+
if (this.slots.length === 0) {
|
|
57
|
+
this.mod.finalize();
|
|
58
|
+
throw new Error("No slots found. Make sure your Ledger is connected and the OpenPGP app is open.");
|
|
59
|
+
}
|
|
60
|
+
this.slot = this.slots.items(this.slotNumber);
|
|
61
|
+
if (!(this.slot.flags & graphene.SlotFlag.TOKEN_PRESENT)) {
|
|
62
|
+
this.mod.finalize();
|
|
63
|
+
throw new Error(`Slot ${this.slotNumber} is not initialized`);
|
|
64
|
+
}
|
|
65
|
+
this.session = this.slot.open(graphene.SessionFlag.RW_SESSION | graphene.SessionFlag.SERIAL_SESSION);
|
|
66
|
+
this.session.login(this.pin, graphene.UserType.USER);
|
|
67
|
+
}
|
|
68
|
+
logout() {
|
|
69
|
+
if (!this.session)
|
|
70
|
+
return;
|
|
71
|
+
this.session.logout();
|
|
72
|
+
this.mod.finalize();
|
|
73
|
+
}
|
|
74
|
+
getInfo() {
|
|
75
|
+
if (!this.session)
|
|
76
|
+
this.init();
|
|
77
|
+
return {
|
|
78
|
+
slot: this.slotNumber,
|
|
79
|
+
description: this.slot.slotDescription,
|
|
80
|
+
serial: this.slot.getToken().serialNumber,
|
|
81
|
+
password: {
|
|
82
|
+
min: this.slot.getToken().minPinLen,
|
|
83
|
+
max: this.slot.getToken().maxPinLen,
|
|
84
|
+
},
|
|
85
|
+
isHardware: Boolean(this.slot.flags & graphene.SlotFlag.HW_SLOT),
|
|
86
|
+
isRemovable: Boolean(this.slot.flags & graphene.SlotFlag.REMOVABLE_DEVICE),
|
|
87
|
+
isInitialized: Boolean(this.slot.flags & graphene.SlotFlag.TOKEN_PRESENT),
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
generateKeys() {
|
|
91
|
+
if (!this.session)
|
|
92
|
+
this.init();
|
|
93
|
+
this.session.logout();
|
|
94
|
+
this.session.login(this.adminPin, graphene.UserType.SO);
|
|
95
|
+
const privateKeys = this.session.find({
|
|
96
|
+
class: graphene.ObjectClass.PRIVATE_KEY,
|
|
97
|
+
keyType: graphene.KeyType.ECDSA,
|
|
98
|
+
paramsECDSA: graphene.NamedCurve.getByName("secp256r1").value,
|
|
99
|
+
sign: true,
|
|
100
|
+
token: true,
|
|
101
|
+
});
|
|
102
|
+
if (privateKeys.length > 0) {
|
|
103
|
+
yellow("A P-256 key pair already exists");
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
try {
|
|
107
|
+
this.session.generateKeyPair(graphene.KeyGenMechanism.ECDSA,
|
|
108
|
+
// Public template
|
|
109
|
+
{
|
|
110
|
+
keyType: graphene.KeyType.ECDSA,
|
|
111
|
+
paramsECDSA: graphene.NamedCurve.getByName("secp256r1").value,
|
|
112
|
+
token: true,
|
|
113
|
+
verify: true,
|
|
114
|
+
},
|
|
115
|
+
// Private template
|
|
116
|
+
{
|
|
117
|
+
derive: true,
|
|
118
|
+
extractable: true,
|
|
119
|
+
keyType: graphene.KeyType.ECDSA,
|
|
120
|
+
paramsECDSA: graphene.NamedCurve.getByName("secp256r1").value,
|
|
121
|
+
sign: true,
|
|
122
|
+
token: true,
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
catch (error) {
|
|
126
|
+
if (error instanceof Error) {
|
|
127
|
+
this.session.logout();
|
|
128
|
+
if (error.message === "CKR_FUNCTION_NOT_SUPPORTED") {
|
|
129
|
+
throw new Error('CKR_FUNCTION_NOT_SUPPORTED: in your OpenPGP app, go to "Settings" > "Key template", then set "Key" to "Signature" and "Type" to "SECP 256R1", and finally click on "Set Template".');
|
|
130
|
+
}
|
|
131
|
+
throw error;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
yellow("Key pair generated successfully!");
|
|
135
|
+
this.session.logout();
|
|
136
|
+
}
|
|
137
|
+
getPublicKey(format) {
|
|
138
|
+
if (!this.session)
|
|
139
|
+
this.init();
|
|
140
|
+
const publicKeys = this.session.find({
|
|
141
|
+
class: graphene.ObjectClass.PUBLIC_KEY,
|
|
142
|
+
keyType: graphene.KeyType.ECDSA,
|
|
143
|
+
});
|
|
144
|
+
if (publicKeys.length === 0) {
|
|
145
|
+
throw new Error('No EC public key found. Run the "generate-key" command first.');
|
|
146
|
+
}
|
|
147
|
+
const publicKey = publicKeys.items(0).toType();
|
|
148
|
+
const { pointEC } = publicKey.getAttribute({ pointEC: null });
|
|
149
|
+
const schema =
|
|
150
|
+
// @ts-expect-error "Property 'valueHexView' does not exist on type 'ValueBlock'.ts(2339)"
|
|
151
|
+
asn1.fromBER(pointEC).result.valueBlock.valueHexView;
|
|
152
|
+
const publicKeyDecoded = new pki.ECPublicKey({
|
|
153
|
+
namedCurve: "P-256",
|
|
154
|
+
schema,
|
|
155
|
+
});
|
|
156
|
+
if (format === "hex") {
|
|
157
|
+
return publicKeyDecoded.toString("hex");
|
|
158
|
+
}
|
|
159
|
+
if (format === "jwk") {
|
|
160
|
+
return { kty: "EC", ...publicKeyDecoded.toJSON() };
|
|
161
|
+
}
|
|
162
|
+
if (format === "pem") {
|
|
163
|
+
const keyEncoder = new KeyEncoder({
|
|
164
|
+
curveParameters: [1, 2, 840, 10045, 3, 1, 7],
|
|
165
|
+
privatePEMOptions: { label: "EC PRIVATE KEY" },
|
|
166
|
+
publicPEMOptions: { label: "PUBLIC KEY" },
|
|
167
|
+
curve: "secp256k1",
|
|
168
|
+
});
|
|
169
|
+
const pemKey = keyEncoder.encodePublic(publicKeyDecoded.toString("hex"), "raw", "pem");
|
|
170
|
+
return pemKey;
|
|
171
|
+
}
|
|
172
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
173
|
+
throw new Error(`invalid format ${format}`);
|
|
174
|
+
}
|
|
175
|
+
sign(message) {
|
|
176
|
+
if (!this.session)
|
|
177
|
+
this.init();
|
|
178
|
+
const privateKeys = this.session.find({
|
|
179
|
+
class: graphene.ObjectClass.PRIVATE_KEY,
|
|
180
|
+
keyType: graphene.KeyType.ECDSA,
|
|
181
|
+
paramsECDSA: graphene.NamedCurve.getByName("secp256r1").value,
|
|
182
|
+
sign: true,
|
|
183
|
+
token: true,
|
|
184
|
+
});
|
|
185
|
+
if (privateKeys.length === 0) {
|
|
186
|
+
throw new Error('No EC private key found. Run the "generate-key" command first.');
|
|
187
|
+
}
|
|
188
|
+
const privateKey = privateKeys.items(0).toType();
|
|
189
|
+
// Hash the message using SHA-256
|
|
190
|
+
const sign = this.session.createSign("ECDSA_SHA256", privateKey);
|
|
191
|
+
const signature = sign.once(message);
|
|
192
|
+
// Split the raw signature into r and s components
|
|
193
|
+
const r = signature.toString("hex").slice(0, 66); // First 33 bytes may be padded r
|
|
194
|
+
const s = signature.toString("hex").slice(66); // Next 33 bytes may be padded s
|
|
195
|
+
const sig = Buffer.from(`${r.slice(2)}${s.slice(2)}`, "hex");
|
|
196
|
+
return sig;
|
|
197
|
+
}
|
|
198
|
+
signJWT(payload, header) {
|
|
199
|
+
const headerBase64url = base64url.baseEncode(Buffer.from(JSON.stringify(header)));
|
|
200
|
+
const payloadheaderBase64url = base64url.baseEncode(Buffer.from(JSON.stringify(payload)));
|
|
201
|
+
const message = `${headerBase64url}.${payloadheaderBase64url}`;
|
|
202
|
+
const signature = this.sign(message);
|
|
203
|
+
const signatureBase64url = base64url.baseEncode(signature);
|
|
204
|
+
return `${message}.${signatureBase64url}`;
|
|
205
|
+
}
|
|
206
|
+
verify(message, signature) {
|
|
207
|
+
if (!this.session)
|
|
208
|
+
this.init();
|
|
209
|
+
const publicKeys = this.session.find({
|
|
210
|
+
class: graphene.ObjectClass.PUBLIC_KEY,
|
|
211
|
+
keyType: graphene.KeyType.ECDSA,
|
|
212
|
+
});
|
|
213
|
+
if (publicKeys.length === 0) {
|
|
214
|
+
throw new Error('No EC public key found. Run the "generate-key" command first.');
|
|
215
|
+
}
|
|
216
|
+
const publicKey = publicKeys.items(0).toType();
|
|
217
|
+
const verify = this.session.createVerify("ECDSA_SHA256", publicKey);
|
|
218
|
+
const isValid = verify.once(message, signature);
|
|
219
|
+
return isValid;
|
|
220
|
+
}
|
|
221
|
+
verify2(message, signature, publicKeyJwk) {
|
|
222
|
+
if (!this.session)
|
|
223
|
+
this.init();
|
|
224
|
+
const derFormatSig = convertRawSignatureToDER(signature);
|
|
225
|
+
const isValid = crypto.verify("sha256", Buffer.from(message), {
|
|
226
|
+
format: "jwk",
|
|
227
|
+
key: publicKeyJwk,
|
|
228
|
+
}, derFormatSig);
|
|
229
|
+
return isValid;
|
|
230
|
+
}
|
|
231
|
+
verifyJwt(jwt, publicKeyJwk) {
|
|
232
|
+
const jwtParts = jwt.split(".");
|
|
233
|
+
if (jwtParts.length !== 3)
|
|
234
|
+
throw new Error("Invalid JWT format");
|
|
235
|
+
const [headerBase64url, payloadBase64url, signatureBase64url] = jwtParts;
|
|
236
|
+
const message = `${headerBase64url}.${payloadBase64url}`;
|
|
237
|
+
const headerString = Buffer.from(base64url.baseDecode(headerBase64url)).toString();
|
|
238
|
+
const payloadString = Buffer.from(base64url.baseDecode(payloadBase64url)).toString();
|
|
239
|
+
const signature = Buffer.from(base64url.baseDecode(signatureBase64url));
|
|
240
|
+
const result = this.verify2(message, signature, publicKeyJwk);
|
|
241
|
+
if (!result) {
|
|
242
|
+
throw new Error("Invalid signature");
|
|
243
|
+
}
|
|
244
|
+
return {
|
|
245
|
+
header: JSON.parse(headerString),
|
|
246
|
+
payload: JSON.parse(payloadString),
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
export default HardwareWallet;
|
|
251
|
+
//# sourceMappingURL=HardwareWallet.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"HardwareWallet.js","sourceRoot":"","sources":["../../src/utils/HardwareWallet.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/index.js
CHANGED
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,6BAA6B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC"}
|
package/dist/utils/utils.js
CHANGED
|
@@ -127,11 +127,19 @@ export function extractJSON(str) {
|
|
|
127
127
|
return extractJSONChars(str, "[]");
|
|
128
128
|
}
|
|
129
129
|
export function getWords(str) {
|
|
130
|
-
const preWords = str
|
|
130
|
+
const preWords = str
|
|
131
|
+
.split(" ")
|
|
132
|
+
.filter((word) => word !== "")
|
|
133
|
+
.map((word) => {
|
|
134
|
+
const num = Number(word);
|
|
135
|
+
if (Number.isNaN(num) || num > Number.MAX_SAFE_INTEGER)
|
|
136
|
+
return word;
|
|
137
|
+
return num;
|
|
138
|
+
});
|
|
131
139
|
let hasComments = false;
|
|
132
140
|
const words = [];
|
|
133
141
|
preWords.forEach((word) => {
|
|
134
|
-
if (word.startsWith("#"))
|
|
142
|
+
if (typeof word === "string" && word.startsWith("#"))
|
|
135
143
|
hasComments = true;
|
|
136
144
|
if (!hasComments)
|
|
137
145
|
words.push(word);
|
package/dist/utils/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,8 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
-
|
|
3
|
-
export async function createVPJwt(client, alg, vc, audience, config) {
|
|
2
|
+
export async function createVPJwt(client, alg, vc, audience) {
|
|
4
3
|
const keys = client.keys[alg];
|
|
5
4
|
if (!keys)
|
|
6
5
|
throw new Error(`No keys defined for alg ${alg}`);
|
|
7
|
-
const issuer = {
|
|
8
|
-
did: client.did,
|
|
9
|
-
kid: keys.kid,
|
|
10
|
-
privateKeyJwk: keys.privateKeyJwk,
|
|
11
|
-
publicKeyJwk: keys.publicKeyJwk,
|
|
12
|
-
alg: alg,
|
|
13
|
-
};
|
|
14
6
|
let verifiableCredential;
|
|
15
7
|
if (vc === "empty") {
|
|
16
8
|
verifiableCredential = [];
|
|
@@ -21,23 +13,30 @@ export async function createVPJwt(client, alg, vc, audience, config) {
|
|
|
21
13
|
else {
|
|
22
14
|
verifiableCredential = [vc];
|
|
23
15
|
}
|
|
24
|
-
|
|
16
|
+
// NOTE: We cannot use @cef-ebsi/verifiable-presentation library
|
|
17
|
+
// because it requires the private key and the CLI tool
|
|
18
|
+
// now supports Hardware Wallets, which do not expose private keys.
|
|
19
|
+
const vp = {
|
|
25
20
|
id: `urn:did:${randomUUID()}`,
|
|
26
21
|
"@context": ["https://www.w3.org/2018/credentials/v1"],
|
|
27
22
|
type: ["VerifiablePresentation"],
|
|
28
23
|
holder: client.did,
|
|
29
24
|
verifiableCredential,
|
|
30
25
|
};
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
26
|
+
const now = Math.floor(Date.now() / 1000);
|
|
27
|
+
const vpJwtPayload = {
|
|
28
|
+
jti: vp.id,
|
|
29
|
+
sub: client.did,
|
|
30
|
+
iss: client.did,
|
|
31
|
+
nbf: now - 60, // 1 minute in the past
|
|
32
|
+
exp: now + 120, // 2 minutes in the future
|
|
33
|
+
iat: now,
|
|
34
|
+
aud: audience,
|
|
36
35
|
nonce: randomUUID(),
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
});
|
|
40
|
-
return { jwtVp, payload };
|
|
36
|
+
vp,
|
|
37
|
+
};
|
|
38
|
+
const jwtVp = await client.signJWT(vpJwtPayload, {}, alg);
|
|
39
|
+
return { jwtVp, payload: vp };
|
|
41
40
|
}
|
|
42
41
|
export default createVPJwt;
|
|
43
42
|
//# sourceMappingURL=verifiablePresentation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifiablePresentation.js","sourceRoot":"","sources":["../../src/utils/verifiablePresentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"verifiablePresentation.js","sourceRoot":"","sources":["../../src/utils/verifiablePresentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKzC,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAc,EACd,GAAQ,EACR,EAAqB,EACrB,QAAgB;IAEhB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAC;IAE7D,IAAI,oBAA8B,CAAC;IACnC,IAAI,EAAE,KAAK,OAAO,EAAE,CAAC;QACnB,oBAAoB,GAAG,EAAE,CAAC;IAC5B,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;QAC7B,oBAAoB,GAAG,EAAE,CAAC;IAC5B,CAAC;SAAM,CAAC;QACN,oBAAoB,GAAG,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,gEAAgE;IAChE,uDAAuD;IACvD,mEAAmE;IAEnE,MAAM,EAAE,GAAG;QACT,EAAE,EAAE,WAAW,UAAU,EAAE,EAAE;QAC7B,UAAU,EAAE,CAAC,wCAAwC,CAAC;QACtD,IAAI,EAAE,CAAC,wBAAwB,CAAC;QAChC,MAAM,EAAE,MAAM,CAAC,GAAG;QAClB,oBAAoB;KACS,CAAC;IAEhC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG;QACnB,GAAG,EAAE,EAAE,CAAC,EAAE;QACV,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,uBAAuB;QACtC,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,0BAA0B;QAC1C,GAAG,EAAE,GAAG;QACR,GAAG,EAAE,QAAQ;QACb,KAAK,EAAE,UAAU,EAAE;QACnB,EAAE;KACH,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAC1D,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AAChC,CAAC;AAED,eAAe,WAAW,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cef-ebsi/cli",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"description": "EBSI Command Line Interface",
|
|
5
5
|
"license": "EUPL-1.2",
|
|
6
6
|
"type": "module",
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
"scripts": {
|
|
17
17
|
"audit": "audit-ci --moderate --skip-dev -a GHSA-p6mc-m468-83gw",
|
|
18
18
|
"build": "rimraf dist && tsc --build && copyfiles -u 1 \"src/scripts/**/*\" dist",
|
|
19
|
+
"dev": "ts-node --esm src/cli.ts",
|
|
19
20
|
"lint-staged": "lint-staged",
|
|
20
21
|
"lint": "yarn lint:eslint && yarn lint:tsc && yarn lint:prettier",
|
|
21
22
|
"lint:eslint": "eslint . --ext .js,.ts",
|
|
@@ -46,9 +47,11 @@
|
|
|
46
47
|
"@apidevtools/json-schema-ref-parser": "^11.5.4",
|
|
47
48
|
"@cef-ebsi/ebsi-did-resolver": "^4.0.1",
|
|
48
49
|
"@cef-ebsi/key-did-resolver": "^2.0.1",
|
|
50
|
+
"@cef-ebsi/key-encoder": "^2.0.0-alpha.0",
|
|
49
51
|
"@cef-ebsi/verifiable-credential": "^5.5.0",
|
|
50
52
|
"@cef-ebsi/verifiable-presentation": "^6.4.0",
|
|
51
53
|
"@cef-ebsi/wallet-lib": "^5.0.1",
|
|
54
|
+
"asn1js": "^3.0.5",
|
|
52
55
|
"axios": "^1.7.2",
|
|
53
56
|
"canonicalize": "^2.0.0",
|
|
54
57
|
"chalk": "^5.3.0",
|
|
@@ -58,12 +61,14 @@
|
|
|
58
61
|
"elliptic": "^6.5.5",
|
|
59
62
|
"ethers": "^5.7.2",
|
|
60
63
|
"form-data": "^4.0.0",
|
|
64
|
+
"graphene-pk11": "^2.3.6",
|
|
61
65
|
"https-proxy-agent": "^5.0.0",
|
|
62
66
|
"joi": "^17.13.3",
|
|
63
67
|
"jose": "^4.15.5",
|
|
64
68
|
"lodash.set": "^4.3.2",
|
|
65
69
|
"multiformats": "^12.1.3",
|
|
66
70
|
"multihashes": "^4.0.3",
|
|
71
|
+
"pkijs": "^3.2.4",
|
|
67
72
|
"qs": "^6.12.1"
|
|
68
73
|
},
|
|
69
74
|
"devDependencies": {
|
|
@@ -88,8 +93,10 @@
|
|
|
88
93
|
"husky": "^8.0.3",
|
|
89
94
|
"lint-staged": "^15.2.0",
|
|
90
95
|
"prettier": "^3.1.1",
|
|
96
|
+
"read-pkg": "^9.0.1",
|
|
91
97
|
"release-it": "^17.0.1",
|
|
92
98
|
"rimraf": "^5.0.5",
|
|
99
|
+
"spdx-license-list": "^6.9.0",
|
|
93
100
|
"ts-node": "^10.9.2",
|
|
94
101
|
"typescript": "5.3.3",
|
|
95
102
|
"vitest": "^0.34.6"
|