Lucas/cassh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- ssh-keygen will fail hard if it doesn't find what it needs, even when

Browse Source 
quiet
- Don't find "$PATH_PUBKEYS_DIR/" if it doesn't exist
- Retrieve CA comment only inside find, when it's really needed
- Quiet down ssh-keygen in get_ca_sk_comment_from_pk if ca.pub is not
  present
This commit is contained in:
Lucas 2022-04-19 04:05:49 +00:00
parent 06b4ec5354
commit e0bc09679e
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cassh.sh
View File

@ -33,7 +33,7 @@ err()
# present. # present.
get_ca_sk_comment_from_pk() get_ca_sk_comment_from_pk()
{ {
ssh-keygen -lf "$1" | { ssh-keygen -lf "$1" 2>/dev/null | {
read -r pk_sz pk_fp pk_extra read -r pk_sz pk_fp pk_extra
_comment=$(ssh-add -l | while read -r sk_sz sk_fp sk_extra; do _comment=$(ssh-add -l | while read -r sk_sz sk_fp sk_extra; do
if [ "X$sk_fp" = "X$pk_fp" ]; then if [ "X$sk_fp" = "X$pk_fp" ]; then
@ -117,24 +117,18 @@ main_issue()
usage usage
fi fi
if [ ! -f "$PATH_CA_PUB" ]; then
err "no $PATH_CA_PUB found"
fi
if ! ssh-add $qflag $vflag -T "$PATH_CA_PUB"; then
err "can't use CA key"
fi
if [ ! -d "$PATH_PUBKEYS_DIR/" ]; then
err "no pubkeys directory found"
fi
if [ ! -f "$PATH_CA_SERIAL" ]; then if [ ! -f "$PATH_CA_SERIAL" ]; then
echo 0 >"$PATH_CA_SERIAL" echo 0 >"$PATH_CA_SERIAL"
fi fi
read -r serial <"$PATH_CA_SERIAL" read -r serial <"$PATH_CA_SERIAL"
ca_comment=$(get_ca_sk_comment_from_pk "$PATH_CA_PUB") if [ ! -d "$PATH_PUBKEYS_DIR" ]; then
: ${ca_comment:=cassh} exit 0
fi
find "$PATH_PUBKEYS_DIR/" -type f -name '*.pub' ! -name '*-cert.pub' | { find "$PATH_PUBKEYS_DIR/" -type f -name '*.pub' ! -name '*-cert.pub' | {
ca_comment=$(get_ca_sk_comment_from_pk "$PATH_CA_PUB")
: ${ca_comment:=cassh}
while read -r pk; do while read -r pk; do
pkname=${pk%.pub} pkname=${pk%.pub}
pkname=${pkname#$PATH_PUBKEYS_DIR/} pkname=${pkname#$PATH_PUBKEYS_DIR/}