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

Add proper name valoidation in rename command, don't allow blanks in names

Browse Source
This commit is contained in:
Jose
2020-05-09 13:59:58 -04:00
parent a607dc2719
commit e07f6cb0ed
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
usr/local/share/bastille/create.sh
View File

@@ -445,8 +445,8 @@ else
fi
## don't allow for dots(.) in container names
if echo "${NAME}" | grep -q "[.]"; then
echo -e "${COLOR_RED}Container names may not contain a dot(.)!${COLOR_RESET}"
if echo "${NAME}" | grep -Eq '[.]|\ '; then
echo -e "${COLOR_RED}Container names may not contain a dot(.) nor spaces!${COLOR_RESET}"
exit 1
fi

12
usr/local/share/bastille/rename.sh
View File

@@ -57,8 +57,8 @@ TARGET="${1}"
NEWNAME="${2}"
shift
if echo "${NEWNAME}" | grep -q "[.]"; then
echo -e "${COLOR_RED}Container names may not contain a dot(.)!${COLOR_RESET}"
if echo "${NEWNAME}" | grep -Eq '[.]|\ '; then
echo -e "${COLOR_RED}Container names may not contain a dot(.) nor spaces!${COLOR_RESET}"
exit 1
fi
@@ -125,9 +125,11 @@ change_name() {
fi
}
# Check if container is running
if [ -n "$(jls name | awk "/^${TARGET}$/")" ]; then
error_notify "${COLOR_RED}${TARGET} is running, See 'bastille stop'.${COLOR_RESET}"
## check if a running jail matches name or already exist
if [ "$(jls name | awk "/^${TARGET}$/")" ]; then
error_notify "${COLOR_RED}Warning: ${TARGET} is running or the name does match.${COLOR_RESET}"
elif [ -d "${bastille_jailsdir}/${NEWNAME}" ]; then
error_notify "${COLOR_RED}Jail: ${NEWNAME} already exist.${COLOR_RESET}"
fi
change_name