mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-19 05:44:12 +01:00
Code Issues Projects Releases Wiki Activity

pytest: ensure hsmtool tests do complete writes.

Browse Source 
This may be causing the test flakiness we sometimes see in CI.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2021-09-21 15:06:07 +09:30
parent 3f05dff89d
commit 5b644a2319
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tests/test_wallet.py
View File

@ -990,6 +990,13 @@ def test_transaction_annotations(node_factory, bitcoind):
assert(txs[1]['outputs'][fundidx]['channel'] == scid) assert(txs[1]['outputs'][fundidx]['channel'] == scid)
def write_all(fd, bytestr):
"""Wrapper, since os.write can do partial writes"""
off = 0
while off < len(bytestr):
off += os.write(fd, bytestr[off:])
@unittest.skipIf(VALGRIND, "It does not play well with prompt and key derivation.") @unittest.skipIf(VALGRIND, "It does not play well with prompt and key derivation.")
def test_hsm_secret_encryption(node_factory): def test_hsm_secret_encryption(node_factory):
l1 = node_factory.get_node(may_fail=True) # May fail when started without key l1 = node_factory.get_node(may_fail=True) # May fail when started without key
@ -1002,9 +1009,9 @@ def test_hsm_secret_encryption(node_factory):
l1.daemon.opts.update({"encrypted-hsm": None}) l1.daemon.opts.update({"encrypted-hsm": None})
l1.daemon.start(stdin=slave_fd, wait_for_initialized=False) l1.daemon.start(stdin=slave_fd, wait_for_initialized=False)
l1.daemon.wait_for_log(r'Enter hsm_secret password') l1.daemon.wait_for_log(r'Enter hsm_secret password')
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
l1.daemon.wait_for_log(r'Confirm hsm_secret password') l1.daemon.wait_for_log(r'Confirm hsm_secret password')
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
l1.daemon.wait_for_log("Server started with public key") l1.daemon.wait_for_log("Server started with public key")
id = l1.rpc.getinfo()["id"] id = l1.rpc.getinfo()["id"]
l1.stop() l1.stop()
@ -1019,18 +1026,18 @@ def test_hsm_secret_encryption(node_factory):
l1.daemon.start(stdin=slave_fd, stderr=subprocess.STDOUT, l1.daemon.start(stdin=slave_fd, stderr=subprocess.STDOUT,
wait_for_initialized=False) wait_for_initialized=False)
l1.daemon.wait_for_log(r'Enter hsm_secret password') l1.daemon.wait_for_log(r'Enter hsm_secret password')
os.write(master_fd, password[2:].encode("utf-8")) write_all(master_fd, password[2:].encode("utf-8"))
l1.daemon.wait_for_log(r'Confirm hsm_secret password') l1.daemon.wait_for_log(r'Confirm hsm_secret password')
os.write(master_fd, password[2:].encode("utf-8")) write_all(master_fd, password[2:].encode("utf-8"))
assert(l1.daemon.proc.wait(WAIT_TIMEOUT) == 1) assert(l1.daemon.proc.wait(WAIT_TIMEOUT) == 1)
assert(l1.daemon.is_in_log("Wrong password for encrypted hsm_secret.")) assert(l1.daemon.is_in_log("Wrong password for encrypted hsm_secret."))
# Test we can restore the same wallet with the same password # Test we can restore the same wallet with the same password
l1.daemon.start(stdin=slave_fd, wait_for_initialized=False) l1.daemon.start(stdin=slave_fd, wait_for_initialized=False)
l1.daemon.wait_for_log(r'The hsm_secret is encrypted') l1.daemon.wait_for_log(r'The hsm_secret is encrypted')
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
l1.daemon.wait_for_log(r'Confirm hsm_secret password') l1.daemon.wait_for_log(r'Confirm hsm_secret password')
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
l1.daemon.wait_for_log("Server started with public key") l1.daemon.wait_for_log("Server started with public key")
assert id == l1.rpc.getinfo()["id"] assert id == l1.rpc.getinfo()["id"]
l1.stop() l1.stop()
@ -1066,9 +1073,9 @@ def test_hsmtool_secret_decryption(node_factory):
l1.daemon.opts.update({"encrypted-hsm": None}) l1.daemon.opts.update({"encrypted-hsm": None})
l1.daemon.start(stdin=slave_fd, wait_for_initialized=False) l1.daemon.start(stdin=slave_fd, wait_for_initialized=False)
l1.daemon.wait_for_log(r'Enter hsm_secret password') l1.daemon.wait_for_log(r'Enter hsm_secret password')
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
l1.daemon.wait_for_log(r'Confirm hsm_secret password') l1.daemon.wait_for_log(r'Confirm hsm_secret password')
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
l1.daemon.wait_for_log("Server started with public key") l1.daemon.wait_for_log("Server started with public key")
node_id = l1.rpc.getinfo()["id"] node_id = l1.rpc.getinfo()["id"]
l1.stop() l1.stop()
@ -1079,7 +1086,7 @@ def test_hsmtool_secret_decryption(node_factory):
hsmtool.start(stdin=slave_fd, hsmtool.start(stdin=slave_fd,
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
hsmtool.wait_for_log(r"Enter hsm_secret password:") hsmtool.wait_for_log(r"Enter hsm_secret password:")
os.write(master_fd, "A wrong pass\n\n".encode("utf-8")) write_all(master_fd, "A wrong pass\n\n".encode("utf-8"))
hsmtool.proc.wait(WAIT_TIMEOUT) hsmtool.proc.wait(WAIT_TIMEOUT)
hsmtool.is_in_log(r"Wrong password") hsmtool.is_in_log(r"Wrong password")
@ -1088,7 +1095,7 @@ def test_hsmtool_secret_decryption(node_factory):
hsmtool.start(stdin=slave_fd, hsmtool.start(stdin=slave_fd,
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
hsmtool.wait_for_log(r"Enter hsm_secret password:") hsmtool.wait_for_log(r"Enter hsm_secret password:")
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
assert hsmtool.proc.wait(WAIT_TIMEOUT) == 0 assert hsmtool.proc.wait(WAIT_TIMEOUT) == 0
# Then test we can now start it without password # Then test we can now start it without password
l1.daemon.opts.pop("encrypted-hsm") l1.daemon.opts.pop("encrypted-hsm")
@ -1102,9 +1109,9 @@ def test_hsmtool_secret_decryption(node_factory):
hsmtool.start(stdin=slave_fd, hsmtool.start(stdin=slave_fd,
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
hsmtool.wait_for_log(r"Enter hsm_secret password:") hsmtool.wait_for_log(r"Enter hsm_secret password:")
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
hsmtool.wait_for_log(r"Confirm hsm_secret password:") hsmtool.wait_for_log(r"Confirm hsm_secret password:")
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
assert hsmtool.proc.wait(WAIT_TIMEOUT) == 0 assert hsmtool.proc.wait(WAIT_TIMEOUT) == 0
# Now we need to pass the encrypted-hsm startup option # Now we need to pass the encrypted-hsm startup option
l1.stop() l1.stop()
@ -1117,9 +1124,9 @@ def test_hsmtool_secret_decryption(node_factory):
wait_for_initialized=False) wait_for_initialized=False)
l1.daemon.wait_for_log(r'The hsm_secret is encrypted') l1.daemon.wait_for_log(r'The hsm_secret is encrypted')
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
l1.daemon.wait_for_log(r'Confirm hsm_secret password') l1.daemon.wait_for_log(r'Confirm hsm_secret password')
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
l1.daemon.wait_for_log("Server started with public key") l1.daemon.wait_for_log("Server started with public key")
print(node_id, l1.rpc.getinfo()["id"]) print(node_id, l1.rpc.getinfo()["id"])
assert node_id == l1.rpc.getinfo()["id"] assert node_id == l1.rpc.getinfo()["id"]
@ -1131,7 +1138,7 @@ def test_hsmtool_secret_decryption(node_factory):
hsmtool.start(stdin=slave_fd, hsmtool.start(stdin=slave_fd,
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
hsmtool.wait_for_log(r"Enter hsm_secret password:") hsmtool.wait_for_log(r"Enter hsm_secret password:")
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
assert hsmtool.proc.wait(WAIT_TIMEOUT) == 0 assert hsmtool.proc.wait(WAIT_TIMEOUT) == 0
l1.daemon.opts.pop("encrypted-hsm") l1.daemon.opts.pop("encrypted-hsm")
l1.daemon.start(stdin=slave_fd, wait_for_initialized=True) l1.daemon.start(stdin=slave_fd, wait_for_initialized=True)
@ -1153,7 +1160,7 @@ def test_hsmtool_secret_decryption(node_factory):
hsmtool.start(stdin=slave_fd, hsmtool.start(stdin=slave_fd,
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
hsmtool.wait_for_log("Enter hsm_secret password:") hsmtool.wait_for_log("Enter hsm_secret password:")
os.write(master_fd, password.encode("utf-8")) write_all(master_fd, password.encode("utf-8"))
hsmtool.wait_for_log("Successfully decrypted") hsmtool.wait_for_log("Successfully decrypted")
assert hsmtool.proc.wait(WAIT_TIMEOUT) == 0 assert hsmtool.proc.wait(WAIT_TIMEOUT) == 0
@ -1208,12 +1215,12 @@ def test_hsmtool_generatehsm(node_factory):
hsmtool.start(stdin=slave_fd, stdout=subprocess.PIPE, hsmtool.start(stdin=slave_fd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE)
hsmtool.wait_for_log(r"Select your language:") hsmtool.wait_for_log(r"Select your language:")
os.write(master_fd, "0\n".encode("utf-8")) write_all(master_fd, "0\n".encode("utf-8"))
hsmtool.wait_for_log(r"Introduce your BIP39 word list") hsmtool.wait_for_log(r"Introduce your BIP39 word list")
os.write(master_fd, "ritual idle hat sunny universe pluck key alpha wing " write_all(master_fd, "ritual idle hat sunny universe pluck key alpha wing "
"cake have wedding\n".encode("utf-8")) "cake have wedding\n".encode("utf-8"))
hsmtool.wait_for_log(r"Enter your passphrase:") hsmtool.wait_for_log(r"Enter your passphrase:")
os.write(master_fd, "This is actually not a passphrase\n".encode("utf-8")) write_all(master_fd, "This is actually not a passphrase\n".encode("utf-8"))
hsmtool.proc.wait(WAIT_TIMEOUT) hsmtool.proc.wait(WAIT_TIMEOUT)
hsmtool.is_in_log(r"New hsm_secret file created") hsmtool.is_in_log(r"New hsm_secret file created")