|
|
@@ -9,39 +9,72 @@ INTER_POLICY="policy_inter"
|
|
|
INTER_EXT="v3_intermediate_ca"
|
|
|
REQ_POLICY="policy_req"
|
|
|
REQ_EXT="v3_req"
|
|
|
+PASS_DIR="${HOME}/.ansible/tls"
|
|
|
+ORG="Zi3"
|
|
|
+
|
|
|
+function makeDirExist {
|
|
|
+ if [ -d "${1}" ] || [ "${1}" == "." ]; then
|
|
|
+ return
|
|
|
+ fi
|
|
|
+ mkdir "${1}"
|
|
|
+ if [ -n "${2}" ]; then
|
|
|
+ chmod "${2}" "${1}"
|
|
|
+ fi
|
|
|
+ if [ -n "${3}" ]; then
|
|
|
+ chown "${3}" "${1}"
|
|
|
+ fi
|
|
|
+}
|
|
|
+
|
|
|
+# Decide what we're doing
|
|
|
+GEN_CA=1
|
|
|
+GEN_CERT=0
|
|
|
+if basename "${0}" | grep -q -i genCert; then
|
|
|
+ GEN_CA=0
|
|
|
+ GEN_CERT=1
|
|
|
+fi
|
|
|
|
|
|
# Support intermediate CAs
|
|
|
INTER="${1}"
|
|
|
if [ -n "${INTER}" ] && [ "${INTER}" != "@" ]; then
|
|
|
if [ ! -d "${INTER}" ]; then
|
|
|
- echo "Intermediate CA directory does not exist: ${INTER}" 1>&2
|
|
|
- exit 1
|
|
|
+ if [ ! -e $"${INTER}" ] && [ $GEN_CA -gt 0 ]; then
|
|
|
+ echo "Creating intermediate CA directory: ${INTER}"
|
|
|
+ makeDirExist "${INTER}" '0755'
|
|
|
+ else
|
|
|
+ echo "Intermediate CA directory does not exist: ${INTER}" 1>&2
|
|
|
+ exit 1
|
|
|
+ fi
|
|
|
fi
|
|
|
- PREFIX="${INTER}/"
|
|
|
+ export CA_DIR="${INTER}"
|
|
|
+ PRE_DASH="${INTER}-"
|
|
|
+ PRE_DIR="${INTER}/"
|
|
|
else
|
|
|
- INTER="@"
|
|
|
- PREFIX=""
|
|
|
+ export CA_DIR="@"
|
|
|
+ INTER=""
|
|
|
+ PRE_DASH=""
|
|
|
+ PRE_DIR=""
|
|
|
fi
|
|
|
|
|
|
# Calculate all our file paths
|
|
|
CONF="openssl.conf"
|
|
|
-CA_CERT="${PREFIX}${CA_NAME}.pem"
|
|
|
-CERTS="${PREFIX}certs"
|
|
|
-KEYS="${PREFIX}keys"
|
|
|
-DB_DIR="${PREFIX}db"
|
|
|
+CA_CERT="${PRE_DIR}${CA_NAME}.pem"
|
|
|
+CERTS="${PRE_DIR}certs"
|
|
|
+KEYS="${PRE_DIR}keys"
|
|
|
+DB_DIR="${PRE_DIR}db"
|
|
|
CRL="${DB_DIR}/crl/number"
|
|
|
INDEX="${DB_DIR}/index.txt"
|
|
|
SERIAL="${DB_DIR}/serial"
|
|
|
|
|
|
-# Export the CA directory for OpenSSL config path substitution
|
|
|
-export CA_DIR="${INTER}"
|
|
|
-
|
|
|
-# Decide what we're doing
|
|
|
-GEN_CA=1
|
|
|
-GEN_CERT=0
|
|
|
-if basename "${0}" | grep -q -i genCert; then
|
|
|
- GEN_CA=0
|
|
|
- GEN_CERT=1
|
|
|
+# Ensure the passphrase file is available
|
|
|
+PASS_KEY="${PASS_DIR}/${PRE_DASH}key.pwd"
|
|
|
+PASS_CA="${PASS_DIR}/${PRE_DASH}ca-key.pwd"
|
|
|
+if [ $GEN_CA -gt 0 ]; then
|
|
|
+ PASS_KEY="${PASS_DIR}/${PRE_DASH}ca-key.pwd"
|
|
|
+ PASS_CA="${PASS_DIR}/ca-key.pwd"
|
|
|
+fi
|
|
|
+if [ ! -r "${PASS_KEY}" ]; then
|
|
|
+ echo "Please create passphrase file: ${PASS_KEY}" 1>&2
|
|
|
+ exit 3
|
|
|
fi
|
|
|
|
|
|
# If we're generating a normal certificate we need a name
|
|
|
@@ -49,7 +82,7 @@ if [ $GEN_CERT -gt 0 ]; then
|
|
|
CN="${2}"
|
|
|
if [ -z "${CN}" ]; then
|
|
|
echo "Certificate name not specified" 1>&2
|
|
|
- echo "Usage: ${0} INTERMEDIATE CERT" 1>&2
|
|
|
+ echo "Usage: ${0} INTERMEDIATE COMMON_NAME" 1>&2
|
|
|
exit 1
|
|
|
fi
|
|
|
CERT="${CERTS}/${CN}.pem"
|
|
|
@@ -58,16 +91,28 @@ fi
|
|
|
|
|
|
# If we're generating a CA we know the name
|
|
|
if [ $GEN_CA -gt 0 ]; then
|
|
|
+ if [ -z "${INTER}" ]; then
|
|
|
+ CN="Root_CA"
|
|
|
+ else
|
|
|
+ CN="Intermediate_CA"
|
|
|
+ fi
|
|
|
CERT="${CA_CERT}"
|
|
|
KEY="${KEYS}/${CA_NAME}.key"
|
|
|
# If we're signing with the root override the CA_CERT path
|
|
|
CA_CERT="${CA_NAME}.pem"
|
|
|
fi
|
|
|
|
|
|
+# Pick a subject
|
|
|
+if [ -n "${INTER}" ]; then
|
|
|
+ SUBJECT="/O=${ORG}/OU=${INTER}/CN=${CN}"
|
|
|
+else
|
|
|
+ SUBJECT="/O=${ORG}/CN=${CN}"
|
|
|
+fi
|
|
|
+
|
|
|
# Remind admins what is happening
|
|
|
if [ $GEN_CA -gt 0 ]; then
|
|
|
echo
|
|
|
- echo "Generating new CA at ${PWD}/${PREFIX}"
|
|
|
+ echo "Generating new CA at ${PWD}/${PRE_DIR}"
|
|
|
echo
|
|
|
fi
|
|
|
if [ $GEN_CERT -gt 0 ]; then
|
|
|
@@ -104,19 +149,6 @@ if [ $GEN_CA -gt 0 ]; then
|
|
|
fi
|
|
|
fi
|
|
|
|
|
|
-function makeDirExist {
|
|
|
- if [ -d "${1}" ] || [ "${1}" == "." ]; then
|
|
|
- return
|
|
|
- fi
|
|
|
- mkdir "${1}"
|
|
|
- if [ -n "${2}" ]; then
|
|
|
- chmod "${2}" "${1}"
|
|
|
- fi
|
|
|
- if [ -n "${3}" ]; then
|
|
|
- chown "${3}" "${1}"
|
|
|
- fi
|
|
|
-}
|
|
|
-
|
|
|
# Ensure the CA paths are available and valid
|
|
|
if [ $GEN_CA -gt 0 ]; then
|
|
|
makeDirExist "${CERTS}" '0755'
|
|
|
@@ -132,8 +164,9 @@ if [ $GEN_CA -gt 0 ]; then
|
|
|
echo "01" > "${CRL}"
|
|
|
fi
|
|
|
|
|
|
-# Generate a new, encrypted key (user is prompted for password entry)
|
|
|
-openssl ecparam -name secp521r1 -genkey | openssl ec -aes256 -out "${KEY}"
|
|
|
+# Generate a new, encrypted key
|
|
|
+openssl ecparam -name secp521r1 -genkey | \
|
|
|
+ openssl ec -aes256 -passout "file:${PASS_KEY}" -out "${KEY}"
|
|
|
if [ ! -s "${KEY}" ]; then
|
|
|
echo "Unable to generate private key" 1>&2
|
|
|
exit 3
|
|
|
@@ -150,7 +183,9 @@ if [ -r "${CA_CERT}" ]; then
|
|
|
# Generate a CSR
|
|
|
openssl req -new \
|
|
|
-config "${CONF}" \
|
|
|
+ -subj "${SUBJECT}" \
|
|
|
-key "${KEY}" \
|
|
|
+ -passin "file:${PASS_KEY}" \
|
|
|
-out "${CSR}"
|
|
|
if [ ! -r "${CSR}" ]; then
|
|
|
echo "Unable to generate CSR"
|
|
|
@@ -170,7 +205,7 @@ if [ -r "${CA_CERT}" ]; then
|
|
|
DIR="${CA_DIR}"
|
|
|
EXT="${REQ_EXT}"
|
|
|
POLICY="${REQ_POLICY}"
|
|
|
- if [ "${INTER}" == "@" ] || [ $GEN_CA -gt 0 ]; then
|
|
|
+ if [ "${DIR}" == "@" ] || [ $GEN_CA -gt 0 ]; then
|
|
|
DIR="."
|
|
|
EXT="${INTER_EXT}"
|
|
|
POLICY="${INTER_POLICY}"
|
|
|
@@ -180,24 +215,25 @@ if [ -r "${CA_CERT}" ]; then
|
|
|
-policy "${POLICY}" \
|
|
|
-extensions "${EXT}" \
|
|
|
-days "${DAYS}" \
|
|
|
+ -passin "file:${PASS_CA}" \
|
|
|
-in "${CERT}.csr" \
|
|
|
-out "${CERT}"
|
|
|
|
|
|
# Generate a chain certificate for validation
|
|
|
if [ $GEN_CA -gt 0 ] && [ -r "${CERT}" ]; then
|
|
|
- cat "${CERT}" "${CA_CERT}" > "${INTER}/ca-chain.pem"
|
|
|
+ cat "${CERT}" "${CA_CERT}" > "${INTER_DIR}ca-chain.pem"
|
|
|
fi
|
|
|
|
|
|
# Drop the CSR
|
|
|
rm -f "${CERT}.csr"
|
|
|
|
|
|
# Generate keys ansible can decrypt
|
|
|
- if [ "${INTER}" != "@" ] && [ $GEN_CA -le 0 ] && [ -s "${CERT}" ]; then
|
|
|
+ if [ -n "${INTER}" ] && [ $GEN_CA -le 0 ] && [ -s "${CERT}" ]; then
|
|
|
echo
|
|
|
echo "Encrypting ${KEY} for Ansible"
|
|
|
echo
|
|
|
ANSIBLE_KEY="`echo "${KEY}" | sed 's%.key$%.ansible%'`"
|
|
|
- openssl ec -in "${KEY}" -out "${ANSIBLE_KEY}"
|
|
|
+ openssl ec -in "${KEY}" -passin "file:${PASS_KEY}" -out "${ANSIBLE_KEY}"
|
|
|
ansible-vault encrypt --encrypt-vault-id "${INTER}" "${ANSIBLE_KEY}"
|
|
|
if ! head -n 1 "${ANSIBLE_KEY}" | grep -q "^\$ANSIBLE_VAULT"; then
|
|
|
echo "Unable to generate ansible-encrypted key" 1>&2
|
|
|
@@ -213,16 +249,15 @@ else
|
|
|
# Root CA - self-sign
|
|
|
openssl req -new -x509 \
|
|
|
-config "${CONF}" \
|
|
|
+ -subj "${SUBJECT}" \
|
|
|
-extensions "${ROOT_EXT}" \
|
|
|
-days "${DAYS}" \
|
|
|
-key "${KEY}" \
|
|
|
+ -passin "file:${PASS_KEY}" \
|
|
|
-out "${CERT}"
|
|
|
fi
|
|
|
if [ ! -s "${CERT}" ]; then
|
|
|
echo "Unable to generate certificate" 1>&2
|
|
|
rm -f "${KEY}"
|
|
|
- if [ -n "${ANSIBLE_KEY}" ]; then
|
|
|
- rm -f "${ANSIBLE_KEY}"
|
|
|
- fi
|
|
|
exit 3
|
|
|
fi
|