forked from clan/clan-core
Merge pull request 'Revert "clan-cli: cmd.py uses pseudo terminal now. Remove tty.py. Refactor password_store.py to use cmd.py."' (#1543) from lassulus/clan-core:lassulus-HEAD into main
This commit is contained in:
commit
8089b87bbb
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,5 +1,4 @@
|
||||
.direnv
|
||||
***/.vscode
|
||||
***/.hypothesis
|
||||
out.log
|
||||
.coverage.*
|
||||
@ -36,4 +35,4 @@ repo
|
||||
# node
|
||||
node_modules
|
||||
dist
|
||||
.webui
|
||||
.webui
|
@ -1,6 +1,5 @@
|
||||
import logging
|
||||
import os
|
||||
import pty
|
||||
import select
|
||||
import shlex
|
||||
import subprocess
|
||||
@ -9,6 +8,7 @@ import weakref
|
||||
from datetime import datetime, timedelta
|
||||
from enum import Enum
|
||||
from pathlib import Path
|
||||
from typing import IO, Any
|
||||
|
||||
from .custom_logger import get_caller
|
||||
from .errors import ClanCmdError, CmdOut
|
||||
@ -23,6 +23,42 @@ class Log(Enum):
|
||||
NONE = 4
|
||||
|
||||
|
||||
def handle_output(process: subprocess.Popen, log: Log) -> tuple[str, str]:
|
||||
rlist = [process.stdout, process.stderr]
|
||||
stdout_buf = b""
|
||||
stderr_buf = b""
|
||||
|
||||
while len(rlist) != 0:
|
||||
r, _, _ = select.select(rlist, [], [], 0.1)
|
||||
if len(r) == 0: # timeout in select
|
||||
if process.poll() is None:
|
||||
continue
|
||||
# Process has exited
|
||||
break
|
||||
|
||||
def handle_fd(fd: IO[Any] | None) -> bytes:
|
||||
if fd and fd in r:
|
||||
read = os.read(fd.fileno(), 4096)
|
||||
if len(read) != 0:
|
||||
return read
|
||||
rlist.remove(fd)
|
||||
return b""
|
||||
|
||||
ret = handle_fd(process.stdout)
|
||||
if ret and log in [Log.STDOUT, Log.BOTH]:
|
||||
sys.stdout.buffer.write(ret)
|
||||
sys.stdout.flush()
|
||||
|
||||
stdout_buf += ret
|
||||
ret = handle_fd(process.stderr)
|
||||
|
||||
if ret and log in [Log.STDERR, Log.BOTH]:
|
||||
sys.stderr.buffer.write(ret)
|
||||
sys.stderr.flush()
|
||||
stderr_buf += ret
|
||||
return stdout_buf.decode("utf-8", "replace"), stderr_buf.decode("utf-8", "replace")
|
||||
|
||||
|
||||
class TimeTable:
|
||||
"""
|
||||
This class is used to store the time taken by each command
|
||||
@ -78,91 +114,38 @@ def run(
|
||||
)
|
||||
else:
|
||||
glog.debug(f"$: {shlex.join(cmd)} \nCaller: {get_caller()}")
|
||||
|
||||
# Create pseudo-terminals for stdout/stderr and stdin
|
||||
stdout_master_fd, stdout_slave_fd = pty.openpty()
|
||||
stderr_master_fd, stderr_slave_fd = pty.openpty()
|
||||
|
||||
tstart = datetime.now()
|
||||
|
||||
proc = subprocess.Popen(
|
||||
# Start the subprocess
|
||||
process = subprocess.Popen(
|
||||
cmd,
|
||||
preexec_fn=os.setsid,
|
||||
stdin=stdout_slave_fd,
|
||||
stdout=stdout_slave_fd,
|
||||
stderr=stderr_slave_fd,
|
||||
close_fds=True,
|
||||
env=env,
|
||||
cwd=str(cwd),
|
||||
env=env,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
)
|
||||
|
||||
os.close(stdout_slave_fd) # Close slave FD in parent
|
||||
os.close(stderr_slave_fd) # Close slave FD in parent
|
||||
|
||||
stdout_file = sys.stdout
|
||||
stderr_file = sys.stderr
|
||||
stdout_buf = b""
|
||||
stderr_buf = b""
|
||||
stdout_buf, stderr_buf = handle_output(process, log)
|
||||
|
||||
if input:
|
||||
written_b = os.write(stdout_master_fd, input)
|
||||
|
||||
if written_b != len(input):
|
||||
raise ValueError("Could not write all input to subprocess")
|
||||
|
||||
rlist = [stdout_master_fd, stderr_master_fd]
|
||||
|
||||
def handle_fd(fd: int | None) -> bytes:
|
||||
if fd and fd in r:
|
||||
try:
|
||||
read = os.read(fd, 4096)
|
||||
if len(read) != 0:
|
||||
return read
|
||||
except OSError:
|
||||
pass
|
||||
rlist.remove(fd)
|
||||
return b""
|
||||
|
||||
while len(rlist) != 0:
|
||||
r, w, e = select.select(rlist, [], [], 0.1)
|
||||
if len(r) == 0: # timeout in select
|
||||
if proc.poll() is None:
|
||||
continue
|
||||
# Process has exited
|
||||
break
|
||||
|
||||
ret = handle_fd(stdout_master_fd)
|
||||
stdout_buf += ret
|
||||
if ret and log in [Log.STDOUT, Log.BOTH]:
|
||||
stdout_file.buffer.write(ret)
|
||||
stdout_file.flush()
|
||||
|
||||
ret = handle_fd(stderr_master_fd)
|
||||
stderr_buf += ret
|
||||
if ret and log in [Log.STDERR, Log.BOTH]:
|
||||
stderr_file.buffer.write(ret)
|
||||
stderr_file.flush()
|
||||
|
||||
os.close(stdout_master_fd)
|
||||
os.close(stderr_master_fd)
|
||||
|
||||
proc.wait()
|
||||
|
||||
process.communicate(input)
|
||||
else:
|
||||
process.wait()
|
||||
tend = datetime.now()
|
||||
|
||||
global TIME_TABLE
|
||||
TIME_TABLE.add(shlex.join(cmd), tend - tstart)
|
||||
|
||||
# Wait for the subprocess to finish
|
||||
cmd_out = CmdOut(
|
||||
stdout=stdout_buf.decode("utf-8", "replace"),
|
||||
stderr=stderr_buf.decode("utf-8", "replace"),
|
||||
stdout=stdout_buf,
|
||||
stderr=stderr_buf,
|
||||
cwd=cwd,
|
||||
command=shlex.join(cmd),
|
||||
returncode=proc.returncode,
|
||||
returncode=process.returncode,
|
||||
msg=error_msg,
|
||||
)
|
||||
|
||||
if check and proc.returncode != 0:
|
||||
if check and process.returncode != 0:
|
||||
raise ClanCmdError(cmd_out)
|
||||
|
||||
return cmd_out
|
||||
|
@ -2,7 +2,7 @@ import os
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
from clan_cli.cmd import run
|
||||
from clan_cli.cmd import Log, run
|
||||
from clan_cli.machines.machines import Machine
|
||||
from clan_cli.nix import nix_shell
|
||||
|
||||
@ -16,13 +16,14 @@ class SecretStore(SecretStoreBase):
|
||||
def set(
|
||||
self, service: str, name: str, value: bytes, groups: list[str]
|
||||
) -> Path | None:
|
||||
subprocess.run(
|
||||
run(
|
||||
nix_shell(
|
||||
["nixpkgs#pass"],
|
||||
["pass", "insert", "-m", f"machines/{self.machine.name}/{name}"],
|
||||
),
|
||||
input=value,
|
||||
check=True,
|
||||
log=Log.BOTH,
|
||||
error_msg=f"Failed to insert secret {name}",
|
||||
)
|
||||
return None # we manage the files outside of the git repo
|
||||
|
||||
|
@ -1,6 +1,5 @@
|
||||
import argparse
|
||||
import getpass
|
||||
import logging
|
||||
import os
|
||||
import shutil
|
||||
import sys
|
||||
@ -9,6 +8,7 @@ from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
from typing import IO
|
||||
|
||||
from .. import tty
|
||||
from ..errors import ClanError
|
||||
from ..git import commit_files
|
||||
from .folders import (
|
||||
@ -21,13 +21,6 @@ from .folders import (
|
||||
from .sops import decrypt_file, encrypt_file, ensure_sops_key, read_key, update_keys
|
||||
from .types import VALID_SECRET_NAME, secret_name_type
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def tty_is_interactive() -> bool:
|
||||
"""Returns true if the current process is interactive"""
|
||||
return sys.stdin.isatty() and sys.stdout.isatty()
|
||||
|
||||
|
||||
def update_secrets(
|
||||
flake_dir: Path, filter_secrets: Callable[[Path], bool] = lambda _: True
|
||||
@ -56,11 +49,11 @@ def collect_keys_for_type(folder: Path) -> set[str]:
|
||||
try:
|
||||
target = p.resolve()
|
||||
except FileNotFoundError:
|
||||
log.warn(f"Ignoring broken symlink {p}")
|
||||
tty.warn(f"Ignoring broken symlink {p}")
|
||||
continue
|
||||
kind = target.parent.name
|
||||
if folder.name != kind:
|
||||
log.warn(f"Expected {p} to point to {folder} but points to {target.parent}")
|
||||
tty.warn(f"Expected {p} to point to {folder} but points to {target.parent}")
|
||||
continue
|
||||
keys.add(read_key(target))
|
||||
return keys
|
||||
@ -292,7 +285,7 @@ def set_command(args: argparse.Namespace) -> None:
|
||||
secret_value = None
|
||||
elif env_value:
|
||||
secret_value = env_value
|
||||
elif tty_is_interactive():
|
||||
elif tty.is_interactive():
|
||||
secret_value = getpass.getpass(prompt="Paste your secret: ")
|
||||
encrypt_secret(
|
||||
Path(args.flake),
|
||||
|
26
pkgs/clan-cli/clan_cli/tty.py
Normal file
26
pkgs/clan-cli/clan_cli/tty.py
Normal file
@ -0,0 +1,26 @@
|
||||
import sys
|
||||
from collections.abc import Callable
|
||||
from typing import IO, Any
|
||||
|
||||
|
||||
def is_interactive() -> bool:
|
||||
"""Returns true if the current process is interactive"""
|
||||
return sys.stdin.isatty() and sys.stdout.isatty()
|
||||
|
||||
|
||||
def color_text(code: int, file: IO[Any] = sys.stdout) -> Callable[[str], None]:
|
||||
"""
|
||||
Print with color if stderr is a tty
|
||||
"""
|
||||
|
||||
def wrapper(text: str) -> None:
|
||||
if file.isatty():
|
||||
print(f"\x1b[{code}m{text}\x1b[0m", file=file)
|
||||
else:
|
||||
print(text, file=file)
|
||||
|
||||
return wrapper
|
||||
|
||||
|
||||
warn = color_text(91, file=sys.stderr)
|
||||
info = color_text(92, file=sys.stderr)
|
Loading…
Reference in New Issue
Block a user