Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2025-12-21 09:41:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #288 from chriswells0/config-fixes

Browse Source 
Properly escape config property and value.
This commit is contained in:
Christer Edwards
2020-12-12 11:52:04 -07:00
committed by GitHub
parent 81ff4a3243 54f6ef62cd
commit 73c500ce3e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
usr/local/share/bastille/config.sh
View File

@@ -71,7 +71,8 @@ for _jail in ${JAILS}; do
continue continue
fi fi
MATCH_LINE=$(grep "^\s*${PROPERTY}[ =;]" "${FILE}" 2>/dev/null) ESCAPED_PROPERTY=$(echo "${PROPERTY}" | sed 's/\./\\\./g')
MATCH_LINE=$(grep "^ *${ESCAPED_PROPERTY}[ =;]" "${FILE}" 2>/dev/null)
MATCH_FOUND=$? MATCH_FOUND=$?
if [ "${ACTION}" = 'get' ]; then if [ "${ACTION}" = 'get' ]; then
@@ -89,6 +90,7 @@ for _jail in ${JAILS}; do
fi fi
else # Setting the value. -- cwells else # Setting the value. -- cwells
if [ -n "${VALUE}" ]; then if [ -n "${VALUE}" ]; then
VALUE=$(echo "${VALUE}" | sed 's/\//\\\//g')
if echo "${VALUE}" | grep ' ' > /dev/null 2>&1; then # Contains a space, so wrap in quotes. -- cwells if echo "${VALUE}" | grep ' ' > /dev/null 2>&1; then # Contains a space, so wrap in quotes. -- cwells
VALUE="'${VALUE}'" VALUE="'${VALUE}'"
fi fi
@@ -100,7 +102,7 @@ for _jail in ${JAILS}; do
if [ $MATCH_FOUND -ne 0 ]; then # No match, so insert the property at the end. -- cwells if [ $MATCH_FOUND -ne 0 ]; then # No match, so insert the property at the end. -- cwells
echo "$(awk -v line="${LINE}" '$0 == "}" { print line; } 1 { print $0; }' "${FILE}")" > "${FILE}" echo "$(awk -v line="${LINE}" '$0 == "}" { print line; } 1 { print $0; }' "${FILE}")" > "${FILE}"
else # Replace the existing value. -- cwells else # Replace the existing value. -- cwells
sed -i '' -E "s/ *${PROPERTY}[ =;].*/${LINE}/" "${FILE}" sed -i '' -E "s/ *${ESCAPED_PROPERTY}[ =;].*/${LINE}/" "${FILE}"
fi fi
fi fi
done done