Skip to content

Include .rpmsave files in password check #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Include .rpmsave files in password check #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 27 additions & 20 deletions bin/yk-auth
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,34 @@ fi
PREFIX=""
CONFIG_DIR="$PREFIX/etc/qubes/yk-keys"

if [ -r "$CONFIG_DIR/login-pass-hashed.hex" ]; then
pass_hash=$(cat $CONFIG_DIR/login-pass-hashed.hex | grep -v '^#' | tr -d '\n')
fi
if [ -z "$pass_hash" ] && [ -r "$CONFIG_DIR/yk-login-pass-hashed.hex" ]; then # compatibility with older version
pass_hash=$(cat $CONFIG_DIR/yk-login-pass-hashed.hex | grep -v '^#' | tr -d '\n')
fi
for PW_HEX_FILE in 'login-pass-hashed.hex' 'yk-login-pass-hashed.hex' 'yk-login-pass-hashed.hex.rpmsave';
do
if [ -r "$CONFIG_DIR/$PW_HEX_FILE" ]; then
pass_hash=$(cat $CONFIG_DIR/$PW_HEX_FILE | grep -v '^#' | tr -d '\n')
fi

if [ -n "$pass_hash" ]; then
break
fi
done

if [ -z "$pass_hash" ]; then
# do it in one line (without any intermediate variable, to not leak
# password to logs, even with set -x
if [ -r "$CONFIG_DIR/login-pass" ]; then
pass_hash_clear=$(cat $CONFIG_DIR/login-pass | grep -v '^#' | tr -d '\n' |
openssl dgst -sha1 -r | cut -f1 -d ' ')
fi
if [ -z "$pass_hash_clear" ] && [ -r "$CONFIG_DIR/yk-login-pass" ]; then
pass_hash_clear=$(cat $CONFIG_DIR/yk-login-pass | grep -v '^#' | tr -d '\n' |
openssl dgst -sha1 -r | cut -f1 -d ' ')
fi
# check if not hash of empty string
if [ -n "$pass_hash_clear" ] && [ "$pass_hash_clear" != "da39a3ee5e6b4b0d3255bfef95601890afd80709" ]; then
pass_hash="$pass_hash_clear"
fi
for PW_FILE in 'login-pass' 'yk-login-pass' 'yk-login-pass.rpmsave';
do
# do it in one line (without any intermediate variable,
# to not leak password to logs, even with set -x

if [ -r "$CONFIG_DIR/$PW_FILE" ]; then
pass_hash_clear=$(cat $CONFIG_DIR/$PW_FILE | grep -v '^#' | tr -d '\n' |
openssl dgst -sha1 -r | cut -f1 -d ' ')
fi

# check if not hash of empty string
if [ -n "$pass_hash_clear" ] && [ "$pass_hash_clear" != "da39a3ee5e6b4b0d3255bfef95601890afd80709" ]; then
pass_hash="$pass_hash_clear"
break
fi
done
fi

# if password was given, verify it
Expand Down