mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-firewall/ipset: enforce safe chars in set names & suffix
Signed-off-by: Hank Leininger <hlein@korelogic.com> Closes: https://bugs.gentoo.org/927918 Closes: https://github.com/gentoo/gentoo/pull/35939 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Hank Leininger
committed by
Sam James
Sam James
parent
39738087f6
commit
efef1aaf36
127
net-firewall/ipset/files/ipset.initd-r7
Normal file
127
net-firewall/ipset/files/ipset.initd-r7
Normal file
@@ -0,0 +1,127 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
extra_commands="save"
|
||||
extra_started_commands="reload"
|
||||
|
||||
IPSET_SAVE=${IPSET_SAVE:-/var/lib/ipset/rules-save}
|
||||
ipset_name_regex='^[-_.a-zA-Z0-9]+$'
|
||||
|
||||
depend() {
|
||||
before iptables ip6tables
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
if [ ! -f "${IPSET_SAVE}" ] ; then
|
||||
eerror "Not starting ${SVCNAME}. First create some rules then run:"
|
||||
eerror "/etc/init.d/${SVCNAME} save"
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
start() {
|
||||
checkconfig || return 1
|
||||
ebegin "Loading ipset session"
|
||||
ipset restore < "${IPSET_SAVE}"
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
# check if there are any references to current sets
|
||||
|
||||
if ! ipset list | gawk '
|
||||
($1 == "References:") { refcnt += $2 }
|
||||
($1 == "Type:" && $2 == "list:set") { set = 1 }
|
||||
(scan) { if ($0 != "") setcnt++; else { scan = 0; set = 0 } }
|
||||
(set && $1 == "Members:") {scan = 1}
|
||||
END { if ((refcnt - setcnt) > 0) exit 1 }
|
||||
'; then
|
||||
eerror "ipset is in use, can't stop"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ "${SAVE_ON_STOP}" = "yes" ] ; then
|
||||
save || return 1
|
||||
fi
|
||||
|
||||
ebegin "Removing kernel IP sets"
|
||||
ipset flush
|
||||
ipset destroy
|
||||
eend $?
|
||||
}
|
||||
|
||||
reload() {
|
||||
ebegin "Reloading ipsets"
|
||||
|
||||
# Loading sets from a save file is only additive (there is no
|
||||
# automatic flushing or replacing). And, we can not remove sets
|
||||
# that are currently used in existing iptables rules.
|
||||
#
|
||||
# Instead, we create new temp sets for any set that is already
|
||||
# in use, and then atomically swap them into place.
|
||||
#
|
||||
# XXX: This does not clean out previously used ipsets that are
|
||||
# not in the new saved policy--it can't, because they may still
|
||||
# be referenced in the current iptables rules.
|
||||
|
||||
# Build a list of all currently used sets (if any);
|
||||
# also make sure all sets' names are fully supported.
|
||||
IFS_O=$IFS
|
||||
NEWLINE='
|
||||
'
|
||||
local IFS=$NEWLINE
|
||||
for running_ipset in $(ipset -n list) ; do
|
||||
if ! echo "${running_ipset}" | grep -q -E "${ipset_name_regex}" ; then
|
||||
eend 1 "Running set name ('$running_ipset') does not match regex '${ipset_name_regex}'"
|
||||
return 1
|
||||
fi
|
||||
running_ipset_list="$running_ipset_list $running_ipset"
|
||||
done
|
||||
IFS=$IFS_O
|
||||
running_ipset_list="${running_ipset_list# }"
|
||||
|
||||
# Check the configured suffix, and make sure there are no collisions
|
||||
if test -z "${TEMP_SUFFIX}" ; then
|
||||
eend 1 "TEMP_SUFFIX cannot be empty"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Make sure TEMP_SUFFIX uses only known-safe characters.
|
||||
if ! echo "${TEMP_SUFFIX}" | grep -q -E "${ipset_name_regex}" ; then
|
||||
eend 1 "TEMP_SUFFIX pattern ('$TEMP_SUFFIX') does not match regex '${ipset_name_regex}'"
|
||||
return 1
|
||||
fi
|
||||
# We don't block ., but it must be escaped.
|
||||
temp_suffix_regex=$(echo "${TEMP_SUFFIX}" | sed 's/\./\\./g')
|
||||
|
||||
if echo "$running_ipset_list" | grep -q -E "${temp_suffix_regex}( |$)" ; then
|
||||
eend 1 "Existing set(s) match TEMP_SUFFIX pattern ('${TEMP_SUFFIX}'), cannot continue"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Build a regular expression that matches those set names.
|
||||
running_ipset_list_regex="$(echo "$running_ipset_list" | tr -s ' ' '|' )"
|
||||
|
||||
# Load up sets from the save file, but rename any set that already
|
||||
# exists to a temporary name that we will swap later.
|
||||
if ! cat ${IPSET_SAVE} | sed -r "s/^(create|add) (${running_ipset_list_regex}) /\1 \2${temp_suffix_regex} /" | ipset restore ; then
|
||||
eend $? "Failed to load new ipsets"
|
||||
fi
|
||||
|
||||
# Now for every set name that currently exists, atomically swap it
|
||||
# with the temporary new one we created, and then destroy the old set.
|
||||
for ipset_name in ${running_ipset_list} ; do
|
||||
ipset swap "${ipset_name}" "${ipset_name}${TEMP_SUFFIX}" || eend $? "Failed to swap in new ipset $ipset_name"
|
||||
ipset destroy "${ipset_name}${TEMP_SUFFIX}" || eend $? "Failed to delete obsolete ipset ${ipset_name}${TEMP_SUFFIX}"
|
||||
done
|
||||
eend 0
|
||||
}
|
||||
|
||||
save() {
|
||||
ebegin "Saving ipset session"
|
||||
checkpath --file --mode 0600 "${IPSET_SAVE}"
|
||||
ipset -output save list > "${IPSET_SAVE}"
|
||||
eend $?
|
||||
}
|
||||
116
net-firewall/ipset/ipset-7.21-r1.ebuild
Normal file
116
net-firewall/ipset/ipset-7.21-r1.ebuild
Normal file
@@ -0,0 +1,116 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
MODULES_OPTIONAL_IUSE=modules
|
||||
inherit autotools bash-completion-r1 linux-mod-r1 systemd
|
||||
|
||||
DESCRIPTION="IPset tool for iptables, successor to ippool"
|
||||
HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/"
|
||||
SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
|
||||
|
||||
RDEPEND="
|
||||
net-firewall/iptables
|
||||
net-libs/libmnl:=
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-bash-completion.patch" )
|
||||
|
||||
DOCS=( ChangeLog INSTALL README UPGRADE )
|
||||
|
||||
# configurable from outside, e.g. /etc/portage/make.conf
|
||||
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
get_version
|
||||
CONFIG_CHECK="NETFILTER"
|
||||
ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
|
||||
CONFIG_CHECK+=" NETFILTER_NETLINK"
|
||||
ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK support in your kernel."
|
||||
# It does still build without NET_NS, but it may be needed in future.
|
||||
#CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
|
||||
#ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
|
||||
CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
|
||||
ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
|
||||
|
||||
build_modules=0
|
||||
if use modules; then
|
||||
if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
|
||||
if linux_chkconfig_present "IP_NF_SET" || \
|
||||
linux_chkconfig_present "IP_SET"; then #274577
|
||||
eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
|
||||
eerror "Please either build ipset with modules USE flag disabled"
|
||||
eerror "or rebuild kernel without IP_SET support and make sure"
|
||||
eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
|
||||
die "USE=modules and in-kernel ipset support detected."
|
||||
else
|
||||
einfo "Modular kernel detected. Gonna build kernel modules..."
|
||||
build_modules=1
|
||||
fi
|
||||
else
|
||||
eerror "Nonmodular kernel detected, but USE=modules. Either build"
|
||||
eerror "modular kernel (without IP_SET) or disable USE=modules"
|
||||
die "Nonmodular kernel detected, will not build kernel modules"
|
||||
fi
|
||||
fi
|
||||
|
||||
[[ ${build_modules} -eq 1 ]] && linux-mod-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export bashcompdir="$(get_bashcompdir)"
|
||||
|
||||
econf \
|
||||
--enable-bashcompl \
|
||||
$(use_with modules kmod) \
|
||||
--with-maxsets=${IP_NF_SET_MAX} \
|
||||
--with-ksource="${KV_DIR}" \
|
||||
--with-kbuild="${KV_OUT_DIR}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
einfo "Building userspace"
|
||||
|
||||
local modlist=( xt_set=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/:
|
||||
em_ipset=kernel/net/sched:"${S}":kernel/net/sched/:modules )
|
||||
|
||||
for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set}; do
|
||||
modlist+=( ${i}=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/ipset )
|
||||
done
|
||||
|
||||
emake
|
||||
|
||||
if [[ ${build_modules} -eq 1 ]]; then
|
||||
einfo "Building kernel modules"
|
||||
linux-mod-r1_src_compile
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
einfo "Installing userspace"
|
||||
default
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
|
||||
newinitd "${FILESDIR}"/ipset.initd-r7 ${PN}
|
||||
newconfd "${FILESDIR}"/ipset.confd-r1 ${PN}
|
||||
systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service
|
||||
keepdir /var/lib/ipset
|
||||
|
||||
if [[ ${build_modules} -eq 1 ]]; then
|
||||
einfo "Installing kernel modules"
|
||||
linux-mod-r1_src_install
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user