Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install nftables and move the default conifuration in ebtables.filter.cfg to nftables.conf. #21344

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −18
Open

Install nftables and move the default conifuration in ebtables.filter.cfg to nftables.conf. #21344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
wireless-regdb \
ethtool \
zstd \
nvme-cli
nvme-cli \
nftables

# Have systemd create the auditd log directory
sudo mkdir -p ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d
Expand Down Expand Up @@ -650,8 +651,8 @@ if [ "${enable_organization_extensions}" = "y" ]; then
fi
fi

## Setup ebtable rules (rule file in text format)
sudo cp files/image_config/ebtables/ebtables.filter.cfg ${FILESYSTEM_ROOT}/etc
## Setup nftables rules
sudo cp files/image_config/nftables/nftables.conf ${FILESYSTEM_ROOT}/etc

## Debug Image specific changes
## Update motd for debug image
Expand Down
4 changes: 3 additions & 1 deletion dockers/docker-orchagent/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ RUN apt-get update && \
pciutils \
# Needed for installing netifaces Python package
build-essential \
python3-dev
python3-dev \
libnftables1=0.9.8-3.1+deb11u2 \
nftables=0.9.8-3.1+deb11u2

{% if ( CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" ) %}
# Fix for gcc/python/iputils-ping not found in arm docker
Expand Down
16 changes: 2 additions & 14 deletions files/build_templates/docker_image_ctl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,6 @@ function updateSyslogConf()
rm -rf $TMP_FILE
fi
}
function ebtables_config()
{
if [[ "$DEV" && $DATABASE_TYPE != "dpudb" ]]; then
# Install ebtables filter in namespaces on multi-asic.
ip netns exec $NET_NS ebtables-restore < /etc/ebtables.filter.cfg
else
if [[ ! ($NUM_ASIC -gt 1) ]]; then
# Install ebtables filter in host for single asic.
ebtables-restore < /etc/ebtables.filter.cfg
fi
fi
}

function getMountPoint()
{
Expand Down Expand Up @@ -214,9 +202,9 @@ function postStartAction()
fi
fi
fi
# Setup ebtables configuration
# Setup nftables configuration
{%- if sonic_asic_platform != "vs" %}
ebtables_config
nft -f /etc/nftables.conf
{%- endif %}
# chassisdb starts before database starts, bypass the PING check since other
# databases are not availbale until database container is ready.
Expand Down
17 changes: 17 additions & 0 deletions files/image_config/nftables/nftables.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
table bridge filter {
chain INPUT {
type filter hook input priority filter; policy accept;
}

chain FORWARD {
type filter hook forward priority filter; policy accept;
ether daddr 01:80:c2:00:00:00 counter packets 0 bytes 0 drop
ether type arp counter packets 0 bytes 0 drop
ether type vlan vlan type 0x0806 counter packets 0 bytes 0 drop
ether daddr & 01:00:00:00:00:00 == 01:00:00:00:00:00 counter packets 0 bytes 0 drop
}

chain OUTPUT {
type filter hook output priority filter; policy accept;
}
}
Loading