commit 1e042d5e1ab2b75e28d612b1fd053d92a79bd762 parent 032c9cc341394d2ebb6a4f041ac62d63b8755c59 Author: Jan Pobrislo <ccx@webprojekty.cz> Date: Wed, 12 Oct 2022 23:26:08 +0200 gpg-agent Diffstat:
| A | bin/pinentry-statuswrapper | | | 14 | ++++++++++++++ |
| A | bin/supervised-gpg-agent-from-fdholder | | | 38 | ++++++++++++++++++++++++++++++++++++++ |
2 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/bin/pinentry-statuswrapper b/bin/pinentry-statuswrapper @@ -0,0 +1,14 @@ +#!/bin/zsh +setopt no_unset + +statusfile=/run/user/$UID/i3status/pinentry +mkdir -p $statusfile:h || exit $? +exec 9>>$statusfile || exit $? +flock -s 9 || exit $? +printf "%s\n" "PINENTRY: ${TTY#/dev/}" >$statusfile +9>& - flock $statusfile redirfd -w 1 $statusfile true &! +if (($#)); then + exec "$@" +else + exec pinentry +fi diff --git a/bin/supervised-gpg-agent-from-fdholder b/bin/supervised-gpg-agent-from-fdholder @@ -0,0 +1,38 @@ +#!/command/execlineb -P + +backtick USER { whoami } +importas -i USER USER + +#backtick HOME { homeof ${USER} } +#importas -i HOME HOME + +if { + s6-rc -v2 -u -l /run/user/${USER}/s6-rc change fdholder +} + +foreground { + if { test -d /run/containers/alpine-recombee.ccx/inbox/ } + foreground { + ln -fv /run/user/ccx/gpg-agent-ssh.sock /run/containers/alpine-recombee.ccx/inbox/ + } + ln -fv /run/user/ccx/gpg-agent.sock /run/containers/alpine-recombee.ccx/inbox/ +} + +s6-fdholder-retrieve -t 1000 /run/user/${USER}/service/fdholder/s gpg-agent:std +fdmove 3 0 + +s6-fdholder-retrieve -t 1000 /run/user/${USER}/service/fdholder/s gpg-agent:ssh +fdmove 4 0 + +s6-fdholder-retrieve -t 1000 /run/user/${USER}/service/fdholder/s gpg-agent:extra +fdmove 5 0 + +redirfd -r 0 /dev/null + +export SD_LISTEN_FDS_START 3 +export LISTEN_FDS 3 +export LISTEN_FDNAMES "std:ssh:extra" +getpid LISTEN_PID + +#fdmove -c 2 1 +gpg-agent --enable-ssh-support --keep-tty --keep-display --supervised