Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: verify jws contains at least 1 signature #600

Merged
merged 2 commits into from
Jan 20, 2022
Merged

fix: verify jws contains at least 1 signature #600

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dddafc0
fix: verify jws contains at least 1 signature
TimoGlastra Jan 20, 2022
aad24f8
Merge branch 'main' into fix/verify-signatures-length
TimoGlastra Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/core/src/crypto/JwsService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ export class JwsService {
const base64Payload = BufferEncoder.toBase64URL(payload)
const signatures = 'signatures' in jws ? jws.signatures : [jws]

if (signatures.length === 0) {
throw new AriesFrameworkError('Unable to verify JWS: No entries in JWS signatures array.')
}

const signerVerkeys = []
for (const jws of signatures) {
const protectedJson = JsonEncoder.fromBase64(jws.protected)
Expand Down
12 changes: 11 additions & 1 deletion packages/core/src/crypto/__tests__/JwsService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Wallet } from '@aries-framework/core'

import { getAgentConfig } from '../../../tests/helpers'
import { DidKey, KeyType } from '../../modules/dids'
import { JsonEncoder } from '../../utils'
import { Buffer, JsonEncoder } from '../../utils'
import { IndyWallet } from '../../wallet/IndyWallet'
import { JwsService } from '../JwsService'

Expand Down Expand Up @@ -67,6 +67,7 @@ describe('JwsService', () => {
expect(isValid).toBe(true)
expect(signerVerkeys).toEqual([didJwsz6Mkf.VERKEY, didJwsz6Mkv.VERKEY])
})

it('returns false if the jws signature does not match the payload', async () => {
const payload = JsonEncoder.toBuffer({ ...didJwsz6Mkf.DATA_JSON, did: 'another_did' })

Expand All @@ -78,5 +79,14 @@ describe('JwsService', () => {
expect(isValid).toBe(false)
expect(signerVerkeys).toMatchObject([])
})

it('throws an error if the jws signatures array does not contain a JWS', async () => {
await expect(
jwsService.verifyJws({
payload: new Buffer([]),
jws: { signatures: [] },
})
).rejects.toThrowError('Unable to verify JWS: No entries in JWS signatures array.')
})
})
})