Merge pull request #161 from JRGTH/master

Workaround  to combine options first, code cleanup/maintenance

usr/local/share/bastille/create.sh

@@ -56,17 +56,17 @@ validate_ip() {
         IP6_MODE="new"
     else
         local IFS
-        if echo "${IP}" | grep -E '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))?$' >/dev/null; then
+        if echo "${IP}" | grep -Eq '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))?$'; then
             TEST_IP=$(echo ${IP} | cut -d / -f1)
             IFS=.
             set ${TEST_IP}
             for quad in 1 2 3 4; do
                 if eval [ \$$quad -gt 255 ]; then
-                    echo "fail (${TEST_IP})"
+                    echo "Invalid: (${TEST_IP})"
                     exit 1
                 fi
             done
-            if ifconfig | grep -w "$TEST_IP" >/dev/null; then
+            if ifconfig | grep -qw "$TEST_IP"; then
                 echo -e "${COLOR_YELLOW}Warning: ip address already in use (${TEST_IP}).${COLOR_RESET}"
             else
                 echo -e "${COLOR_GREEN}Valid: (${IP}).${COLOR_RESET}"
@@ -146,10 +146,13 @@ generate_vnet_jail_conf() {
     ## define uniq_epair
     local list_jails_num=$(bastille list jails | wc -l | awk '{print $1}')
     local num_range=$(expr "${list_jails_num}" + 1)
+    jail_list=$(bastille list jail)
     for _num in $(seq 0 "${num_range}"); do
-        if ! grep "e0b_bastille${_num}" "${bastille_jailsdir}"/*/jail.conf >/dev/null; then
+        if [ -n "${jail_list}" ]; then
-            uniq_epair="bastille${_num}"
+            if ! grep -q "e0b_bastille${_num}" "${bastille_jailsdir}"/*/jail.conf; then
-	    break
+                uniq_epair="bastille${_num}"
+                break
+            fi
         fi
     done
 
@@ -330,26 +333,26 @@ create_jail() {
         /usr/sbin/sysrc -f "${bastille_jail_rc_conf}" sendmail_enable=NONE
         /usr/sbin/sysrc -f "${bastille_jail_rc_conf}" cron_flags='-J 60'
 
-	## VNET specific
+        ## VNET specific
         if [ -n "${VNET_JAIL}" ]; then
             ## rename interface to generic vnet0
             uniq_epair=$(grep vnet.interface ${bastille_jailsdir}/${NAME}/jail.conf | awk '{print $3}' | sed 's/;//')
             /usr/sbin/sysrc -f "${bastille_jail_rc_conf}" "ifconfig_${uniq_epair}_name"=vnet0
 
-	    ## if 0.0.0.0 set DHCP
+            ## if 0.0.0.0 set DHCP
-	    ## else set static address
+            ## else set static address
             if [ "${IP}" == "0.0.0.0" ]; then
                 /usr/sbin/sysrc -f "${bastille_jail_rc_conf}" ifconfig_vnet0="DHCP"
             else
                 /usr/sbin/sysrc -f "${bastille_jail_rc_conf}" ifconfig_vnet0="inet ${IP}"
             fi
 
-	    ## VNET requires jib script
+            ## VNET requires jib script
-	    if [ ! $(command -v jib) ]; then
+            if [ ! $(command -v jib) ]; then
-	        if [ -f /usr/share/examples/jails/jib ] && [ ! -f /usr/local/bin/jib ]; then
+                if [ -f /usr/share/examples/jails/jib ] && [ ! -f /usr/local/bin/jib ]; then
                     install -m 0544 /usr/share/examples/jails/jib /usr/local/bin/jib
-	        fi
+                fi
-	    fi
+            fi
         fi
     fi
 
@@ -374,43 +377,45 @@ if [ $(echo $3 | grep '@' ) ]; then
     BASTILLE_JAIL_INTERFACES=$( echo $3 | awk -F@ '{print $1}')
 fi
 
-TYPE="$1"
+## reset this options
-NAME="$2"
+THICK_JAIL=""
-RELEASE="$3"
+VNET_JAIL=""
-IP="$4"
-INTERFACE="$5"
 
-## handle additional options
+## handle combined options then shift
-case "${TYPE}" in
+if [ "${1}" = "-T" -o "${1}" = "--thick" -o "${1}" = "thick" ] && \
--T|--thick|thick)
+    [ "${2}" = "-V" -o "${2}" = "--vnet" -o "${2}" = "vnet" ]; then
-    if [ $# -gt 5 ] || [ $# -lt 4 ]; then
-        usage
-    fi
     THICK_JAIL="1"
-    break
-    ;;
--V|--vnet|vnet)
-    if [ $# -gt 5 ] || [ $# -lt 4 ]; then
-        usage
-    fi
     VNET_JAIL="1"
-    break
+    shift 2
-    ;;
+else
--*)
+    ## handle single options
-    echo -e "${COLOR_RED}Unknown Option.${COLOR_RESET}"
+    case "${1}" in
+        -T|--thick|thick)
+            shift
+            THICK_JAIL="1"
+            ;;
+        -V|--vnet|vnet)
+            shift
+            VNET_JAIL="1"
+            ;;
+        -*)
+            echo -e "${COLOR_RED}Unknown Option.${COLOR_RESET}"
+            usage
+            ;;
+        *)
+            break
+            ;;
+    esac
+fi
+
+NAME="$1"
+RELEASE="$2"
+IP="$3"
+INTERFACE="$4"
+
+if [ $# -gt 4 ] || [ $# -lt 3 ]; then
     usage
-    ;;
+fi
-*)
-    if [ $# -gt 4 ] || [ $# -lt 3 ]; then
-        usage
-    fi
-    THICK_JAIL=""
-    NAME="$1"
-    RELEASE="$2"
-    IP="$3"
-    INTERFACE="$4"
-    ;;
-esac
 
 ## don't allow for dots(.) in container names
 if [ $(echo "${NAME}" | grep "[.]") ]; then

usr/local/share/bastille/destroy.sh

@@ -152,29 +152,30 @@ help|-h|--help)
     ;;
 esac
 
-OPTION="${1}"
+## reset this options
-TARGET="${2}"
+FORCE=""
 
 ## handle additional options
-case "${OPTION}" in
+case "${1}" in
--f|--force)
+    -f|--force|force)
-    if [ $# -gt 2 ] || [ $# -lt 2 ]; then
+        FORCE="1"
+        shift
+        ;;
+    -*)
+        echo -e "${COLOR_RED}Unknown Option.${COLOR_RESET}"
         usage
-    fi
+        ;;
-    FORCE="1"
+    *)
-    ;;
+        break
--*)
+        ;;
-    echo -e "${COLOR_RED}Unknown Option.${COLOR_RESET}"
-    usage
-    ;;
-*)
-    if [ $# -gt 1 ] || [ $# -lt 1 ]; then
-        usage
-    fi
-    TARGET="${1}"
-    ;;
 esac
 
+TARGET="${1}"
+
+if [ $# -gt 1 ] || [ $# -lt 1 ]; then
+    usage
+fi
+
 ## check what should we clean
 case "${TARGET}" in
 *-RELEASE|*-release|*-RC1|*-rc1|*-RC2|*-rc2)

usr/local/share/bastille/import.sh

@@ -117,9 +117,62 @@ update_fstab() {
     fi
 }
 
+generate_config() {
+    # Attempt to read previous config file and set required variables accordingly
+    # If we can't get a valid interface, fallback to lo1 and warn user
+    JSON_CONFIG="${bastille_jailsdir}/${TARGET_TRIM}/config.json.old"
+    IPV4_CONFIG=$(grep -wo '\"ip4_addr\": \".*\"' ${JSON_CONFIG} | tr -d '" ' | sed 's/ip4_addr://;s/.\{1\}$//')
+    IPV6_CONFIG=$(grep -wo '\"ip6_addr\": \".*\"' ${JSON_CONFIG} | tr -d '" ' | sed 's/ip6_addr://;s/.\{1\}$//')
+
+    if [ -n "${IPV4_CONFIG}" ]; then
+        NETIF_CONFIG=$(echo "${IPV4_CONFIG}" | sed 's/|.*//g')
+        IPX_ADDR="ip4.addr"
+        IP_CONFIG="${IPV4_CONFIG}"
+        IP6_MODE="disable"
+    elif [ -n "${IPV6_CONFIG}" ]; then
+        NETIF_CONFIG=$(echo "${IPV6_CONFIG}" | sed 's/|.*//g')
+        IPX_ADDR="ip6.addr"
+        IP_CONFIG="${IPV6_CONFIG}"
+        IP6_MODE="new"
+    fi
+
+    # Let the user configure it manually
+    if [ -z "${NETIF_CONFIG}" ]; then
+        NETIF_CONFIG="lo1"
+        IPX_ADDR="ip4.addr"
+        IP_CONFIG="-"
+        IP6_MODE="disable"
+        echo -e "${COLOR_YELLOW}Warning: See 'bastille edit ${TARGET_TRIM} jail.conf' for manual configuration${COLOR_RESET}"
+    fi
+
+    # Generate new empty fstab file
+    touch ${bastille_jailsdir}/${TARGET_TRIM}/fstab
+
+    # Generate a basic jail configuration file on foreign imports
+    cat << EOF > ${bastille_jailsdir}/${TARGET_TRIM}/jail.conf
+${TARGET_TRIM} {
+  devfs_ruleset = 4;
+  enforce_statfs = 2;
+  exec.clean;
+  exec.consolelog = ${bastille_logsdir}/${TARGET_TRIM}_console.log;
+  exec.start = '/bin/sh /etc/rc';
+  exec.stop = '/bin/sh /etc/rc.shutdown';
+  host.hostname = ${TARGET_TRIM};
+  mount.devfs;
+  mount.fstab = ${bastille_jailsdir}/${TARGET_TRIM}/fstab;
+  path = ${bastille_jailsdir}/${TARGET_TRIM}/root;
+  securelevel = 2;
+
+  interface = ${NETIF_CONFIG};
+  ${IPX_ADDR} = ${IP_CONFIG};
+  ip6 = ${IP6_MODE};
+}
+EOF
+}
+
 jail_import() {
     # Attempt to import container from file
-    FILE_TRIM=$(echo ${TARGET} | sed 's/.[txz]\{2,3\}//')
+    FILE_TRIM=$(echo ${TARGET} | sed 's/.[txz]\{2,3\}//g;s/.zip//g')
     FILE_EXT=$(echo ${TARGET} | cut -d '.' -f2)
     validate_archive
     if [ -d "${bastille_jailsdir}" ]; then
@@ -152,14 +205,51 @@ jail_import() {
                         zfs destroy -r ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${TARGET_TRIM}
                         error_notify "${COLOR_RED}Failed to extract files from '${TARGET}' archive.${COLOR_RESET}"
                     fi
+                elif [ "${FILE_EXT}" = "zip" ]; then
+                    # Attempt to import a foreign container
+                    echo -e "${COLOR_GREEN}Importing '${TARGET_TRIM}' from foreign compressed .${FILE_EXT} archive.${COLOR_RESET}"
+                    # Sane bastille zfs options
+                    ZFS_OPTIONS=$(echo ${bastille_zfs_options} | sed 's/-o//g')
+
+                    # Extract required files from the zip archive
+                    cd ${bastille_backupsdir} && unzip -j ${TARGET}
+                    if [ $? -ne 0 ]; then
+                        error_notify "${COLOR_RED}Failed to extract files from '${TARGET}' archive.${COLOR_RESET}"
+                        rm -f ${FILE_TRIM} ${FILE_TRIM}_root
+                    fi
+                    echo -e "${COLOR_GREEN}Receiving zfs data stream...${COLOR_RESET}"
+                    zfs receive ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${TARGET_TRIM} < ${FILE_TRIM}
+                    zfs set ${ZFS_OPTIONS} ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${TARGET_TRIM}
+                    zfs receive ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${TARGET_TRIM}/root < ${FILE_TRIM}_root
+
+                    # Update ZFS mountpoint property if required
+                    update_zfsmount
+
+                    # Keep old configuration files for user reference
+                    if [ -f "${bastille_jailsdir}/${TARGET_TRIM}/config.json" ]; then
+                        mv ${bastille_jailsdir}/${TARGET_TRIM}/config.json ${bastille_jailsdir}/${TARGET_TRIM}/config.json.old
+                    fi
+                    if [ -f "${bastille_jailsdir}/${TARGET_TRIM}/fstab" ]; then
+                        mv ${bastille_jailsdir}/${TARGET_TRIM}/fstab ${bastille_jailsdir}/${TARGET_TRIM}/fstab.old
+                    fi
+
+                    # Cleanup unwanted files
+                    rm -f ${FILE_TRIM} ${FILE_TRIM}_root
+
+                    # Generate fstab and jail.conf files
+                    generate_config
                 else
                     error_notify "${COLOR_RED}Unknown archive format.${COLOR_RESET}"
                 fi
             fi
         else
             # Import from standard tar.xz archive on UFS systems
-            echo -e "${COLOR_GREEN}Extracting files from '${TARGET}' archive...${COLOR_RESET}"
+            if [ "${FILE_EXT}" = "txz" ]; then
-            tar -Jxf  ${bastille_backupsdir}/${TARGET} -C ${bastille_jailsdir}
+                echo -e "${COLOR_GREEN}Extracting files from '${TARGET}' archive...${COLOR_RESET}"
+                tar -Jxf  ${bastille_backupsdir}/${TARGET} -C ${bastille_jailsdir}
+            else
+                error_notify "${COLOR_RED}Unsupported archive format.${COLOR_RESET}"
+            fi
         fi
 
         if [ $? -ne 0 ]; then
@@ -184,7 +274,7 @@ fi
 
 # Check if archive exist then trim archive name
 if [ "$(ls "${bastille_backupsdir}" | awk "/^${TARGET}$/")" ]; then
-    TARGET_TRIM=$(echo ${TARGET} | sed "s/_[0-9]*-[0-9]*-[0-9]*-[0-9]*:[0-9]*:[0-9]*.[txz]\{2,3\}//")
+    TARGET_TRIM=$(echo ${TARGET} | sed "s/_[0-9]*-[0-9]*-[0-9]*-[0-9]*:[0-9]*:[0-9]*.[txz]\{2,3\}//g;s/_[0-9]*-[0-9]*-[0-9]*.zip//g")
 else
     error_notify "${COLOR_RED}Archive '${TARGET}' not found.${COLOR_RESET}"
 fi

usr/local/share/bastille/rename.sh

@@ -74,13 +74,15 @@ update_jailconf() {
 update_fstab() {
     # Update fstab to use the new name
     FSTAB_CONFIG="${bastille_jailsdir}/${NEWNAME}/fstab"
-    FSTAB_RELEASE=$(grep -owE '([1-9]{2,2})\.[0-9](-RELEASE|-RC[1-2])|([0-9]{1,2}-stable-build-[0-9]{1,3})|(current-build)-([0-9]{1,3})|(current-BUILD-LATEST)|([0-9]{1,2}-stable-BUILD-LATEST)|(current-BUILD-LATEST)' ${FSTAB_CONFIG})
+    if [ -f "${FSTAB_CONFIG}" ]; then
-    FSTAB_CURRENT=$(grep -w ".*/releases/.*/jails/${TARGET}/root/.bastille" ${FSTAB_CONFIG})
+        FSTAB_RELEASE=$(grep -owE '([1-9]{2,2})\.[0-9](-RELEASE|-RC[1-2])|([0-9]{1,2}-stable-build-[0-9]{1,3})|(current-build)-([0-9]{1,3})|(current-BUILD-LATEST)|([0-9]{1,2}-stable-BUILD-LATEST)|(current-BUILD-LATEST)' ${FSTAB_CONFIG})
-    FSTAB_NEWCONF="${bastille_releasesdir}/${FSTAB_RELEASE} ${bastille_jailsdir}/${NEWNAME}/root/.bastille nullfs ro 0 0"
+        FSTAB_CURRENT=$(grep -w ".*/releases/.*/jails/${TARGET}/root/.bastille" ${FSTAB_CONFIG})
-    if [ -n "${FSTAB_CURRENT}" ] && [ -n "${FSTAB_NEWCONF}" ]; then
+        FSTAB_NEWCONF="${bastille_releasesdir}/${FSTAB_RELEASE} ${bastille_jailsdir}/${NEWNAME}/root/.bastille nullfs ro 0 0"
-        # If both variables are set, update as needed
+        if [ -n "${FSTAB_CURRENT}" ] && [ -n "${FSTAB_NEWCONF}" ]; then
-        if ! grep -qw "${bastille_releasesdir}/${FSTAB_RELEASE}.*${bastille_jailsdir}/${NEWNAME}/root/.bastille" ${FSTAB_CONFIG}; then
+            # If both variables are set, update as needed
-            sed -i '' "s|${FSTAB_CURRENT}|${FSTAB_NEWCONF}|" ${FSTAB_CONFIG}
+            if ! grep -qw "${bastille_releasesdir}/${FSTAB_RELEASE}.*${bastille_jailsdir}/${NEWNAME}/root/.bastille" ${FSTAB_CONFIG}; then
+                sed -i '' "s|${FSTAB_CURRENT}|${FSTAB_NEWCONF}|" ${FSTAB_CONFIG}
+            fi
         fi
     fi
 }