Skip to content

Reject odd-length Solana hex private keys #111

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

Open
samsamtrum wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Reject odd-length Solana hex private keys #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions src/wallets/solana/solanaClient.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { describe, expect, it } from 'vitest'

import { UserInputValidationError } from '../../errors'
import { SolanaClient } from './solanaClient'

describe('SolanaClient.importAccount', () => {
it('rejects odd-length hex private keys before encryption', async () => {
const client = new SolanaClient()

await expect(
client.importAccount({ privateKey: `0x${'a'.repeat(63)}` }),
).rejects.toThrow(UserInputValidationError)
await expect(
client.importAccount({ privateKey: `0x${'a'.repeat(63)}` }),
).rejects.toThrow(
'Private key hex string must contain an even number of characters',
)
})
})
10 changes: 10 additions & 0 deletions src/wallets/solana/solanaClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,19 @@ export class SolanaClient {
if (!/^[0-9a-fA-F]+$/.test(hex)) {
throw new UserInputValidationError('Invalid hex string')
}
if (hex.length % 2 !== 0) {
throw new UserInputValidationError(
'Private key hex string must contain an even number of characters',
)
}
privateKeyBytes = Uint8Array.from(Buffer.from(hex, 'hex'))
} else if (/^[0-9a-fA-F]+$/.test(options.privateKey)) {
// Hex format without prefix
if (options.privateKey.length % 2 !== 0) {
throw new UserInputValidationError(
'Private key hex string must contain an even number of characters',
)
}
privateKeyBytes = Uint8Array.from(Buffer.from(options.privateKey, 'hex'))
} else {
// Assume base58 format (standard Solana format)
Expand Down