paramah/ossec-blacklist
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use random name for temp set

Browse Source
This commit is contained in:
Pawel Krawczyk 2014-12-31 17:39:05 +00:00
parent 9a4ceabb01
commit 3aa2bc36b8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
blacklist.sh
View File

@ -62,7 +62,7 @@ for url in $urls; do
sort -u <"${unsorted_blocklist}" | egrep "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >"${sorted_blocklist}" sort -u <"${unsorted_blocklist}" | egrep "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >"${sorted_blocklist}"
# calculate performance parameters for the new set # calculate performance parameters for the new set
tmp_set_name="${set_name}_tmp" tmp_set_name="tmp_${RANDOM}"
new_list_size=$(wc -l "${sorted_blocklist}" | awk '{print $1;}' ) new_list_size=$(wc -l "${sorted_blocklist}" | awk '{print $1;}' )
hash_size=$(expr $new_list_size / 2) hash_size=$(expr $new_list_size / 2)
@ -78,8 +78,11 @@ for url in $urls; do
echo "add ${tmp_set_name} ${line}" >>"${new_set_file}" echo "add ${tmp_set_name} ${line}" >>"${new_set_file}"
done <"$sorted_blocklist" done <"$sorted_blocklist"
echo "swap ${tmp_set_name} ${set_name}" >>"${new_set_file}" # insert new blocklist into the old set # replace old set with the new, temp one - this guarantees an atomic update
echo "destroy ${tmp_set_name}" >>"${new_set_file}" # remove old set echo "swap ${tmp_set_name} ${set_name}" >>"${new_set_file}"
# clear old set (now under temp name)
echo "destroy ${tmp_set_name}" >>"${new_set_file}"
# actually execute the set update # actually execute the set update
ipset -! -q restore < "${new_set_file}" ipset -! -q restore < "${new_set_file}"