-
Notifications
You must be signed in to change notification settings - Fork 145
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #119 from paulc/master
Add support for dynamic redirection of host/container ports
- Loading branch information
Showing
5 changed files
with
224 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| === | ||
| rdr | ||
| === | ||
|
|
||
| `bastille rdr` allows you to configure dynamic rdr rules for your containers | ||
| without modifying pf.conf (assuming you are using the `bastille0` interface | ||
| for a private network and have enabled `rdr-anchor 'rdr/*'` in /etc/pf.conf | ||
| as described in the Networking section). | ||
|
|
||
| Note: you need to be careful if host services are configured to run | ||
| on all interfaces as this will include the jail interface - you should | ||
| sepcify the interface they run on in rc.conf (or other config files) | ||
|
|
||
| .. code-block:: shell | ||
| # bastille rdr --help | ||
| Usage: bastille rdr TARGET [clear] | [list] | [tcp <host_port> <jail_port>] | [udp <host_port> <jail_port>] | ||
| # bastille rdr dev1 tcp 2001 22 | ||
| # bastille rdr dev1 list | ||
| rdr on em0 inet proto tcp from any to any port = 2001 -> 10.17.89.1 port 22 | ||
| # bastille rdr dev1 udp 2053 53 | ||
| # bastille rdr dev1 list | ||
| rdr on em0 inet proto tcp from any to any port = 2001 -> 10.17.89.1 port 22 | ||
| rdr on em0 inet proto udp from any to any port = 2053 -> 10.17.89.1 port 53 | ||
| # bastille rdr dev1 clear | ||
| nat cleared | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| #!/bin/sh | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without | ||
| # modification, are permitted provided that the following conditions are met: | ||
| # | ||
| # * Redistributions of source code must retain the above copyright notice, this | ||
| # list of conditions and the following disclaimer. | ||
| # | ||
| # * Redistributions in binary form must reproduce the above copyright notice, | ||
| # this list of conditions and the following disclaimer in the documentation | ||
| # and/or other materials provided with the distribution. | ||
| # | ||
| # * Neither the name of the copyright holder nor the names of its | ||
| # contributors may be used to endorse or promote products derived from | ||
| # this software without specific prior written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
| # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
| # 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. | ||
|
|
||
| . /usr/local/share/bastille/colors.pre.sh | ||
| . /usr/local/etc/bastille/bastille.conf | ||
|
|
||
| usage() { | ||
| echo -e "${COLOR_RED}Usage: bastille rdr TARGET [clear] | [list] | [tcp <host_port> <jail_port>] | [udp <host_port> <jail_port>]${COLOR_RESET}" | ||
| exit 1 | ||
| } | ||
|
|
||
| # Handle special-case commands first. | ||
| case "$1" in | ||
| help|-h|--help) | ||
| usage | ||
| ;; | ||
| esac | ||
|
|
||
| if [ $# -lt 2 ]; then | ||
| usage | ||
| fi | ||
|
|
||
| TARGET="${1}" | ||
| shift | ||
|
|
||
| # Can only redirect to single jail | ||
| if [ "${TARGET}" = 'ALL' ]; then | ||
| echo -e "${COLOR_RED}Can only redirect to single jail${COLOR_RESET}" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Check jail name valid | ||
| JAIL_NAME=$(jls -j "${TARGET}" name 2>/dev/null) | ||
| if [ -z "${JAIL_NAME}" ]; then | ||
| echo -e "${COLOR_RED}Jail not found: ${TARGET}${COLOR_RESET}" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Check jail ip4 address valid | ||
| JAIL_IP=$(jls -j "${TARGET}" ip4.addr 2>/dev/null) | ||
| if [ -z "${JAIL_IP}" -o "${JAIL_IP}" = "-" ]; then | ||
| echo -e "${COLOR_RED}Jail IP not found: ${TARGET}${COLOR_RESET}" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Check rdr-anchor is setup in pf.conf | ||
| if !(pfctl -sn | grep rdr-anchor | grep 'rdr/\*' >/dev/null); then | ||
| echo -e "${COLOR_RED}rdr-anchor not found in pf.conf${COLOR_RESET}" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Check ext_if is setup in pf.conf | ||
| EXT_IF=$(grep '^[[:space:]]*ext_if[[:space:]]*=' /etc/pf.conf) | ||
| if [ -z "${JAIL_NAME}" ]; then | ||
| echo -e "${COLOR_RED}ext_if not defined in pf.conf${COLOR_RESET}" | ||
| exit 1 | ||
| fi | ||
|
|
||
| while [ $# -gt 0 ]; do | ||
| case "$1" in | ||
| list) | ||
| pfctl -a "rdr/${JAIL_NAME}" -Psn 2>/dev/null | ||
| shift | ||
| ;; | ||
| clear) | ||
| pfctl -a "rdr/${JAIL_NAME}" -Fn | ||
| shift | ||
| ;; | ||
| tcp) | ||
| if [ $# -lt 3 ]; then | ||
| usage | ||
| fi | ||
| ( pfctl -a "rdr/${JAIL_NAME}" -Psn; | ||
| printf '%s\nrdr on $ext_if inet proto tcp to port %d -> %s port %d\n' "$EXT_IF" "$2" "$JAIL_IP" "$3" ) \ | ||
| | pfctl -a "rdr/${JAIL_NAME}" -f- | ||
| shift 3 | ||
| ;; | ||
| udp) | ||
| if [ $# -lt 3 ]; then | ||
| usage | ||
| fi | ||
| ( pfctl -a "rdr/${JAIL_NAME}" -Psn; | ||
| printf '%s\nrdr on $ext_if inet proto udp to port %d -> %s port %d\n' "$EXT_IF" "$2" "$JAIL_IP" "$3" ) \ | ||
| | pfctl -a "rdr/${JAIL_NAME}" -f- | ||
| shift 3 | ||
| ;; | ||
| *) | ||
| usage | ||
| ;; | ||
| esac | ||
| done | ||
|
|
||
|
|
||
|
|