fix(live): a phrase is four plain words and a tail, and nothing weaker
Two holes in the one credential a stream has.
The wordlist has four hyphenated entries (`drop-down`, `felt-tip`,
`t-shirt`, `yo-yo`). A phrase drawn from one is six tokens --
`abacus-drop-down-lantern-harbor-7k2qp` -- and a listener cannot hear where
the tail starts. `words()` now keeps only `^[a-z]+$`; 7772 words costs
0.003 bits, so the ~77.5-bit figure is unchanged. The shape test asserted
over 50 draws, which caught this about a tenth of the time; the property is
now asserted over the whole list.
`validate` accepted `a-b-c`. It is what an operator-supplied `--phrase` is
checked against, so everything it accepts is a password someone can choose
for a LAN-facing stream. The floor is now exactly what `generate` produces:
four `[a-z]{3,}` words and a five-character `[a-z0-9]` tail. The router
still looks phrases up without validating, so an unknown phrase is the same
empty 404 it was.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01URhyHGQnmKH9zBXxoznfQY
This commit is contained in:
1 parent
52e3786bfb
commit
19338af17c
3 files changed
+97
-28
No files matched your search
@@ -8,6 +8,7 @@ import pytest
|
||||
from hhstream_live import phrase
|
||||
|
||||
SHAPE = re.compile(r"^[a-z]+(-[a-z]+){3}-[a-z0-9]{5}$")
|
||||
WORD = re.compile(r"^[a-z]+$")
|
||||
|
||||
|
||||
def test_generated_phrase_has_the_agreed_shape():
|
||||
@@ -24,11 +25,24 @@ def test_entropy_is_what_the_plan_claims():
|
||||
assert phrase.entropy_bits() > 75
|
||||
|
||||
|
||||
def test_wordlist_is_the_eff_large_list():
|
||||
def test_wordlist_is_the_eff_large_list_minus_its_hyphenated_entries():
|
||||
words = phrase.words()
|
||||
assert len(words) == 7776
|
||||
assert len(set(words)) == 7776
|
||||
# The file is the EFF large list, 7776 lines; four of them are hyphenated
|
||||
# and the loader drops them, because a hyphen is the phrase's separator.
|
||||
assert len(words) == 7772
|
||||
assert len(set(words)) == 7772
|
||||
assert "abacus" in words
|
||||
assert "drop-down" not in words
|
||||
|
||||
|
||||
def test_every_loaded_word_is_plain_lowercase_letters():
|
||||
"""Not a sampling test: one hyphenated word makes a six-token phrase.
|
||||
|
||||
`test_generated_phrase_has_the_agreed_shape` would only catch that by luck
|
||||
-- four draws out of 7776 hit a hyphenated entry about 0.2% of the time --
|
||||
so the property is asserted over the whole list instead.
|
||||
"""
|
||||
assert all(WORD.match(word) for word in phrase.words())
|
||||
|
||||
|
||||
def test_generate_is_not_reproducible_from_a_seed():
|
||||
@@ -47,7 +61,15 @@ def test_normalize_lowercases_and_trims():
|
||||
|
||||
|
||||
def test_validate_accepts_a_good_phrase_and_returns_the_normalized_form():
|
||||
assert phrase.validate("Amber-Otter-Lantern-7K2QP") == "amber-otter-lantern-7k2qp"
|
||||
assert phrase.validate("Amber-Otter-Lantern-Harbor-7K2QP") == (
|
||||
"amber-otter-lantern-harbor-7k2qp"
|
||||
)
|
||||
|
||||
|
||||
def test_validate_accepts_everything_generate_produces():
|
||||
for _ in range(50):
|
||||
generated = phrase.generate()
|
||||
assert phrase.validate(generated) == generated
|
||||
|
||||
|
||||
@pytest.mark.parametrize("bad", ["", "single", "two-tokens", "has space-phrase-x",
|
||||
@@ -58,6 +80,26 @@ def test_validate_rejects_a_phrase_that_is_not_the_shape(bad):
|
||||
phrase.validate(bad)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("weak", [
|
||||
"a-b-c", # the reviewer's example: three letters
|
||||
"ab-cd-ef-gh-12345", # four "words" of two letters
|
||||
"amber-otter-lantern-7k2qp", # three words, not four
|
||||
"amber-otter-lantern-harbor", # four words, no tail
|
||||
"amber-otter-lantern-harbor-7k2", # a three-character tail
|
||||
"amber-otter-lantern-harbor-7k2qpz", # a six-character tail
|
||||
"amber-otter-lantern-harbor-hill-7k2qp", # five words
|
||||
"amber-0tter-lantern-harbor-7k2qp", # a digit inside a word
|
||||
])
|
||||
def test_validate_rejects_a_phrase_weaker_than_the_generated_shape(weak):
|
||||
"""`--phrase` is a password for a LAN-facing stream, not a label.
|
||||
|
||||
Anything `validate` accepts is something an operator can set, so the floor
|
||||
has to be the shape `generate` produces -- otherwise `a-b-c` opens a stream.
|
||||
"""
|
||||
with pytest.raises(ValueError):
|
||||
phrase.validate(weak)
|
||||
|
||||
|
||||
def test_validate_rejects_an_overlong_phrase():
|
||||
with pytest.raises(ValueError):
|
||||
phrase.validate("-".join(["averyverylongword"] * 8))
|
||||
Reference in new issue
Block a user