bumping web5 versions #149
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,16 @@ | ||
| import type { | ||
| CryptoAlgorithm, | ||
| Web5Crypto, | ||
| JwsHeaderParams, | ||
| JwkParamsEcPrivate, | ||
| JwkParamsOkpPrivate, | ||
| JwkParamsEcPublic, | ||
| JwkParamsOkpPublic | ||
| } from '@web5/crypto' | ||
|
|
||
| import { sha256 } from '@noble/hashes/sha256' | ||
| import { Convert } from '@web5/common' | ||
| import { EcdsaAlgorithm, EdDsaAlgorithm } from '@web5/crypto' | ||
| import { deferenceDidUrl, isVerificationMethod } from './did-resolver.js' | ||
|
|
||
| import canonicalize from 'canonicalize' | ||
|
|
@@ -44,14 +45,14 @@ export type VerifyOptions = { | |
| */ | ||
| type SignerValue<T extends Web5Crypto.Algorithm> = { | ||
| signer: CryptoAlgorithm, | ||
| options?: T, | ||
| alg: JwsHeader['alg'], | ||
| crv: JsonWebKey['crv'] | ||
| } | ||
|
|
||
| const secp256k1Signer: SignerValue<Web5Crypto.EcdsaOptions> = { | ||
| signer : new EcdsaAlgorithm(), | ||
| options : { name: 'ECDSA' }, | ||
| alg : 'ES256K', | ||
| crv : 'secp256k1' | ||
| } | ||
|
|
@@ -101,32 +102,30 @@ export class Crypto { | |
| static async sign(opts: SignOptions) { | ||
| const { did, payload, detached } = opts | ||
|
|
||
| const privateKeyJwk = did.keySet.verificationMethodKeys[0].privateKeyJwk as JwkParamsEcPrivate | JwkParamsOkpPrivate | ||
|
|
||
| const algorithmName = privateKeyJwk['alg'] || '' | ||
| const namedCurve = privateKeyJwk['crv'] || '' | ||
|
There was a problem hiding this comment. CI is failing because you're reverting some of the changes from #141. Might need to rebase. |
||
| const algorithmId = `${algorithmName}:${namedCurve}` | ||
|
|
||
| const algorithm = this.algorithms[algorithmId] | ||
| if (!algorithm) { | ||
| throw new Error(`${algorithmId} not supported`) | ||
| } | ||
|
|
||
| let verificationMethodId = did.document.verificationMethod[0].id | ||
| if (verificationMethodId.startsWith('#')) { | ||
| verificationMethodId = `${did.did}${verificationMethodId}` | ||
| } | ||
|
|
||
| const jwsHeader: JwsHeader = { alg: algorithm.alg, kid: verificationMethodId } | ||
| const base64UrlEncodedJwsHeader = Convert.object(jwsHeader).toBase64Url() | ||
| const base64urlEncodedJwsPayload = Convert.uint8Array(payload).toBase64Url() | ||
|
|
||
| const toSign = `${base64UrlEncodedJwsHeader}.${base64urlEncodedJwsPayload}` | ||
| const toSignBytes = Convert.string(toSign).toUint8Array() | ||
|
|
||
| const signatureBytes = await algorithm.signer.sign({ key: privateKeyJwk, data: toSignBytes, algorithm: algorithm.options }) | ||
| const base64UrlEncodedSignature = Convert.uint8Array(signatureBytes).toBase64Url() | ||
|
|
||
| if (detached) { | ||
|
|
@@ -170,13 +169,14 @@ export class Crypto { | |
| throw new Error('Signature verification failed: Expected JWS header to contain alg and kid') | ||
| } | ||
|
|
||
| const verificationMethod = await deferenceDidUrl(jwsHeader.kid as string) | ||
| if (!isVerificationMethod(verificationMethod)) { // ensure that appropriate verification method was found | ||
| throw new Error('Signature verification failed: Expected kid in JWS header to dereference to a DID Document Verification Method') | ||
| } | ||
|
|
||
| // will be used to verify signature | ||
| const publicKeyJwk = verificationMethod.publicKeyJwk as JwkParamsEcPublic | JwkParamsOkpPublic | ||
|
|
||
| if (!publicKeyJwk) { // ensure that Verification Method includes public key as a JWK. | ||
| throw new Error('Signature verification failed: Expected kid in JWS header to dereference to a DID Document Verification Method with publicKeyJwk') | ||
| } | ||
|
|
@@ -186,37 +186,19 @@ export class Crypto { | |
|
|
||
| const signatureBytes = Convert.base64Url(base64UrlEncodedSignature).toUint8Array() | ||
|
|
||
| const algorithmId = `${jwsHeader['alg']}:${publicKeyJwk['crv']}` | ||
| const { signer, options } = Crypto.algorithms[algorithmId] | ||
|
|
||
|
|
||
| const isLegit = await signer.verify({ algorithm: options, key: publicKeyJwk, data: signedDataBytes, signature: signatureBytes }) | ||
|
|
||
| if (!isLegit) { | ||
| throw new Error('Signature verification failed: Integrity mismatch') | ||
| } | ||
|
|
||
| const [did] = (jwsHeader as JwsHeaderParams).kid.split('#') | ||
| return did | ||
| } | ||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are we adding
msandtypeid-jstohttp-clientin this PR? Ifmsis necessary independencies, why is@types/msindevDepencencies?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so this PR is part of a 4 PR series in an effort to break down moe's 122-request-token PR which is a chonky boi.
i just ported over the client/package.json changes from the original PR, which includes ms and typeid-js since they're being used by the client during request token generation.
the PR that will use the ms and typeid-js is here
i thought we needed to include @types/xyz in devDependencies that correspond to package xyz in dependencies in order to write with type checking during development. is that incorrect?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah, u right
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yee that's correct @jiyoontbd