jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename to and use _pkcs11module_hook

Browse source
This commit is contained in:
Jakobus Schürz 2023-02-27 08:18:03 +01:00
parent fc2f62bb0f
commit 6c74f47783
2 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bashrc_add
View file

@ -196,10 +196,10 @@ EOF
_tmux_hook _tmux_hook
_umask_hook _umask_hook
_pkcs11module _pkcs11module_hook
promptcommandmunge "_tmux_hook" promptcommandmunge "_tmux_hook"
promptcommandmunge "_umask_hook" promptcommandmunge "_umask_hook"
promptcommandmunge "_pkcs11module" promptcommandmunge "_pkcs11module_hook"
which direnv >/dev/null && eval "$(direnv hook bash)" which direnv >/dev/null && eval "$(direnv hook bash)"
cat << EOF >> "${MSC_LOGFILE}" cat << EOF >> "${MSC_LOGFILE}"

36
functions.sh
View file

@ -21,21 +21,43 @@ promptcommandmunge () {
EXIT EXIT
} }
function _pkcs11module() { function _pkcs11module_hook() {
[ -z "${P11M:+x}" ] && \ if [ -z "${PKCS11_MODULE:+x}" ]
then
# setze PKCS11_MODULE
loginfo "PKCS11_MODULE not set yet"
if [ -z "${P11M:+x}" ]
then
# komme ich nicht über ssh, oder P11M ist nicht gesetzt, dann suche das P11-KIT-PROXY Modul für PKCS11_MODULE
logtrace "P11M not set -> search for p11-kit-proxy"
PKCS11_MODULE="$(whereis ${pkcs11_module_default:-p11-kit-proxy.so}|awk '{print $2}')"
[ -n "$(whereis ${pkcs11_module_default:-p11-kit-proxy.so}|awk '{print $2}')" ] && \ [ -n "$(whereis ${pkcs11_module_default:-p11-kit-proxy.so}|awk '{print $2}')" ] && \
export PKCS11_MODULE=$(whereis ${pkcs11_module_default:-p11-kit-proxy.so}|awk '{print $2}' || \ export PKCS11_MODULE=$(whereis ${pkcs11_module_default:-p11-kit-proxy.so}|awk '{print $2}') || \
{ echo "${pkcs11_module_default:-p11-kit-proxy.so} not forwarded by ssh or installed, unset P11M"; unset P11M; }) { echo "${pkcs11_module_default:-p11-kit-proxy.so} not forwarded by ssh or installed, unset P11M"; unset P11M; }
else
# komme ich über ssh, dann ist P11M (hoffentlich) gesetzt. Setze PKCS11_MODULE auf P11M
logtrace "P11M set -> set PKCS11_MODULE to P11M"
PKCS11_MODULE=${P11M}
if [ -n "${TMUX}" ]; then
tmux set-environment P11M ${P11M}
tmux set-environment -g P11M ${P11M}
fi
fi
else
# lass es gesetzt.
logtrace "PKCS11_MODULE is set, do nothing"
fi
[ -n "${P11M:+x}" ] && PKCS11_MODULE=${P11M} loginfo "PKCS11_MODULE: $PKCS11_MODULE"
[ -n "${P11M:+x}" ] && tmux set-environment P11M ${P11M}
if [ -n "${TMUX}" ]; then if [ -n "${TMUX}" ]; then
logdebug "set PKCS11_MODULE also in tmux environment"
tmux set-environment PKCS11_MODULE ${PKCS11_MODULE} tmux set-environment PKCS11_MODULE ${PKCS11_MODULE}
tmux set-environment -g PKCS11_MODULE ${PKCS11_MODULE} tmux set-environment -g PKCS11_MODULE ${PKCS11_MODULE}
fi fi
} }
## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmux-sessions, ## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmux-sessions,
# every time prompt is called. It does it only, when called from tmux (Environment TMUX is set) # every time prompt is called. It does it only, when called from tmux (Environment TMUX is set)
function _tmux_hook() { function _tmux_hook() {
@ -1005,7 +1027,7 @@ token(){
token-extract-pubkey() { token-extract-pubkey() {
[ -z "${PKCS11_MODULE+x}" ] && { PKCS11_MODULE=$P11M; export PKCS11_MODULE; } _pkcs11module_hook
if pkcs11-tool --module $PKCS11_MODULE --list-token-slots >&2 ;then if pkcs11-tool --module $PKCS11_MODULE --list-token-slots >&2 ;then
ssh-keygen -i -m pkcs8 -f <(pkcs11-tool --module $PKCS11_MODULE -r --type pubkey ${1:+--label} ${1} |openssl rsa -pubin -inform DER ) ssh-keygen -i -m pkcs8 -f <(pkcs11-tool --module $PKCS11_MODULE -r --type pubkey ${1:+--label} ${1} |openssl rsa -pubin -inform DER )
if [ $? -gt 0 ] ; then if [ $? -gt 0 ] ; then