colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

unl0kr: simplify the crash edge-case handling

Browse Source
This commit is contained in:
Colin
2024-05-09 08:42:41 +00:00
parent 2b539fafcd
commit a40f05260a
2 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hosts/common/programs/unl0kr/default.nix
View File

@@ -25,17 +25,7 @@ let
# but modified to not leak pword to CLI # but modified to not leak pword to CLI
# - implement some sort of watchdog (e.g. detect spawned children?) # - implement some sort of watchdog (e.g. detect spawned children?)
# - set a timeout at the outer scope (which gets canceled upon successful login) # - set a timeout at the outer scope (which gets canceled upon successful login)
# eval 'redirect-tty "/dev/${tty}" unl0kr ; sleep 5 ; redirect-tty "/dev/${tty}" echo ""' & bash -c 'redirect-tty "/dev/${tty}" unl0kr ; sleep 2 ; redirect-tty "/dev/${tty}" echo ""' &
# redirect-tty "/dev/${tty}" unl0kr &
# unl0kr_pid=$!
# # login -p: preserve environment
# login -p ${cfg.config.user} &
# login_pid=$!
# # wait for unl0kr, and if it succeeds then hand control fully to `login`.
# # otherwise, exit, implicitly killing `login` and probably restarting the service
# wait "$unl0kr_pid" && wait "$login_pid"
redirect-tty "/dev/${tty}" unl0kr &
login -p ${cfg.config.user} login -p ${cfg.config.user}
''; '';
}; };

11
hosts/common/programs/unl0kr/redirect-tty
View File

@@ -13,7 +13,6 @@ import fcntl
import subprocess import subprocess
import sys import sys
import termios import termios
import time
def write_to(text: bytes, dest_path: str) -> None: def write_to(text: bytes, dest_path: str) -> None:
with open(dest_path, "w") as f: with open(dest_path, "w") as f:
@@ -24,15 +23,7 @@ def main(argv: list[str]):
dest_path = argv[1] dest_path = argv[1]
cmd = argv[2:] cmd = argv[2:]
try: cmd_output = subprocess.check_output(cmd)
cmd_output = subprocess.check_output(cmd)
except Exception as e:
# command failed, somehow.
# sleep, to ensure `login` has some time to start
# then send it an empty newline to force it to fail
time.sleep(1)
write_to(b"\n", dest_path)
raise
write_to(cmd_output, dest_path) write_to(cmd_output, dest_path)
if __name__ == "__main__": if __name__ == "__main__":