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

Improved jail validation and deal with dashes

Browse Source
This commit is contained in:
Jose
2019-12-29 23:04:19 -04:00
parent f3615a3380
commit 2eb91e2f95
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,13 @@ usage() {
} }
running_jail() { running_jail() {
jls name | grep -w "${NAME}" if [ -n "$(jls name | awk "/^${NAME}$/")" ]; then
echo -e "${COLOR_RED}A running jail matches name.${COLOR_RESET}"
exit 1
elif [ -d "${bastille_jailsdir}/${NAME}" ]; then
echo -e "${COLOR_RED}Jail: ${NAME} already created.${COLOR_RESET}"
exit 1
fi
} }
validate_ip() { validate_ip() {
@@ -366,11 +372,9 @@ if [ ! -d "${bastille_releasesdir}/${RELEASE}" ]; then
exit 1 exit 1
fi fi
## check if a running jail matches name ## check if a running jail matches name or already exist
if running_jail ${NAME}; then if [ -n "${NAME}" ]; then
echo -e "${COLOR_RED}A running jail matches name.${COLOR_RESET}" running_jail
echo -e "${COLOR_RED}Jails must be stopped before they are destroyed.${COLOR_RESET}"
exit 1
fi fi
## check if ip address is valid ## check if ip address is valid

2
usr/local/share/bastille/destroy.sh
View File

@@ -40,7 +40,7 @@ destroy_jail() {
bastille_jail_base="${bastille_jailsdir}/${NAME}" ## dir bastille_jail_base="${bastille_jailsdir}/${NAME}" ## dir
bastille_jail_log="${bastille_logsdir}/${NAME}_console.log" ## file bastille_jail_log="${bastille_logsdir}/${NAME}_console.log" ## file
if [ $(jls name | grep -w "${NAME}") ]; then if [ "$(jls name | awk "/^${NAME}$/")" ]; then
echo -e "${COLOR_RED}Jail running.${COLOR_RESET}" echo -e "${COLOR_RED}Jail running.${COLOR_RESET}"
echo -e "${COLOR_RED}See 'bastille stop ${NAME}'.${COLOR_RESET}" echo -e "${COLOR_RED}See 'bastille stop ${NAME}'.${COLOR_RESET}"
exit 1 exit 1