check whether account number is a valid base58 string

bitmark-inc · Oct 15, 2019 · 3b0b981 · 3b0b981
1 parent f075de2
commit 3b0b981
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/account/account.go b/account/account.go
@@ -460,6 +460,9 @@ func Verify(accountNumber string, message, signature []byte) error {
 
 func extractAuthPublicKey(accountNumber string) (publicKey []byte, err error) {
 	accountNumberBytes := encoding.FromBase58(accountNumber)
+	if len(accountNumberBytes) == 0 {
+		return nil, errors.New("invalid base58 string")
+	}
 
 	variantAndPubkey := accountNumberBytes[:len(accountNumberBytes)-ChecksumLength]
 	computedChecksum := sha3.Sum256(variantAndPubkey)

diff --git a/account/account_test.go b/account/account_test.go
@@ -258,6 +258,9 @@ func TestValidateAccountNumber(t *testing.T) {
 
 	err = ValidateAccountNumber(livenetDeprecatedAccount.accountNumber)
 	assert.NoError(t, err)
+
+	err = ValidateAccountNumber("IOl")
+	assert.Error(t, err, "invalid base58 string")
 }
 
 func TestRecoverV1Account(t *testing.T) {