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

common: fix epair naming

Browse Source
This commit is contained in:
tschettervictor
2025-01-18 10:08:02 -07:00
committed by GitHub
parent fb1d4fca95
commit fdff42a1b3
1 changed files with 71 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
usr/local/share/bastille/common.sh
View File

@@ -30,7 +30,10 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
. /usr/local/etc/bastille/bastille.conf # Source config file
if [ -f /usr/local/etc/bastille/bastille.conf ]; then
. /usr/local/etc/bastille/bastille.conf
fi
COLOR_RED= COLOR_RED=
COLOR_GREEN= COLOR_GREEN=
@@ -90,7 +93,7 @@ warn() {
check_target_exists() { check_target_exists() {
local _TARGET="${1}" local _TARGET="${1}"
local _jaillist="$(bastille list jails)" local _jaillist="$(bastille list jails)"
if ! echo "${_jaillist}" | grep -Eoq "^${_TARGET}$"; then if ! echo "${_jaillist}" | grep -Eq "^${_TARGET}$"; then
return 1 return 1
else else
return 0 return 0
@@ -99,7 +102,7 @@ check_target_exists() {
check_target_is_running() { check_target_is_running() {
local _TARGET="${1}" local _TARGET="${1}"
if ! jls name | grep -Eoq "^${_TARGET}$"; then if ! jls name | grep -Eq "^${_TARGET}$"; then
return 1 return 1
else else
return 0 return 0
@@ -108,7 +111,7 @@ check_target_is_running() {
check_target_is_stopped() { check_target_is_stopped() {
local _TARGET="${1}" local _TARGET="${1}"
if jls name | grep -Eoq "^${_TARGET}$"; then if jls name | grep -Eq "^${_TARGET}$"; then
return 1 return 1
else else
return 0 return 0
@@ -184,8 +187,7 @@ set_target_single() {
else else
error_exit "Error: JID \"${_TARGET}\" not found. Is jail running?" error_exit "Error: JID \"${_TARGET}\" not found. Is jail running?"
fi fi
elif elif ! check_target_exists "${_TARGET}"; then
! check_target_exists "${_TARGET}"; then
if jail_autocomplete "${_TARGET}" > /dev/null; then if jail_autocomplete "${_TARGET}" > /dev/null; then
_TARGET="$(jail_autocomplete ${_TARGET})" _TARGET="$(jail_autocomplete ${_TARGET})"
elif [ $? -eq 2 ]; then elif [ $? -eq 2 ]; then
@@ -211,6 +213,30 @@ target_all_jails() {
export JAILS export JAILS
} }
update_fstab() {
local _oldname="${1}"
local _newname="${2}"
local _fstab="${bastille_jailsdir}/${_newname}/fstab"
if [ -f "${_fstab}" ]; then
sed -i '' "s|${bastille_jailsdir}/${_oldname}/root/|${bastille_jailsdir}/${_newname}/root/|" "${_fstab}"
else
error_notify "Error: Failed to update fstab: ${_newmane}"
fi
}
generate_static_mac() {
local jail_name="${1}"
local external_interface="${2}"
local external_interface_mac="$(ifconfig ${external_interface} | grep ether | awk '{print $2}')"
local macaddr_prefix="58:9c:fc"
local macaddr_suffix="$(echo -n "${external_interface_mac}${jail_name}" | sed 's#:##g' | sha256 | cut -b -5 | sed 's/\([0-9a-fA-F][0-9a-fA-F]\)\([0-9a-fA-F][0-9a-fA-F]\)\([0-9a-fA-F]\)/\1:\2:\3/')"
if [ -z "${macaddr_prefix}" ] || [ -z "${macaddr_suffix}" ]; then
error_notify "Failed to generate MAC address."
fi
macaddr="${macaddr_prefix}:${macaddr_suffix}"
export macaddr
}
generate_vnet_jail_netblock() { generate_vnet_jail_netblock() {
local jail_name="${1}" local jail_name="${1}"
local use_unique_bridge="${2}" local use_unique_bridge="${2}"
@@ -220,23 +246,37 @@ generate_vnet_jail_netblock() {
## iterate num and grep all jail configs ## iterate num and grep all jail configs
## define uniq_epair ## define uniq_epair
local _epair_if_count="$(grep -Eos 'epair[0-9]+' ${bastille_jailsdir}/*/jail.conf | sort -u | wc -l | awk '{print $1}')" local _epair_if_count="$(grep -Eos 'epair[0-9]+' ${bastille_jailsdir}/*/jail.conf | sort -u | wc -l | awk '{print $1}')"
local _vnet_if_count="$(grep -Eos 'bastille[0-9]+' ${bastille_jailsdir}/*/jail.conf | sort -u | wc -l | awk '{print $1}')" local _bastille_if_count="$(grep -Eos 'bastille[0-9]+' ${bastille_jailsdir}/*/jail.conf | sort -u | wc -l | awk '{print $1}')"
local epair_num_range=$((_epair_if_count + 1)) local epair_num_range=$((_epair_if_count + 1))
local vnet_num_range=$((_vnet_if_count + 1)) local bastille_num_range=$((_bastille_if_count + 1))
if [ -n "${use_unique_bridge}" ]; then if [ -n "${use_unique_bridge}" ]; then
if [ "${_epair_if_count}" -gt 0 ]; then if [ "${_epair_if_count}" -gt 0 ]; then
for _num in $(seq 0 "${epair_num_range}"); do for _num in $(seq 0 "${epair_num_range}"); do
if ! grep -Eosq "epair${_num}" ${bastille_jailsdir}/*/jail.conf; then if ! grep -Eosq "epair${_num}" ${bastille_jailsdir}/*/jail.conf; then
local uniq_epair_bridge="${_num}" if [ "$(echo -n "e${_num}a_${jail_name}" | awk '{print length}')" -lt 16 ]; then
local host_epair=e${_num}a_${jail_name}
local jail_epair=e${_num}b_${jail_name}
else
local host_epair=epair${_num}a
local jail_epair=epair${_num}b
fi
break break
fi fi
done done
else else
local uniq_epair_bridge="0" if [ "$(echo -n "e0a_${jail_name}" | awk '{print length}')" -lt 16 ]; then
local _num=0
local host_epair=e${_num}a_${jail_name}
local jail_epair=e${_num}b_${jail_name}
else
local _num=0
local host_epair=epair${_num}a
local jail_epair=epair${_num}b
fi
fi fi
else else
if [ "${_vnet_if_count}" -gt 0 ]; then if [ "${_bastille_if_count}" -gt 0 ]; then
for _num in $(seq 0 "${vnet_num_range}"); do for _num in $(seq 0 "${bastille_num_range}"); do
if ! grep -Eosq "bastille${_num}" ${bastille_jailsdir}/*/jail.conf; then if ! grep -Eosq "bastille${_num}" ${bastille_jailsdir}/*/jail.conf; then
local uniq_epair="bastille${_num}" local uniq_epair="bastille${_num}"
break break
@@ -253,25 +293,29 @@ generate_vnet_jail_netblock() {
generate_static_mac "${jail_name}" "${external_interface}" generate_static_mac "${jail_name}" "${external_interface}"
cat <<-EOF cat <<-EOF
vnet; vnet;
vnet.interface = epair${uniq_epair_bridge}b; vnet.interface = ${jail_epair};
exec.prestart += "ifconfig epair${uniq_epair_bridge} create"; exec.prestart += "ifconfig epair${_num} create";
exec.prestart += "ifconfig ${external_interface} addm epair${uniq_epair_bridge}a"; exec.prestart += "ifconfig ${external_interface} addm epair${_num}a";
exec.prestart += "ifconfig epair${uniq_epair_bridge}a ether ${macaddr}a"; exec.prestart += "ifconfig epair${_num}a up name ${host_epair}";
exec.prestart += "ifconfig epair${uniq_epair_bridge}b ether ${macaddr}b"; exec.prestart += "ifconfig epair${_num}b up name ${jail_epair}";
exec.prestart += "ifconfig epair${uniq_epair_bridge}a description \"vnet host interface for Bastille jail ${jail_name}\""; exec.prestart += "ifconfig ${host_epair} ether ${macaddr}a";
exec.poststop += "ifconfig ${external_interface} deletem epair${uniq_epair_bridge}a"; exec.prestart += "ifconfig ${jail_epair} ether ${macaddr}b";
exec.poststop += "ifconfig epair${uniq_epair_bridge}a destroy"; exec.prestart += "ifconfig ${host_epair} description \"vnet host interface for Bastille jail ${jail_name}\"";
exec.poststop += "ifconfig ${external_interface} deletem ${host_epair}";
exec.poststop += "ifconfig ${host_epair} destroy";
EOF EOF
else else
## Generate bridged VNET config without static MAC address ## Generate bridged VNET config without static MAC address
cat <<-EOF cat <<-EOF
vnet; vnet;
vnet.interface = epair${uniq_epair_bridge}b; vnet.interface = ${jail_epair};
exec.prestart += "ifconfig epair${uniq_epair_bridge} create"; exec.prestart += "ifconfig epair${_num} create";
exec.prestart += "ifconfig ${external_interface} addm epair${uniq_epair_bridge}a"; exec.prestart += "ifconfig ${external_interface} addm epair${_num}a";
exec.prestart += "ifconfig epair${uniq_epair_bridge}a description \"vnet host interface for Bastille jail ${jail_name}\""; exec.prestart += "ifconfig epair${_num}a up name ${host_epair}";
exec.poststop += "ifconfig ${external_interface} deletem epair${uniq_epair_bridge}a"; exec.prestart += "ifconfig epair${_num}b up name ${jail_epair}";
exec.poststop += "ifconfig epair${uniq_epair_bridge}a destroy"; exec.prestart += "ifconfig ${host_epair} description \"vnet host interface for Bastille jail ${jail_name}\"";
exec.poststop += "ifconfig ${external_interface} deletem ${host_epair}";
exec.poststop += "ifconfig ${host_epair} destroy";
EOF EOF
fi fi
else else
@@ -319,4 +363,4 @@ checkyesno() {
return 1 return 1
;; ;;
esac esac
} }