commit: 0baf77a9399a23c01de5dccbdbd9b5a39994b9b6 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Tue Feb 13 23:17:29 2024 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Tue Feb 13 23:17:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0baf77a9
net-firewall/ipset: Fix saving rules, thanks to Attila Tóth Closes: https://bugs.gentoo.org/924417 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> net-firewall/ipset/files/ipset.initd-r6 | 105 ++++++++++++++++++++++++++++++++ net-firewall/ipset/ipset-7.20.ebuild | 2 +- 2 files changed, 106 insertions(+), 1 deletion(-) diff --git a/net-firewall/ipset/files/ipset.initd-r6 b/net-firewall/ipset/files/ipset.initd-r6 new file mode 100644 index 000000000000..949bdad76044 --- /dev/null +++ b/net-firewall/ipset/files/ipset.initd-r6 @@ -0,0 +1,105 @@ +#!/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} + +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). + running_ipset_list=$(ipset save | gawk '/^create/{printf "%s ",$2}') + 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 + elif echo "$running_ipset_list" | grep -q -E "${TEMP_SUFFIX}( |$)" ; 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} /" | 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 $? +} diff --git a/net-firewall/ipset/ipset-7.20.ebuild b/net-firewall/ipset/ipset-7.20.ebuild index f1a25f936d47..433d477210f0 100644 --- a/net-firewall/ipset/ipset-7.20.ebuild +++ b/net-firewall/ipset/ipset-7.20.ebuild @@ -102,7 +102,7 @@ src_install() { find "${ED}" -name '*.la' -delete || die - newinitd "${FILESDIR}"/ipset.initd-r5 ${PN} + newinitd "${FILESDIR}"/ipset.initd-r6 ${PN} newconfd "${FILESDIR}"/ipset.confd-r1 ${PN} systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service keepdir /var/lib/ipset
