evolix/shellpki
21
0
Fork 0
Code Issues Pull requests Releases 3 Wiki Activity

extract get_real_path function to normalize readlink arguments

Browse source
This commit is contained in:
Jérémy Lecour 2022-03-11 11:38:01 +01:00 committed by Jérémy Lecour
parent 593cf4a9f3
commit 41d0ca261d
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shellpki
View file

@ -239,6 +239,11 @@ verify_ca_password() {
-passin pass:${CA_PASSWORD} \ -passin pass:${CA_PASSWORD} \
>/dev/null 2>&1 >/dev/null 2>&1
} }
get_real_path() {
# --canonicalize is supported on Linux
# -f is supported on Linux and OpenBSD
readlink -f -- "${1}"
}
ask_ca_password() { ask_ca_password() {
attempt=${1:-0} attempt=${1:-0}
@ -327,7 +332,7 @@ create() {
# csr-file option, with value separated by space # csr-file option, with value separated by space
if [ -n "$2" ]; then if [ -n "$2" ]; then
from_csr=1 from_csr=1
csr_file=$(readlink --canonicalize -- "${2}") csr_file=$(get_real_path "${2}")
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
error "Error accessing file \`${2}'" error "Error accessing file \`${2}'"
fi fi
@ -339,7 +344,7 @@ create() {
--file=?*|--csr-file=?*) --file=?*|--csr-file=?*)
from_csr=1 from_csr=1
# csr-file option, with value separated by = # csr-file option, with value separated by =
csr_file=$(readlink --canonicalize -- "${1#*=}") csr_file=$(get_real_path "${1#*=}")
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
error "Error accessing file \`${1#*=}'" error "Error accessing file \`${1#*=}'"
fi fi
@ -354,7 +359,7 @@ create() {
--password-file) --password-file)
# password-file option, with value separated by space # password-file option, with value separated by space
if [ -n "$2" ]; then if [ -n "$2" ]; then
password_file=$(readlink --canonicalize -- "${2}") password_file=$(get_real_path "${2}")
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
error "Error accessing file \`${2}'" error "Error accessing file \`${2}'"
fi fi
@ -365,7 +370,7 @@ create() {
;; ;;
--password-file=?*) --password-file=?*)
# password-file option, with value separated by = # password-file option, with value separated by =
password_file=$(readlink --canonicalize -- "${1#*=}") password_file=$(get_real_path "${1#*=}")
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
error "Error accessing file \`${1#*=}'" error "Error accessing file \`${1#*=}'"
fi fi