Read --index and --words as decimal numbers (closes #75)
check / check (push) Failing after 3m40s
check / check (push) Failing after 3m40s
Both flags were uint32 flags, which the flag library reads with base-0 rules, so `-n 010` derived key 8 and `0x10` or `1_0` were accepted. Both now hold options.Decimal, a flag value whose Set parses with strconv.ParseUint(text, 10, 32): a leading zero stays decimal, and a base prefix, an underscore, a sign or an empty value is refused with an error naming the flag while the flags are parsed, before any command runs. Its type is still named uint32, so --help is unchanged and GetUint32 still reads it back. The README says the index is a decimal number. Model: opus-5-5
This commit was merged in pull request #81.
This commit is contained in:
@@ -2,6 +2,7 @@ package cli_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"strconv"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
@@ -106,6 +107,56 @@ func TestAnIndexWithNoHardenedChildIsRefused(t *testing.T) {
|
||||
require.Empty(t, out)
|
||||
}
|
||||
|
||||
func TestAnIndexWithALeadingZeroIsDecimal(t *testing.T) {
|
||||
t.Setenv(mnemonic.Variable, example())
|
||||
|
||||
line := run(t, "ssh", "pub", "-n", "010")
|
||||
require.Equal(t, run(t, "ssh", "pub", "-n", "10"), line)
|
||||
require.True(t,
|
||||
strings.HasSuffix(strings.TrimSpace(line), " keyfunc/ssh/10"),
|
||||
)
|
||||
}
|
||||
|
||||
// The mnemonic command in these runs fails, so a refusal naming the
|
||||
// flag shows that the number was refused before the mnemonic was
|
||||
// looked for.
|
||||
func TestAnIndexThatIsNotDecimalDigitsIsRefused(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
for _, index := range []string{"0x10", "1_0", "+1", "-1", ""} {
|
||||
t.Run(index, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
out, err := execute(t,
|
||||
"ssh", "pub", "-n", index, "--mnemonic-command", "exit 1",
|
||||
)
|
||||
require.ErrorIs(t, err, strconv.ErrSyntax)
|
||||
require.ErrorContains(t, err, "--index")
|
||||
require.Empty(t, out)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Neither a command group nor --version reads the index, so these
|
||||
// show that it is refused while the flags are parsed.
|
||||
func TestAnIndexNotInDecimalIsRefusedBeforeAnyCommandRuns(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
for _, args := range [][]string{
|
||||
{"ssh", "-n", "0x10"},
|
||||
{"-n", "0x10", "--version"},
|
||||
} {
|
||||
t.Run(strings.Join(args, " "), func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
out, err := execute(t, args...)
|
||||
require.ErrorIs(t, err, strconv.ErrSyntax)
|
||||
require.ErrorContains(t, err, "--index")
|
||||
require.Empty(t, out)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestTheMnemonicCommandIsUsed(t *testing.T) {
|
||||
t.Setenv(mnemonic.Variable, "")
|
||||
|
||||
@@ -138,6 +189,22 @@ func TestALengthTheToolDoesNotOfferIsRefused(t *testing.T) {
|
||||
require.Empty(t, out)
|
||||
}
|
||||
|
||||
func TestTheWordCountIsDecimal(t *testing.T) {
|
||||
t.Setenv(mnemonic.Variable, example())
|
||||
|
||||
words := strings.Fields(run(t, "mnemonic", "--words", "012"))
|
||||
require.Len(t, words, twelve)
|
||||
|
||||
// As for the index, the failing mnemonic command shows that the
|
||||
// number was refused first.
|
||||
out, err := execute(t,
|
||||
"mnemonic", "--words", "0x18", "--mnemonic-command", "exit 1",
|
||||
)
|
||||
require.ErrorIs(t, err, strconv.ErrSyntax)
|
||||
require.ErrorContains(t, err, "--words")
|
||||
require.Empty(t, out)
|
||||
}
|
||||
|
||||
// run executes the tool with the given arguments and returns what it
|
||||
// wrote to standard output.
|
||||
func run(t *testing.T, args ...string) string {
|
||||
|
||||
Reference in New Issue
Block a user