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

explicit checks on exit code

Browse source
This commit is contained in:
Jérémy Lecour 2020-05-04 23:06:51 +02:00 committed by Jérémy Lecour
parent df6d06d848
commit 857bb4b239
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
shellpki
View file

@ -311,16 +311,20 @@ create() {
"${OPENSSL_BIN}" req \
-noout -subject \
-in "${csr_file}" \
>/dev/null 2>&1 \
|| error "${csr_file} is not a valid CSR !"
>/dev/null 2>&1
if [ "$?" -ne 0 ]; then
error "${csr_file} is not a valid CSR !"
fi
# check if csr_file contain a CN
"${OPENSSL_BIN}" req \
-noout -subject \
-in "${csr_file}" \
| grep -Eo "CN\s*=[^,/]*" \
>/dev/null 2>&1 \
|| error "${csr_file} don't contain a CommonName !"
>/dev/null 2>&1
if [ "$?" -ne 0 ]; then
error "${csr_file} doesn't contain a CommonName !"
fi
# get CN from CSR
cn=$("${OPENSSL_BIN}" req -noout -subject -in "${csr_file}" | grep -Eo "CN\s*=[^,/]*" | cut -d'=' -f2 | xargs)
@ -436,8 +440,10 @@ EOF
-noout \
-subject \
-in "${CRT_DIR}/${cn}.crt" \
>/dev/null 2>&1 \
|| rm -f "${CRT_DIR}/${cn}.crt"
>/dev/null 2>&1
if [ "$?" -ne 0 ]; then
rm -f "${CRT_DIR}/${cn}.crt"
fi
if [ ! -f "${CRT_DIR}/${cn}.crt" ]; then
error "Error in CSR creation"
@ -510,8 +516,10 @@ revoke() {
-noout \
-subject \
-in "${CRT_DIR}/${cn}.crt" \
>/dev/null 2>&1 \
|| error "${CRT_DIR}/${cn}.crt is not a valid CRT, you must delete it !"
>/dev/null 2>&1
if [ "$?" -ne 0 ]; then
error "${CRT_DIR}/${cn}.crt is not a valid CRT, you must delete it !"
fi
# ask for CA passphrase
ask_ca_password 0
@ -643,7 +651,7 @@ main() {
OPENSSL_BIN=$(command -v openssl)
SUFFIX=$(/bin/date +"%s")
if ! getent passwd "${PKI_USER}" >/dev/null || ! getent group "${PKI_USER}" >/dev/null; then
if ! getent passwd "${PKI_USER}" >/dev/null ! getent group "${PKI_USER}" >/dev/null; then
error "You must create ${PKI_USER} user and group !"
fi