nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Option --keep-tmp: Append EASYRSA_TEMP_DIR_session random number

Browse Source 
Append the random 32bit number generated for temporary session directory
to the '--keep-tmp=NAME' directory NAME specified by the user.

This avoids obliterating a private keys directory.

Example:
With default settings, '--keep-tmp=private' will delete "$PKI/private".

This will now destroy any directory with the name:
* "$temp_dir/$NAME.$rand"

Closes: #707

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-09-26 19:21:46 +01:00
parent 027a3e432f
commit bcd1376aa2
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
easyrsa3/easyrsa
View File

@ -630,6 +630,7 @@ secure_session() {
mkdir "${EASYRSA_TEMP_DIR}/${rand}" || continue mkdir "${EASYRSA_TEMP_DIR}/${rand}" || continue
EASYRSA_TEMP_DIR_session="${EASYRSA_TEMP_DIR}/${rand}" EASYRSA_TEMP_DIR_session="${EASYRSA_TEMP_DIR}/${rand}"
EASYRSA_TEMP_DIR_session_rand="${rand}"
return return
done done
return 1 return 1
@ -672,13 +673,18 @@ cleanup() {
[ -d "$EASYRSA_TEMP_DIR_session" ] [ -d "$EASYRSA_TEMP_DIR_session" ]
then then
if [ "$EASYRSA_KEEP_TEMP" ]; then if [ "$EASYRSA_KEEP_TEMP" ]; then
keep_tmp="$EASYRSA_TEMP_DIR/$EASYRSA_KEEP_TEMP" keep_tmp="$EASYRSA_KEEP_TEMP.$EASYRSA_TEMP_DIR_session_rand"
# Remove previous keep dir, created by --keep-temp keep_tmp="$EASYRSA_TEMP_DIR/$keep_tmp"
[ -d "$keep_tmp" ] && rm -rf "$keep_tmp"
mv -f "$EASYRSA_TEMP_DIR_session" "$keep_tmp" # Remove any previous dir, created by --keep-temp
information \ if [ "${#keep_tmp}" -gt 11 ]; then
"Temp session preserved: $keep_tmp" rm -rf "$keep_tmp"
mv -f "$EASYRSA_TEMP_DIR_session" "$keep_tmp"
information \
"Temp session preserved: $keep_tmp"
else
warn "Temp session NOT preserved"
fi
else else
rm -rf "$EASYRSA_TEMP_DIR_session" rm -rf "$EASYRSA_TEMP_DIR_session"
fi fi