From fbbce3c0fafe0218bd4774b0203eda9006d7aa4d Mon Sep 17 00:00:00 2001 From: Onder Vincent Koc Date: Mon, 9 Jun 2014 11:55:36 +0100 Subject: [PATCH 01/74] Initial commit --- LICENSE | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 4 + 2 files changed, 343 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..22fbe5db --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {description} + Copyright (C) {year} {fullname} + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + {signature of Ty Coon}, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 00000000..0ccf808c --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +dshield_automatic_iptables +========================== + +Auto Import dshield blocklist and import to iptables as a chain From 93be8d9f6743f3da847554eb2b067e1340c60a6e Mon Sep 17 00:00:00 2001 From: Onder Vincent Koc Date: Mon, 9 Jun 2014 12:03:27 +0100 Subject: [PATCH 02/74] Create dshield_auto.sh --- dshield_auto.sh | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 dshield_auto.sh diff --git a/dshield_auto.sh b/dshield_auto.sh new file mode 100644 index 00000000..a96d3fd5 --- /dev/null +++ b/dshield_auto.sh @@ -0,0 +1,67 @@ +#!/bin/bash +# Written by Onder Vincent Koc +# @url: https://github.com/koconder/dshield_automatic_iptables +# @credits: http://wiki.brokenpoet.org/wiki/Get_DShield_Blocklist +# +# Dshield Automatic Import to iptables +# Import Dshield Blocklist in a basic shell script which will run silently via cron +# and also use a seprate chain file to support other iptables rules without flushing +# i.e. fail2ban and ddosdeflate + +# path to iptables +IPTABLES="/sbin/iptables"; + +# list of known spammers +URL="http://feeds.dshield.org/block.txt"; + +# save local copy here +FILE="/tmp/dshield_block.text"; + +# iptables custom chain +CHAIN="dshield"; + +# check to see if the chain already exists +$IPTABLES -L $CHAIN -n + +# check to see if the chain already exists +if [ $? -eq 0 ]; then + + # flush the old rules + $IPTABLES -F $CHAIN + + echo "Flushed old rules. Applying updated dsheild list...." + +else + + # create a new chain set + $IPTABLES -N $CHAIN + + # tie chain to input rules so it runs + $IPTABLES -A INPUT -j $CHAIN + + # don't allow this traffic through + $IPTABLES -A FORWARD -j $CHAIN + + echo "Chain not detected. Creating new chain and adding dsheild list...." + +fi; + +# get a copy of the spam list +wget -qc $URL -O $FILE + +blocklist=$( cat $FILE | awk '/^[0-9]/' | awk '{print $1"/"$3}'| sort -n) +for IP in $blocklist +do + # add the ip address log rule to the chain + $IPTABLES -A $CHAIN -p 0 -s $IP -j LOG --log-prefix "[dsheild BLOCK]" -m limit --limit 3/min --limit-burst 10 + + # add the ip address to the chain + $IPTABLES -A $CHAIN -p 0 -s $IP -j DROP + + echo $IP +done + +echo "Done!" + +# remove the spam list +unlink $FILE From 5dd3f713439c4d6c0a916b7cc893b908af18db0f Mon Sep 17 00:00:00 2001 From: jordanrinke Date: Fri, 13 Jun 2014 12:41:04 -0700 Subject: [PATCH 03/74] Initial commit --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..09b0e392 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +ipsets-persistent +================= + +init.d script for iptables-persistent on Debian/Ubuntu that also saves/loads ipsets From 3560bfedb7b432b841046ca43a0db921d7993210 Mon Sep 17 00:00:00 2001 From: jordanrinke Date: Fri, 13 Jun 2014 12:51:41 -0700 Subject: [PATCH 04/74] add ipset save/load/flush added checking for and saving ipsets. sets are saved in the same place as the other rules in a file named rules.ipset. Rules are only saved if they are defined, same with flushing and loading. Instead of checking to see if ipset is installed on the load, I just check for the rules.ipset file, since if that doesn't exist loading doesn't make sense. --- iptables-persistent | 182 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) create mode 100644 iptables-persistent diff --git a/iptables-persistent b/iptables-persistent new file mode 100644 index 00000000..01ca1d2d --- /dev/null +++ b/iptables-persistent @@ -0,0 +1,182 @@ +#!/bin/sh +# Written by Simon Richter +# modified by Jonathan Wiltshire +# with help from Christoph Anton Mitterer +# and again by Jordan Rinke +# + +### BEGIN INIT INFO +# Provides: iptables-persistent +# Required-Start: mountkernfs $local_fs +# Required-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# X-Start-Before: $network +# X-Stop-After: $network +# Short-Description: Set up iptables rules +# Description: Loads/saves current iptables rules from/to /etc/iptables +# to provide a persistent rule set during boot time +### END INIT INFO + +. /lib/lsb/init-functions + +rc=0 + +load_rules() +{ + log_action_begin_msg "Loading iptables rules" + + #load IPsets + if [ ! -f /etc/iptables/rules.ipsets ]; then + log_action_cont_msg " skipping IPsets (no rules to load)" + else + log_action_cont_msg " IPset" + ipset restore -! < /etc/iptables/rules.ipsets 2> /dev/null + if [ $? -ne 0 ]; then + rc=1 + fi + fi + + #load IPv4 rules + if [ ! -f /etc/iptables/rules.v4 ]; then + log_action_cont_msg " skipping IPv4 (no rules to load)" + else + log_action_cont_msg " IPv4" + iptables-restore < /etc/iptables/rules.v4 2> /dev/null + if [ $? -ne 0 ]; then + rc=1 + fi + fi + + #load IPv6 rules + if [ ! -f /etc/iptables/rules.v6 ]; then + log_action_cont_msg " skipping IPv6 (no rules to load)" + else + log_action_cont_msg " IPv6" + ip6tables-restore < /etc/iptables/rules.v6 2> /dev/null + if [ $? -ne 0 ]; then + rc=1 + fi + fi + + log_action_end_msg $rc +} + +save_rules() +{ + log_action_begin_msg "Saving rules" + + #save IPsets + #need at least iptable_filter loaded: + if ! ipset list | grep -i "name">/dev/null 2>&1; then + log_action_cont_msg " skipping IPset - no sets defined or not loaded" + elif [ -x /usr/sbin/ipset ] || [ -x /sbin/ipset ]; then + log_action_cont_msg " IPset" + ipset save > /etc/iptables/rules.ipsets + if [ $? -ne 0 ]; then + rc=1 + fi + fi + + #save IPv4 rules + #need at least iptable_filter loaded: + /sbin/modprobe -q iptable_filter + if [ ! -f /proc/net/ip_tables_names ]; then + log_action_cont_msg " skipping IPv4 (no modules loaded)" + elif [ -x /sbin/iptables-save ]; then + log_action_cont_msg " IPv4" + iptables-save > /etc/iptables/rules.v4 + if [ $? -ne 0 ]; then + rc=1 + fi + fi + + #save IPv6 rules + #need at least ip6table_filter loaded: + /sbin/modprobe -q ip6table_filter + if [ ! -f /proc/net/ip6_tables_names ]; then + log_action_cont_msg " skipping IPv6 (no modules loaded)" + elif [ -x /sbin/ip6tables-save ]; then + log_action_cont_msg " IPv6" + ip6tables-save > /etc/iptables/rules.v6 + if [ $? -ne 0 ]; then + rc=1 + fi + fi + + log_action_end_msg $rc +} + +flush_rules() +{ + log_action_begin_msg "Flushing rules" + + if ! ipset list | grep -i "name">/dev/null 2>&1; then + log_action_cont_msg " skipping IPset (no sets defined or not installed)" + elif [ -x /usr/sbin/ipset ] || [ -x /sbin/ipset ]; then + log_action_cont_msg " IPset" + ipset flush + fi + + + + if [ ! -f /proc/net/ip_tables_names ]; then + log_action_cont_msg " skipping IPv4 (no module loaded)" + elif [ -x /sbin/iptables ]; then + log_action_cont_msg " IPv4" + for param in F Z X; do /sbin/iptables -$param; done + for table in $(cat /proc/net/ip_tables_names) + do + /sbin/iptables -t $table -F + /sbin/iptables -t $table -Z + /sbin/iptables -t $table -X + done + for chain in INPUT FORWARD OUTPUT + do + /sbin/iptables -P $chain ACCEPT + done + fi + + if [ ! -f /proc/net/ip6_tables_names ]; then + log_action_cont_msg " skipping IPv6 (no module loaded)" + elif [ -x /sbin/ip6tables ]; then + log_action_cont_msg " IPv6" + for param in F Z X; do /sbin/ip6tables -$param; done + for table in $(cat /proc/net/ip6_tables_names) + do + /sbin/ip6tables -t $table -F + /sbin/ip6tables -t $table -Z + /sbin/ip6tables -t $table -X + done + for chain in INPUT FORWARD OUTPUT + do + /sbin/ip6tables -P $chain ACCEPT + done + fi + + log_action_end_msg 0 +} + +case "$1" in +start|restart|reload|force-reload) + load_rules + ;; +save) + save_rules + ;; +stop) + # Why? because if stop is used, the firewall gets flushed for a variable + # amount of time during package upgrades, leaving the machine vulnerable + # It's also not always desirable to flush during purge + echo "Automatic flushing disabled, use \"flush\" instead of \"stop\"" + ;; +flush) + flush_rules + ;; +*) + echo "Usage: $0 {start|restart|reload|force-reload|save|flush}" >&2 + exit 1 + ;; +esac + +exit $rc From 1ca7c0c6e18e788ecb335bf947e333c451bc892c Mon Sep 17 00:00:00 2001 From: jordanrinke Date: Fri, 13 Jun 2014 12:52:21 -0700 Subject: [PATCH 05/74] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 09b0e392..f6b16482 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,6 @@ ipsets-persistent ================= init.d script for iptables-persistent on Debian/Ubuntu that also saves/loads ipsets + + +I added checking for and saving ipsets. sets are saved in the same place as the other rules in a file named rules.ipset. Rules are only saved if they are defined, same with flushing and loading. Instead of checking to see if ipset is installed on the load, I just check for the rules.ipset file, since if that doesn't exist loading does't make sense. There might be better ways to do it, feel free to submit a pull etc. this is just the way I made it work for me. From 600ecb5356970ee7fd5cfcee55c51d12bb0c2777 Mon Sep 17 00:00:00 2001 From: jordanrinke Date: Fri, 8 Aug 2014 16:41:31 -0700 Subject: [PATCH 06/74] Exclude f2b sets If you save the f2b set, it will stack them on restart. Adding grep -iv "f2b" will exclude any sets from fail2ban from being saved, so they append a single time properly --- iptables-persistent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iptables-persistent b/iptables-persistent index 01ca1d2d..fe174d8f 100644 --- a/iptables-persistent +++ b/iptables-persistent @@ -72,7 +72,7 @@ save_rules() log_action_cont_msg " skipping IPset - no sets defined or not loaded" elif [ -x /usr/sbin/ipset ] || [ -x /sbin/ipset ]; then log_action_cont_msg " IPset" - ipset save > /etc/iptables/rules.ipsets + ipset save | grep -iv "f2b"> /etc/iptables/rules.ipsets if [ $? -ne 0 ]; then rc=1 fi From f14a41f4b7933a791a472b21d14a8e6aa0feba44 Mon Sep 17 00:00:00 2001 From: Alon Ganon Date: Tue, 28 Jun 2016 16:08:58 -0400 Subject: [PATCH 07/74] Initial commit --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 + 2 files changed, 676 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..9cecc1d4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 00000000..7c8a0f6f --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# blocklist +blocklist-installer From f054128a65fb38e7a0de6198602e3592b986de04 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Tue, 28 Jun 2016 16:12:16 -0400 Subject: [PATCH 08/74] added script --- install.sh | 12 +++++++ sync-fail2ban | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 install.sh create mode 100644 sync-fail2ban diff --git a/install.sh b/install.sh new file mode 100644 index 00000000..055d8dfb --- /dev/null +++ b/install.sh @@ -0,0 +1,12 @@ +# Add Blocklist.de malicious IP Addresses to Daily Crontab +# Also IPtables-persistent to save IP addresses upon reboot +# Added by Alon "ChiefGyk" Ganon +cp sync-fail2ban /etc/cron.daily/sync-fail2ban +chmod a+x /etc/cron.daily/sync-fail2ban +time /etc/cron.daily/sync-fail2ban +echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo debconf-set-selections +echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections +apt-get update +apt-get install -y iptables-persistent +iptables-save > /etc/iptables/rules.v4 +ip6tables-save > /etc/iptables/rules.v6 \ No newline at end of file diff --git a/sync-fail2ban b/sync-fail2ban new file mode 100644 index 00000000..2ae7be3f --- /dev/null +++ b/sync-fail2ban @@ -0,0 +1,86 @@ +#!/bin/bash + +## Update fail2ban iptables with globally known attackers. +## Actually, runs 100% independently now, without needing fail2ban installed. +## +## /etc/cron.daily/sync-fail2ban +## +## Author: Marcos Kobylecki +## http://www.reddit.com/r/linux/comments/2nvzur/shared_blacklists_from_fail2ban/ + + +## Quit if fail2ban is missing. Maybe this fake requirement can be skipped? YES. +#PROGRAM=/etc/init.d/fail2ban +#[ -x $PROGRAM ] || exit 0 + +datadir=/etc/fail2ban +[[ -d "$datadir" ]] || datadir=/tmp + +## Get default settings of fail2ban (optional?) +[ -r /etc/default/fail2ban ] && . /etc/default/fail2ban + +umask 000 +blacklistf=$datadir/blacklist.blocklist.de.txt + +mv -vf $blacklistf $blacklistf.last + +badlisturls="http://antivirus.neu.edu.cn/ssh/lists/base_30days.txt http://lists.blocklist.de/lists/ssh.txt http://lists.blocklist.de/lists/bruteforcelogin.txt" + + + iptables -vN fail2ban-ssh # Create the chain if it doesn't exist. Harmless if it does. + +# Grab list(s) at https://www.blocklist.de/en/export.html . Block. +echo "Adding new blocks:" + time curl -s http://lists.blocklist.de/lists/ssh.txt http://lists.blocklist.de/lists/bruteforcelogin.txt \ + |sort -u \ + |tee $blacklistf \ + |grep -v '^#\|:' \ + |while read IP; do iptables -I fail2ban-ssh 1 -s $IP -j DROP; done + + + +# Which listings had been removed since last time? Unblock. +echo "Removing old blocks:" +if [[ -r $blacklistf.diff ]]; then + # comm is brittle, cannot use sort -rn + time comm -23 $blacklistf.last $blacklistf \ + |tee $blacklistf.delisted \ + |grep -v '^#\|:' \ + |while read IP; do iptables -w -D fail2ban-ssh -s $IP -j DROP || iptables -wv -D fail2ban-ssh -s $IP -j LOGDROP; done + +fi + + +# prepare for next time. + diff -wbay $blacklistf.last $blacklistf > $blacklistf.diff + +# save IPtable rules +iptables-save > /etc/iptables/rules.v4 +ip6tables-save > /etc/iptables/rules.v6 + + +# Saves a copy of current iptables rules, should you like to check them later. +(set -x; iptables -wnv -L --line-numbers; iptables -wnv -t nat -L --line-numbers) &> /tmp/iptables.fail2ban.log & + + +exit + +# iptables v1.4.21: host/network `2a00:1210:fffe:145::1' not found +# So weed out IPv6, try |grep -v ':' + +## http://ix.io/fpC + + +# Option: actionban +# Notes.: command executed when banning an IP. Take care that the +# command is executed with Fail2Ban user rights. +# Tags: See jail.conf(5) man page +# Values: CMD +# +actionban = iptables -I fail2ban- 1 -s -j # Option: actionunban +# Notes.: command executed when unbanning an IP. Take care that the +# command is executed with Fail2Ban user rights. +# Tags: See jail.conf(5) man page +# Values: CMD +# +actionunban = iptables -D fail2ban- -s -j \ No newline at end of file From bddddcb3fd6b04722c3c05344d1845bfbe0d818d Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Tue, 28 Jun 2016 16:21:45 -0400 Subject: [PATCH 09/74] removed unnecessary lines --- install.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/install.sh b/install.sh index 055d8dfb..d8dbf09c 100644 --- a/install.sh +++ b/install.sh @@ -8,5 +8,3 @@ echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo deb echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections apt-get update apt-get install -y iptables-persistent -iptables-save > /etc/iptables/rules.v4 -ip6tables-save > /etc/iptables/rules.v6 \ No newline at end of file From b65dc989662274fed1f93e00949eb18e92c706d1 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Tue, 28 Jun 2016 16:24:11 -0400 Subject: [PATCH 10/74] made executable --- install.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 install.sh diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 From 9d814940f9b6c0502b06047e7971384ecf2fec06 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Tue, 28 Jun 2016 18:54:47 -0400 Subject: [PATCH 11/74] Made script check to see if you are running as root --- install.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/install.sh b/install.sh index d8dbf09c..ce2ad069 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,14 @@ # Add Blocklist.de malicious IP Addresses to Daily Crontab # Also IPtables-persistent to save IP addresses upon reboot # Added by Alon "ChiefGyk" Ganon +# Are we running as root? +if [[ $EUID -ne 0 ]]; then + echo "This script must be run as root. Please re-run like this:" + echo + echo "sudo $0" + echo + exit +fi cp sync-fail2ban /etc/cron.daily/sync-fail2ban chmod a+x /etc/cron.daily/sync-fail2ban time /etc/cron.daily/sync-fail2ban From 688ab401e2e57e57b674827185ab233e60b3abc3 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Tue, 28 Jun 2016 18:58:46 -0400 Subject: [PATCH 12/74] updated readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7c8a0f6f..42dfd8cc 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ # blocklist blocklist-installer +This will install a cron to run daily and pull lists from https://blocklist.de to block malicious IP addresses. Adding around ~20,000 or more IP addresses per day, all voluntarily and freely contributed through people with Fail2Ban accounts. If setting up Fail2Ban I suggest you help contribute to blocklist.de. +Script is pretty self explanatory it prepares IPTables persistence, and the cron tab. Simply run as root and it will do the work for you. +Tested on Ubuntu 14.04LTS \ No newline at end of file From 409cbbe014bb75743ac50d66ee83dc352ea5b052 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Tue, 28 Jun 2016 18:59:58 -0400 Subject: [PATCH 13/74] updated readme --- install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install.sh b/install.sh index ce2ad069..300e7c8c 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,8 @@ # Add Blocklist.de malicious IP Addresses to Daily Crontab # Also IPtables-persistent to save IP addresses upon reboot # Added by Alon "ChiefGyk" Ganon +# alon@ganon.me + # Are we running as root? if [[ $EUID -ne 0 ]]; then echo "This script must be run as root. Please re-run like this:" From dff698425def25c9055deaf3627033920222979a Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Tue, 28 Jun 2016 19:02:02 -0400 Subject: [PATCH 14/74] updated readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 42dfd8cc..6965b89b 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,6 @@ blocklist-installer This will install a cron to run daily and pull lists from https://blocklist.de to block malicious IP addresses. Adding around ~20,000 or more IP addresses per day, all voluntarily and freely contributed through people with Fail2Ban accounts. If setting up Fail2Ban I suggest you help contribute to blocklist.de. Script is pretty self explanatory it prepares IPTables persistence, and the cron tab. Simply run as root and it will do the work for you. -Tested on Ubuntu 14.04LTS \ No newline at end of file +Tested on Ubuntu 14.04LTS +alon@ganon.me +https://alonganon.info \ No newline at end of file From b4154ad1bd1f821c79c6ae677277dc0e4859799a Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 07:28:45 -0400 Subject: [PATCH 15/74] removed unneeded sudo --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 300e7c8c..8be12bba 100755 --- a/install.sh +++ b/install.sh @@ -14,7 +14,7 @@ fi cp sync-fail2ban /etc/cron.daily/sync-fail2ban chmod a+x /etc/cron.daily/sync-fail2ban time /etc/cron.daily/sync-fail2ban -echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo debconf-set-selections -echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections +echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections +echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections apt-get update apt-get install -y iptables-persistent From b04bcf1d473230811be8b568613cc083a4748994 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 07:45:48 -0400 Subject: [PATCH 16/74] added a bunch of filters for email/webmail servers --- sync-fail2ban | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sync-fail2ban b/sync-fail2ban index 2ae7be3f..4ddd4582 100644 --- a/sync-fail2ban +++ b/sync-fail2ban @@ -31,7 +31,13 @@ badlisturls="http://antivirus.neu.edu.cn/ssh/lists/base_30days.txt http://lists. # Grab list(s) at https://www.blocklist.de/en/export.html . Block. echo "Adding new blocks:" - time curl -s http://lists.blocklist.de/lists/ssh.txt http://lists.blocklist.de/lists/bruteforcelogin.txt \ + time curl -s http://lists.blocklist.de/lists/ssh.txt http://lists.blocklist.de/lists/bruteforcelogin.txt \ + http://lists.blocklist.de/lists/imap.txt http://lists.blocklist.de/lists/mail.txt \ + http://lists.blocklist.de/lists/postfix.txt http://lists.blocklist.de/lists/apache.txt \ + http://lists.blocklist.de/lists/email.txt http://lists.blocklist.de/lists/21.txt \ + http://lists.blocklist.de/lists/25.txt http://lists.blocklist.de/lists/80.txt + http://lists.blocklist.de/lists/110.txt http://lists.blocklist.de/lists/143.txt \ + http://lists.blocklist.de/lists/443.txt http://lists.blocklist.de/lists/993.txt \ |sort -u \ |tee $blacklistf \ |grep -v '^#\|:' \ From 1b17b25e9eecf35a43ee3b98e82e4a01e2c29177 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 07:48:47 -0400 Subject: [PATCH 17/74] added mishing back slash for lists --- sync-fail2ban | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sync-fail2ban b/sync-fail2ban index 4ddd4582..a35549ab 100644 --- a/sync-fail2ban +++ b/sync-fail2ban @@ -35,9 +35,9 @@ echo "Adding new blocks:" http://lists.blocklist.de/lists/imap.txt http://lists.blocklist.de/lists/mail.txt \ http://lists.blocklist.de/lists/postfix.txt http://lists.blocklist.de/lists/apache.txt \ http://lists.blocklist.de/lists/email.txt http://lists.blocklist.de/lists/21.txt \ - http://lists.blocklist.de/lists/25.txt http://lists.blocklist.de/lists/80.txt + http://lists.blocklist.de/lists/25.txt http://lists.blocklist.de/lists/80.txt \ http://lists.blocklist.de/lists/110.txt http://lists.blocklist.de/lists/143.txt \ - http://lists.blocklist.de/lists/443.txt http://lists.blocklist.de/lists/993.txt \ + http://lists.blocklist.de/lists/443.txt http://lists.blocklist.de/lists/993.txt \ |sort -u \ |tee $blacklistf \ |grep -v '^#\|:' \ From 4f9b926dbaa4da7abcfa85414e1573d88e46b48e Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 08:06:54 -0400 Subject: [PATCH 18/74] used xargs to make it a bit easier for script, had it make /etc/iptables then copy blocklist.txt to there, which the cron.daily will continuously read from for it's lists --- blocklist.txt | 14 ++++++++++++++ install.sh | 2 ++ sync-fail2ban | 8 +------- 3 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 blocklist.txt diff --git a/blocklist.txt b/blocklist.txt new file mode 100644 index 00000000..3bc41ce0 --- /dev/null +++ b/blocklist.txt @@ -0,0 +1,14 @@ +http://lists.blocklist.de/lists/ssh.txt +http://lists.blocklist.de/lists/bruteforcelogin.txt +http://lists.blocklist.de/lists/imap.txt +http://lists.blocklist.de/lists/mail.txt +http://lists.blocklist.de/lists/postfix.txt +http://lists.blocklist.de/lists/apache.txt +http://lists.blocklist.de/lists/email.txt +http://lists.blocklist.de/lists/21.txt +http://lists.blocklist.de/lists/25.txt +http://lists.blocklist.de/lists/80.txt +http://lists.blocklist.de/lists/110.txt +http://lists.blocklist.de/lists/143.txt +http://lists.blocklist.de/lists/443.txt +http://lists.blocklist.de/lists/993.txt \ No newline at end of file diff --git a/install.sh b/install.sh index 8be12bba..80fda002 100755 --- a/install.sh +++ b/install.sh @@ -12,6 +12,8 @@ if [[ $EUID -ne 0 ]]; then exit fi cp sync-fail2ban /etc/cron.daily/sync-fail2ban +mkdir /etc/iptables +cp blocklist.txt /etc/iptables/blocklist.txt chmod a+x /etc/cron.daily/sync-fail2ban time /etc/cron.daily/sync-fail2ban echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections diff --git a/sync-fail2ban b/sync-fail2ban index a35549ab..c0fa072d 100644 --- a/sync-fail2ban +++ b/sync-fail2ban @@ -31,13 +31,7 @@ badlisturls="http://antivirus.neu.edu.cn/ssh/lists/base_30days.txt http://lists. # Grab list(s) at https://www.blocklist.de/en/export.html . Block. echo "Adding new blocks:" - time curl -s http://lists.blocklist.de/lists/ssh.txt http://lists.blocklist.de/lists/bruteforcelogin.txt \ - http://lists.blocklist.de/lists/imap.txt http://lists.blocklist.de/lists/mail.txt \ - http://lists.blocklist.de/lists/postfix.txt http://lists.blocklist.de/lists/apache.txt \ - http://lists.blocklist.de/lists/email.txt http://lists.blocklist.de/lists/21.txt \ - http://lists.blocklist.de/lists/25.txt http://lists.blocklist.de/lists/80.txt \ - http://lists.blocklist.de/lists/110.txt http://lists.blocklist.de/lists/143.txt \ - http://lists.blocklist.de/lists/443.txt http://lists.blocklist.de/lists/993.txt \ + time xargs curl -s < /etc/iptables/blocklist.txt \ |sort -u \ |tee $blacklistf \ |grep -v '^#\|:' \ From 957f3a9b08ed6b85ca57aed2f6c0e4b8d0281b50 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 08:14:21 -0400 Subject: [PATCH 19/74] removed some lists for testing --- blocklist.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/blocklist.txt b/blocklist.txt index 3bc41ce0..f0c4b4f2 100644 --- a/blocklist.txt +++ b/blocklist.txt @@ -5,10 +5,3 @@ http://lists.blocklist.de/lists/mail.txt http://lists.blocklist.de/lists/postfix.txt http://lists.blocklist.de/lists/apache.txt http://lists.blocklist.de/lists/email.txt -http://lists.blocklist.de/lists/21.txt -http://lists.blocklist.de/lists/25.txt -http://lists.blocklist.de/lists/80.txt -http://lists.blocklist.de/lists/110.txt -http://lists.blocklist.de/lists/143.txt -http://lists.blocklist.de/lists/443.txt -http://lists.blocklist.de/lists/993.txt \ No newline at end of file From 619e1a7265e3bb1685bc7958654402f5ecbe6e5f Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 08:18:00 -0400 Subject: [PATCH 20/74] added some bad url list --- sync-fail2ban | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sync-fail2ban b/sync-fail2ban index c0fa072d..e8ab631b 100644 --- a/sync-fail2ban +++ b/sync-fail2ban @@ -24,7 +24,7 @@ blacklistf=$datadir/blacklist.blocklist.de.txt mv -vf $blacklistf $blacklistf.last -badlisturls="http://antivirus.neu.edu.cn/ssh/lists/base_30days.txt http://lists.blocklist.de/lists/ssh.txt http://lists.blocklist.de/lists/bruteforcelogin.txt" +badlisturls="http://antivirus.neu.edu.cn/ssh/lists/base_30days.txt http://lists.blocklist.de/lists/ssh.txt http://lists.blocklist.de/lists/bruteforcelogin.txt http://lists.blocklist.de/lists/imap.txt http://lists.blocklist.de/lists/mail.txt http://lists.blocklist.de/lists/postfix.txt http://lists.blocklist.de/lists/apache.txt http://lists.blocklist.de/lists/email.txt" iptables -vN fail2ban-ssh # Create the chain if it doesn't exist. Harmless if it does. From 74e5dba3bacbf0b777763de8a931fbe4ee76bab1 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 08:24:43 -0400 Subject: [PATCH 21/74] testing all lists --- sync-fail2ban | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sync-fail2ban b/sync-fail2ban index e8ab631b..608a919a 100644 --- a/sync-fail2ban +++ b/sync-fail2ban @@ -24,14 +24,14 @@ blacklistf=$datadir/blacklist.blocklist.de.txt mv -vf $blacklistf $blacklistf.last -badlisturls="http://antivirus.neu.edu.cn/ssh/lists/base_30days.txt http://lists.blocklist.de/lists/ssh.txt http://lists.blocklist.de/lists/bruteforcelogin.txt http://lists.blocklist.de/lists/imap.txt http://lists.blocklist.de/lists/mail.txt http://lists.blocklist.de/lists/postfix.txt http://lists.blocklist.de/lists/apache.txt http://lists.blocklist.de/lists/email.txt" +badlisturls="http://antivirus.neu.edu.cn/ssh/lists/base_30days.txt https://lists.blocklist.de/lists/all.txt" iptables -vN fail2ban-ssh # Create the chain if it doesn't exist. Harmless if it does. # Grab list(s) at https://www.blocklist.de/en/export.html . Block. echo "Adding new blocks:" - time xargs curl -s < /etc/iptables/blocklist.txt \ + time curl -s https://lists.blocklist.de/lists/all.txt \ |sort -u \ |tee $blacklistf \ |grep -v '^#\|:' \ From a931ec80ad39ea0ddaa49784f5f3455a3de82622 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 08:52:17 -0400 Subject: [PATCH 22/74] rewrote blacklist with more lists, and ipset --- blacklist | 42 ++++++++++++++++++++++++++++++++++++++++++ blocklist.txt | 7 ------- install.sh | 10 +++++----- 3 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 blacklist delete mode 100644 blocklist.txt diff --git a/blacklist b/blacklist new file mode 100644 index 00000000..5bda6f2b --- /dev/null +++ b/blacklist @@ -0,0 +1,42 @@ +#!/bin/bash +# Found here +IP_TMP=/tmp/ip.tmp +IP_BLACKLIST=/etc/ip-blacklist.conf +IP_BLACKLIST_TMP=/tmp/ip-blacklist.tmp +IP_BLACKLIST_CUSTOM=/etc/ip-blacklist-custom.conf # optional +list="chinese nigerian russian lacnic exploited-servers" +BLACKLISTS=( +"http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1" # Project Honey Pot Directory of Dictionary Attacker IPs +"http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1" # TOR Exit Nodes +"http://www.maxmind.com/en/anonymous_proxies" # MaxMind GeoIP Anonymous Proxies +"http://danger.rulez.sk/projects/bruteforceblocker/blist.php" # BruteForceBlocker IP List +"http://rules.emergingthreats.net/blockrules/rbn-ips.txt" # Emerging Threats - Russian Business Networks List +"http://www.spamhaus.org/drop/drop.lasso" # Spamhaus Don't Route Or Peer List (DROP) +"http://cinsscore.com/list/ci-badguys.txt" # C.I. Army Malicious IP List +"http://www.openbl.org/lists/base.txt" # OpenBL.org 30 day List +"http://www.autoshun.org/files/shunlist.csv" # Autoshun Shun List +"http://lists.blocklist.de/lists/all.txt" # blocklist.de attackers +) +for i in "${BLACKLISTS[@]}" +do + curl "$i" > $IP_TMP + grep -Po '(?:\d{1,3}\.){3}\d{1,3}(?:/\d{1,2})?' $IP_TMP >> $IP_BLACKLIST_TMP +done +for i in `echo $list`; do + # Download + wget --quiet http://www.wizcrafts.net/$i-iptables-blocklist.html + # Grep out all but ip blocks + cat $i-iptables-blocklist.html | grep -v \< | grep -v \: | grep -v \; | grep -v \# | grep [0-9] > $i.txt + # Consolidate blocks into master list + cat $i.txt >> $IP_BLACKLIST_TMP +done + +sort $IP_BLACKLIST_TMP -n | uniq > $IP_BLACKLIST +rm $IP_BLACKLIST_TMP +wc -l $IP_BLACKLIST + +ipset flush blacklist +egrep -v "^#|^$" $IP_BLACKLIST | while IFS= read -r ip +do + ipset add blacklist $ip +done diff --git a/blocklist.txt b/blocklist.txt deleted file mode 100644 index f0c4b4f2..00000000 --- a/blocklist.txt +++ /dev/null @@ -1,7 +0,0 @@ -http://lists.blocklist.de/lists/ssh.txt -http://lists.blocklist.de/lists/bruteforcelogin.txt -http://lists.blocklist.de/lists/imap.txt -http://lists.blocklist.de/lists/mail.txt -http://lists.blocklist.de/lists/postfix.txt -http://lists.blocklist.de/lists/apache.txt -http://lists.blocklist.de/lists/email.txt diff --git a/install.sh b/install.sh index 80fda002..29cae284 100755 --- a/install.sh +++ b/install.sh @@ -11,12 +11,12 @@ if [[ $EUID -ne 0 ]]; then echo exit fi -cp sync-fail2ban /etc/cron.daily/sync-fail2ban -mkdir /etc/iptables -cp blocklist.txt /etc/iptables/blocklist.txt -chmod a+x /etc/cron.daily/sync-fail2ban -time /etc/cron.daily/sync-fail2ban echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections apt-get update +apt-get install -y ipset +ipset create blacklist hash:net +cp blacklist /etc/cron.daily/blacklist +chmod a+x /etc/cron.daily/blacklist +time /etc/cron.daily/blacklist apt-get install -y iptables-persistent From ed8881afc94ec5800a6f41e869468a247229af20 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 09:05:39 -0400 Subject: [PATCH 23/74] double checking lists --- README.md | 2 ++ blacklist | 7 ++--- install.sh | 3 ++ sync-fail2ban | 86 --------------------------------------------------- 4 files changed, 8 insertions(+), 90 deletions(-) delete mode 100644 sync-fail2ban diff --git a/README.md b/README.md index 6965b89b..b29e7fbe 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ blocklist-installer This will install a cron to run daily and pull lists from https://blocklist.de to block malicious IP addresses. Adding around ~20,000 or more IP addresses per day, all voluntarily and freely contributed through people with Fail2Ban accounts. If setting up Fail2Ban I suggest you help contribute to blocklist.de. Script is pretty self explanatory it prepares IPTables persistence, and the cron tab. Simply run as root and it will do the work for you. + +2.0 has been rewritten with help from some research to use IPset and far more tables and lists resourced. Please do not run this more than once per day, per server. Tested on Ubuntu 14.04LTS alon@ganon.me https://alonganon.info \ No newline at end of file diff --git a/blacklist b/blacklist index 5bda6f2b..7a102262 100644 --- a/blacklist +++ b/blacklist @@ -1,5 +1,4 @@ #!/bin/bash -# Found here IP_TMP=/tmp/ip.tmp IP_BLACKLIST=/etc/ip-blacklist.conf IP_BLACKLIST_TMP=/tmp/ip-blacklist.tmp @@ -10,7 +9,7 @@ BLACKLISTS=( "http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1" # TOR Exit Nodes "http://www.maxmind.com/en/anonymous_proxies" # MaxMind GeoIP Anonymous Proxies "http://danger.rulez.sk/projects/bruteforceblocker/blist.php" # BruteForceBlocker IP List -"http://rules.emergingthreats.net/blockrules/rbn-ips.txt" # Emerging Threats - Russian Business Networks List +#"http://rules.emergingthreats.net/blockrules/rbn-ips.txt" # Emerging Threats - Russian Business Networks List "http://www.spamhaus.org/drop/drop.lasso" # Spamhaus Don't Route Or Peer List (DROP) "http://cinsscore.com/list/ci-badguys.txt" # C.I. Army Malicious IP List "http://www.openbl.org/lists/base.txt" # OpenBL.org 30 day List @@ -25,9 +24,9 @@ done for i in `echo $list`; do # Download wget --quiet http://www.wizcrafts.net/$i-iptables-blocklist.html - # Grep out all but ip blocks + # Grep all but ip blocks cat $i-iptables-blocklist.html | grep -v \< | grep -v \: | grep -v \; | grep -v \# | grep [0-9] > $i.txt - # Consolidate blocks into master list + # Consolidate cat $i.txt >> $IP_BLACKLIST_TMP done diff --git a/install.sh b/install.sh index 29cae284..0dd88a63 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,7 @@ # Add Blocklist.de malicious IP Addresses to Daily Crontab # Also IPtables-persistent to save IP addresses upon reboot # Added by Alon "ChiefGyk" Ganon +# alonganon.info # alon@ganon.me # Are we running as root? @@ -16,7 +17,9 @@ echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf- apt-get update apt-get install -y ipset ipset create blacklist hash:net +iptables -I INPUT -m set --match-set blacklist src -j DROP cp blacklist /etc/cron.daily/blacklist chmod a+x /etc/cron.daily/blacklist time /etc/cron.daily/blacklist apt-get install -y iptables-persistent +echo "Blacklist has been installed. It will run daily automatically." diff --git a/sync-fail2ban b/sync-fail2ban deleted file mode 100644 index 608a919a..00000000 --- a/sync-fail2ban +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -## Update fail2ban iptables with globally known attackers. -## Actually, runs 100% independently now, without needing fail2ban installed. -## -## /etc/cron.daily/sync-fail2ban -## -## Author: Marcos Kobylecki -## http://www.reddit.com/r/linux/comments/2nvzur/shared_blacklists_from_fail2ban/ - - -## Quit if fail2ban is missing. Maybe this fake requirement can be skipped? YES. -#PROGRAM=/etc/init.d/fail2ban -#[ -x $PROGRAM ] || exit 0 - -datadir=/etc/fail2ban -[[ -d "$datadir" ]] || datadir=/tmp - -## Get default settings of fail2ban (optional?) -[ -r /etc/default/fail2ban ] && . /etc/default/fail2ban - -umask 000 -blacklistf=$datadir/blacklist.blocklist.de.txt - -mv -vf $blacklistf $blacklistf.last - -badlisturls="http://antivirus.neu.edu.cn/ssh/lists/base_30days.txt https://lists.blocklist.de/lists/all.txt" - - - iptables -vN fail2ban-ssh # Create the chain if it doesn't exist. Harmless if it does. - -# Grab list(s) at https://www.blocklist.de/en/export.html . Block. -echo "Adding new blocks:" - time curl -s https://lists.blocklist.de/lists/all.txt \ - |sort -u \ - |tee $blacklistf \ - |grep -v '^#\|:' \ - |while read IP; do iptables -I fail2ban-ssh 1 -s $IP -j DROP; done - - - -# Which listings had been removed since last time? Unblock. -echo "Removing old blocks:" -if [[ -r $blacklistf.diff ]]; then - # comm is brittle, cannot use sort -rn - time comm -23 $blacklistf.last $blacklistf \ - |tee $blacklistf.delisted \ - |grep -v '^#\|:' \ - |while read IP; do iptables -w -D fail2ban-ssh -s $IP -j DROP || iptables -wv -D fail2ban-ssh -s $IP -j LOGDROP; done - -fi - - -# prepare for next time. - diff -wbay $blacklistf.last $blacklistf > $blacklistf.diff - -# save IPtable rules -iptables-save > /etc/iptables/rules.v4 -ip6tables-save > /etc/iptables/rules.v6 - - -# Saves a copy of current iptables rules, should you like to check them later. -(set -x; iptables -wnv -L --line-numbers; iptables -wnv -t nat -L --line-numbers) &> /tmp/iptables.fail2ban.log & - - -exit - -# iptables v1.4.21: host/network `2a00:1210:fffe:145::1' not found -# So weed out IPv6, try |grep -v ':' - -## http://ix.io/fpC - - -# Option: actionban -# Notes.: command executed when banning an IP. Take care that the -# command is executed with Fail2Ban user rights. -# Tags: See jail.conf(5) man page -# Values: CMD -# -actionban = iptables -I fail2ban- 1 -s -j # Option: actionunban -# Notes.: command executed when unbanning an IP. Take care that the -# command is executed with Fail2Ban user rights. -# Tags: See jail.conf(5) man page -# Values: CMD -# -actionunban = iptables -D fail2ban- -s -j \ No newline at end of file From 022752d0bb0934490bf02310b6b73d944c214468 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 09:18:24 -0400 Subject: [PATCH 24/74] polished --- README.md | 1 + blacklist | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b29e7fbe..e145f950 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ This will install a cron to run daily and pull lists from https://blocklist.de t Script is pretty self explanatory it prepares IPTables persistence, and the cron tab. Simply run as root and it will do the work for you. 2.0 has been rewritten with help from some research to use IPset and far more tables and lists resourced. Please do not run this more than once per day, per server. +It also pulls lists from wizcraft which may or may not work for everyone. But this is fine, as it's only a small portion of the list. Seems to only effect VPS for me. Tested on Ubuntu 14.04LTS alon@ganon.me https://alonganon.info \ No newline at end of file diff --git a/blacklist b/blacklist index 7a102262..226f18e4 100644 --- a/blacklist +++ b/blacklist @@ -9,7 +9,6 @@ BLACKLISTS=( "http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1" # TOR Exit Nodes "http://www.maxmind.com/en/anonymous_proxies" # MaxMind GeoIP Anonymous Proxies "http://danger.rulez.sk/projects/bruteforceblocker/blist.php" # BruteForceBlocker IP List -#"http://rules.emergingthreats.net/blockrules/rbn-ips.txt" # Emerging Threats - Russian Business Networks List "http://www.spamhaus.org/drop/drop.lasso" # Spamhaus Don't Route Or Peer List (DROP) "http://cinsscore.com/list/ci-badguys.txt" # C.I. Army Malicious IP List "http://www.openbl.org/lists/base.txt" # OpenBL.org 30 day List @@ -21,6 +20,8 @@ do curl "$i" > $IP_TMP grep -Po '(?:\d{1,3}\.){3}\d{1,3}(?:/\d{1,2})?' $IP_TMP >> $IP_BLACKLIST_TMP done + +# This part may not work for everyone, it seems wizcraft doesn't allow all VPS wget access, but I am looking into it for i in `echo $list`; do # Download wget --quiet http://www.wizcrafts.net/$i-iptables-blocklist.html From 4f0096c3c26042b0fe2b1b63bdeb0a36538cbde0 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 10:18:56 -0400 Subject: [PATCH 25/74] somes code fixes and lines added for fixes --- blacklist | 15 ++++----------- install.sh | 7 ++++--- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/blacklist b/blacklist index 226f18e4..287f9071 100644 --- a/blacklist +++ b/blacklist @@ -7,7 +7,6 @@ list="chinese nigerian russian lacnic exploited-servers" BLACKLISTS=( "http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1" # Project Honey Pot Directory of Dictionary Attacker IPs "http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1" # TOR Exit Nodes -"http://www.maxmind.com/en/anonymous_proxies" # MaxMind GeoIP Anonymous Proxies "http://danger.rulez.sk/projects/bruteforceblocker/blist.php" # BruteForceBlocker IP List "http://www.spamhaus.org/drop/drop.lasso" # Spamhaus Don't Route Or Peer List (DROP) "http://cinsscore.com/list/ci-badguys.txt" # C.I. Army Malicious IP List @@ -21,16 +20,6 @@ do grep -Po '(?:\d{1,3}\.){3}\d{1,3}(?:/\d{1,2})?' $IP_TMP >> $IP_BLACKLIST_TMP done -# This part may not work for everyone, it seems wizcraft doesn't allow all VPS wget access, but I am looking into it -for i in `echo $list`; do - # Download - wget --quiet http://www.wizcrafts.net/$i-iptables-blocklist.html - # Grep all but ip blocks - cat $i-iptables-blocklist.html | grep -v \< | grep -v \: | grep -v \; | grep -v \# | grep [0-9] > $i.txt - # Consolidate - cat $i.txt >> $IP_BLACKLIST_TMP -done - sort $IP_BLACKLIST_TMP -n | uniq > $IP_BLACKLIST rm $IP_BLACKLIST_TMP wc -l $IP_BLACKLIST @@ -40,3 +29,7 @@ egrep -v "^#|^$" $IP_BLACKLIST | while IFS= read -r ip do ipset add blacklist $ip done + +# save IPtable rules +ipset save blacklist > /etc/ipset/blacklist +iptables-save > /etc/iptables.up.rules \ No newline at end of file diff --git a/install.sh b/install.sh index 0dd88a63..6af563b9 100755 --- a/install.sh +++ b/install.sh @@ -12,14 +12,15 @@ if [[ $EUID -ne 0 ]]; then echo exit fi -echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections -echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections apt-get update apt-get install -y ipset +mkdir /etc/ipset ipset create blacklist hash:net iptables -I INPUT -m set --match-set blacklist src -j DROP cp blacklist /etc/cron.daily/blacklist chmod a+x /etc/cron.daily/blacklist time /etc/cron.daily/blacklist -apt-get install -y iptables-persistent +iptables-save > /etc/iptables.up.rules +sed -e "\$apost up ipset restore < /etc/ipset/blacklist" /etc/network/interfaces +sed -e "\$apost up iptables-restore < /etc/iptables.up.rules" /etc/network/interfaces echo "Blacklist has been installed. It will run daily automatically." From 33bcd102780a35b720ad0e60a83ce0d9f4dc4aee Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 11:01:53 -0400 Subject: [PATCH 26/74] fixing persistence with ipset --- blacklist | 3 +-- install.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/blacklist b/blacklist index 287f9071..095b9ac7 100644 --- a/blacklist +++ b/blacklist @@ -30,6 +30,5 @@ do ipset add blacklist $ip done -# save IPtable rules -ipset save blacklist > /etc/ipset/blacklist +ipset save > /etc/ipset.up.rules iptables-save > /etc/iptables.up.rules \ No newline at end of file diff --git a/install.sh b/install.sh index 6af563b9..0adc63e9 100755 --- a/install.sh +++ b/install.sh @@ -21,6 +21,6 @@ cp blacklist /etc/cron.daily/blacklist chmod a+x /etc/cron.daily/blacklist time /etc/cron.daily/blacklist iptables-save > /etc/iptables.up.rules -sed -e "\$apost up ipset restore < /etc/ipset/blacklist" /etc/network/interfaces -sed -e "\$apost up iptables-restore < /etc/iptables.up.rules" /etc/network/interfaces +sed -i -e "\$apre-up ipset restore < /etc/ipset.up.rules" /etc/network/interfaces +sed -i -e "\$apre-up iptables-restore < /etc/iptables.up.rules" /etc/network/interfaces echo "Blacklist has been installed. It will run daily automatically." From 9ed4952474c225b99a43f0304acdc18491077533 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 11:31:08 -0400 Subject: [PATCH 27/74] updated readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e145f950..eaa0a42b 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # blocklist blocklist-installer -This will install a cron to run daily and pull lists from https://blocklist.de to block malicious IP addresses. Adding around ~20,000 or more IP addresses per day, all voluntarily and freely contributed through people with Fail2Ban accounts. If setting up Fail2Ban I suggest you help contribute to blocklist.de. +This will install a cron to run daily and pull lists from https://blocklist.de to block malicious IP addresses. Adding around ~40,000 or more IP addresses per day, all voluntarily and freely contributed through people with Fail2Ban accounts. If setting up Fail2Ban I suggest you help contribute to blocklist.de. Script is pretty self explanatory it prepares IPTables persistence, and the cron tab. Simply run as root and it will do the work for you. 2.0 has been rewritten with help from some research to use IPset and far more tables and lists resourced. Please do not run this more than once per day, per server. -It also pulls lists from wizcraft which may or may not work for everyone. But this is fine, as it's only a small portion of the list. Seems to only effect VPS for me. +This also adds persistence, and removes iptables-persistent from 1.0 as a requirement. In fact you won't need it at all. I average thousands of more malicious IP addresses now ~48,000 as of testing. Maximum ipset can handle is 65535 from what I have read. Tested on Ubuntu 14.04LTS alon@ganon.me https://alonganon.info \ No newline at end of file From 5a40ff0bc6f517678cb4f91b3d7fd81ab888dd0b Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 11:35:24 -0400 Subject: [PATCH 28/74] updated readme --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index eaa0a42b..3d3d5fd9 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# blocklist -blocklist-installer -This will install a cron to run daily and pull lists from https://blocklist.de to block malicious IP addresses. Adding around ~40,000 or more IP addresses per day, all voluntarily and freely contributed through people with Fail2Ban accounts. If setting up Fail2Ban I suggest you help contribute to blocklist.de. -Script is pretty self explanatory it prepares IPTables persistence, and the cron tab. Simply run as root and it will do the work for you. +# ipset-assassin +ipset-assassin (formerly named blocklist) +This will install a cron to run daily and pull lists from multiple sites to block malicious IP addresses. Adding around ~40,000 or more IP addresses per day, all voluntarily and freely contributed. If setting up Fail2Ban I suggest you help contribute to blocklist.de which is one of the lists used here. +Script is pretty self explanatory it prepares iptables, ipset, and the cron tab. Simply run as root and it will do the work for you. 2.0 has been rewritten with help from some research to use IPset and far more tables and lists resourced. Please do not run this more than once per day, per server. This also adds persistence, and removes iptables-persistent from 1.0 as a requirement. In fact you won't need it at all. I average thousands of more malicious IP addresses now ~48,000 as of testing. Maximum ipset can handle is 65535 from what I have read. -Tested on Ubuntu 14.04LTS +Tested on Ubuntu 14.04LTS for my own servers, so please test on your own systems before fully deploying. alon@ganon.me https://alonganon.info \ No newline at end of file From 3824d20faaffa761a20f9d7a12c39f3824943744 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 11:53:07 -0400 Subject: [PATCH 29/74] fixed comments in script --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 0adc63e9..89a2be63 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,5 @@ -# Add Blocklist.de malicious IP Addresses to Daily Crontab -# Also IPtables-persistent to save IP addresses upon reboot +# Add multipkle lists of malicious IP Addresses by Daily Crontab +# Also makes ipset and iptables persistent upon reboot # Added by Alon "ChiefGyk" Ganon # alonganon.info # alon@ganon.me From a0185aca95fe6b2a927c6d59e398f3131be5f647 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 11:54:32 -0400 Subject: [PATCH 30/74] typo --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 89a2be63..ed938074 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ -# Add multipkle lists of malicious IP Addresses by Daily Crontab +# Add multiple lists of malicious IP Addresses by Daily Crontab # Also makes ipset and iptables persistent upon reboot # Added by Alon "ChiefGyk" Ganon # alonganon.info From 097adec5d20c56eb99e7ead2121f7e9896faed43 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 12:37:46 -0400 Subject: [PATCH 31/74] polish --- README.md | 3 +++ blacklist | 26 +++++++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3d3d5fd9..3e6fc0a1 100644 --- a/README.md +++ b/README.md @@ -6,5 +6,8 @@ Script is pretty self explanatory it prepares iptables, ipset, and the cron tab. 2.0 has been rewritten with help from some research to use IPset and far more tables and lists resourced. Please do not run this more than once per day, per server. This also adds persistence, and removes iptables-persistent from 1.0 as a requirement. In fact you won't need it at all. I average thousands of more malicious IP addresses now ~48,000 as of testing. Maximum ipset can handle is 65535 from what I have read. Tested on Ubuntu 14.04LTS for my own servers, so please test on your own systems before fully deploying. + +Simply run this once, and that's it. +sudo ./install.sh alon@ganon.me https://alonganon.info \ No newline at end of file diff --git a/blacklist b/blacklist index 095b9ac7..27d701e2 100644 --- a/blacklist +++ b/blacklist @@ -1,18 +1,26 @@ +# I found this script somewhere a long time ago and modified it #!/bin/bash IP_TMP=/tmp/ip.tmp IP_BLACKLIST=/etc/ip-blacklist.conf IP_BLACKLIST_TMP=/tmp/ip-blacklist.tmp IP_BLACKLIST_CUSTOM=/etc/ip-blacklist-custom.conf # optional -list="chinese nigerian russian lacnic exploited-servers" BLACKLISTS=( -"http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1" # Project Honey Pot Directory of Dictionary Attacker IPs -"http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1" # TOR Exit Nodes -"http://danger.rulez.sk/projects/bruteforceblocker/blist.php" # BruteForceBlocker IP List -"http://www.spamhaus.org/drop/drop.lasso" # Spamhaus Don't Route Or Peer List (DROP) -"http://cinsscore.com/list/ci-badguys.txt" # C.I. Army Malicious IP List -"http://www.openbl.org/lists/base.txt" # OpenBL.org 30 day List -"http://www.autoshun.org/files/shunlist.csv" # Autoshun Shun List -"http://lists.blocklist.de/lists/all.txt" # blocklist.de attackers +# Project Honey Pot Directory of Dictionary Attacker IPs +"http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1" +# TOR Exit Nodes +"http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1" +# BruteForceBlocker +"http://danger.rulez.sk/projects/bruteforceblocker/blist.php" +# Spamhaus +"http://www.spamhaus.org/drop/drop.lasso" +# C.I. Army +"http://cinsscore.com/list/ci-badguys.txt" +# OpenBL.org +"http://www.openbl.org/lists/base.txt" +#Autoshun +"http://www.autoshun.org/files/shunlist.csv" +#Blocklist.de +"http://lists.blocklist.de/lists/all.txt" ) for i in "${BLACKLISTS[@]}" do From a8eb27dc3fc8993e29fab235f4fcdd2c39bbc0b0 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 13:09:33 -0400 Subject: [PATCH 32/74] added malware domain list and zeus tracker --- blacklist | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/blacklist b/blacklist index 27d701e2..b34f3fe8 100644 --- a/blacklist +++ b/blacklist @@ -17,10 +17,14 @@ BLACKLISTS=( "http://cinsscore.com/list/ci-badguys.txt" # OpenBL.org "http://www.openbl.org/lists/base.txt" -#Autoshun +# Autoshun "http://www.autoshun.org/files/shunlist.csv" -#Blocklist.de +# Blocklist.de "http://lists.blocklist.de/lists/all.txt" +# Malware Domain List +"https://www.malwaredomainlist.com/hostslist/ip.txt" +# ZeusTracker +"https://zeustracker.abuse.ch/blocklist.php?download=ipblocklist" ) for i in "${BLACKLISTS[@]}" do From 1437f7c891f9a009d6401058beb0b42bf66994ad Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 13:49:22 -0400 Subject: [PATCH 33/74] dialog for china and korea --- dialog.sh | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 dialog.sh diff --git a/dialog.sh b/dialog.sh new file mode 100644 index 00000000..fb177587 --- /dev/null +++ b/dialog.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +HEIGHT=15 +WIDTH=40 +CHOICE_HEIGHT=4 +BACKTITLE="Backtitle here" +TITLE="Title here" +MENU="Choose one of the following options:" + +OPTIONS=(1 "China" + 2 "Korea" + 3 "China and Korea") + +CHOICE=$(dialog --clear \ + --backtitle "$BACKTITLE" \ + --title "$TITLE" \ + --menu "$MENU" \ + $HEIGHT $WIDTH $CHOICE_HEIGHT \ + "${OPTIONS[@]}" \ + 2>&1 >/dev/tty) + +clear +case $CHOICE in + 1) + echo "You chose Option 1" + ;; + 2) + echo "You chose Option 2" + ;; + 3) + echo "You chose Option 3" + ;; +esac \ No newline at end of file From c56397035521df2d34ece3cfcae9e72cf4e8de14 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 14:45:36 -0400 Subject: [PATCH 34/74] added dialog and blocks for korea as well as China --- blacklist => conf/blacklist | 0 conf/china | 7 +++++ conf/dialog.sh | 53 +++++++++++++++++++++++++++++++++++++ conf/korea | 7 +++++ conf/sinokorea | 7 +++++ dialog.sh | 33 ----------------------- install.sh | 5 ++-- 7 files changed, 77 insertions(+), 35 deletions(-) rename blacklist => conf/blacklist (100%) create mode 100644 conf/china create mode 100755 conf/dialog.sh create mode 100644 conf/korea create mode 100644 conf/sinokorea delete mode 100644 dialog.sh diff --git a/blacklist b/conf/blacklist similarity index 100% rename from blacklist rename to conf/blacklist diff --git a/conf/china b/conf/china new file mode 100644 index 00000000..5924bb83 --- /dev/null +++ b/conf/china @@ -0,0 +1,7 @@ +#!/bin/bash +curl http://www.okean.com/antispam/iptables/rc.firewall.china > /tmp/china.sh +chmod +x /tmp/china.sh +source /tmp/china.sh +rm -f /tmp/china.sh +ipset save > /etc/ipset.up.rules +iptables-save > /etc/iptables.up.rules diff --git a/conf/dialog.sh b/conf/dialog.sh new file mode 100755 index 00000000..7d500569 --- /dev/null +++ b/conf/dialog.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +HEIGHT=15 +WIDTH=40 +CHOICE_HEIGHT=4 +BACKTITLE="Do you want to block China and/or Korea?" +TITLE="Country Block" +MENU="A lot of spam originates from Korea and China. If you don't plan on having to ever have those countries connect to your server you may block them. \ + This will update weekly, and block all IP blocks to those countries \ + Choose one of the following options:" + +OPTIONS=(1 "China" + 2 "Korea" + 3 "China and Korea") + +CHOICE=$(dialog --clear \ + --backtitle "$BACKTITLE" \ + --title "$TITLE" \ + --menu "$MENU" \ + $HEIGHT $WIDTH $CHOICE_HEIGHT \ + "${OPTIONS[@]}" \ + 2>&1 >/dev/tty) + +clear +case $CHOICE in + 1) + echo "Bombing China" + echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections + echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections + cp china /etc/cron.weekly/china + chmod +x /etc/cron.weekly/china + time /etc/cron.weekly/china + apt-get install -y iptables-persistent + ;; + 2) + echo "Starting the Korean war again" + echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections + echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections + cp korea /etc/cron.weekly/korea + chmod +x /etc/cron.weekly/korea + time /etc/cron.weekly/korea + apt-get install -y iptables-persistent + ;; + 3) + echo "Blocking almost 1/3 of the world" + echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections + echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections + cp sinokorea /etc/cron.weekly/sinokorea + chmod +x /etc/cron.weekly/sinokorea + time /etc/cron.weekly/sinokorea + apt-get install -y iptables-persistent + ;; +esac \ No newline at end of file diff --git a/conf/korea b/conf/korea new file mode 100644 index 00000000..bad21291 --- /dev/null +++ b/conf/korea @@ -0,0 +1,7 @@ +#!/bin/bash +curl http://www.okean.com/antispam/iptables/rc.firewall.korea > /tmp/korea.sh +chmod +x /tmp/korea.sh +source /tmp/korea.sh +rm -f /tmp/korea.sh +ipset save > /etc/ipset.up.rules +iptables-save > /etc/iptables.up.rules diff --git a/conf/sinokorea b/conf/sinokorea new file mode 100644 index 00000000..75ca14d0 --- /dev/null +++ b/conf/sinokorea @@ -0,0 +1,7 @@ +#!/bin/bash +curl http://www.okean.com/antispam/iptables/rc.firewall.sinokorea > /tmp/sinokorea.sh +chmod +x /tmp/sinokorea.sh +source /tmp/sinokorea.sh +rm -f /tmp/sinokorea.sh +ipset save > /etc/ipset.up.rules +iptables-save > /etc/iptables.up.rules diff --git a/dialog.sh b/dialog.sh deleted file mode 100644 index fb177587..00000000 --- a/dialog.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -HEIGHT=15 -WIDTH=40 -CHOICE_HEIGHT=4 -BACKTITLE="Backtitle here" -TITLE="Title here" -MENU="Choose one of the following options:" - -OPTIONS=(1 "China" - 2 "Korea" - 3 "China and Korea") - -CHOICE=$(dialog --clear \ - --backtitle "$BACKTITLE" \ - --title "$TITLE" \ - --menu "$MENU" \ - $HEIGHT $WIDTH $CHOICE_HEIGHT \ - "${OPTIONS[@]}" \ - 2>&1 >/dev/tty) - -clear -case $CHOICE in - 1) - echo "You chose Option 1" - ;; - 2) - echo "You chose Option 2" - ;; - 3) - echo "You chose Option 3" - ;; -esac \ No newline at end of file diff --git a/install.sh b/install.sh index ed938074..0c0d9d08 100755 --- a/install.sh +++ b/install.sh @@ -13,13 +13,14 @@ if [[ $EUID -ne 0 ]]; then exit fi apt-get update -apt-get install -y ipset +apt-get install -y ipset dialog mkdir /etc/ipset ipset create blacklist hash:net iptables -I INPUT -m set --match-set blacklist src -j DROP -cp blacklist /etc/cron.daily/blacklist +cp conf/blacklist /etc/cron.daily/blacklist chmod a+x /etc/cron.daily/blacklist time /etc/cron.daily/blacklist +source conf/dialog.sh iptables-save > /etc/iptables.up.rules sed -i -e "\$apre-up ipset restore < /etc/ipset.up.rules" /etc/network/interfaces sed -i -e "\$apre-up iptables-restore < /etc/iptables.up.rules" /etc/network/interfaces From ee41ba2366a2499909fba93ee10e4c6de6a8900f Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 14:49:25 -0400 Subject: [PATCH 35/74] fixing window size --- conf/dialog.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/dialog.sh b/conf/dialog.sh index 7d500569..66c71c33 100755 --- a/conf/dialog.sh +++ b/conf/dialog.sh @@ -1,7 +1,7 @@ #!/bin/bash -HEIGHT=15 -WIDTH=40 +HEIGHT=60 +WIDTH=160 CHOICE_HEIGHT=4 BACKTITLE="Do you want to block China and/or Korea?" TITLE="Country Block" From 1b825f9bc4e039b56aa9c3239337e284a7ddcdbd Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 14:50:12 -0400 Subject: [PATCH 36/74] fixing window size --- conf/dialog.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/dialog.sh b/conf/dialog.sh index 66c71c33..a9b85764 100755 --- a/conf/dialog.sh +++ b/conf/dialog.sh @@ -1,7 +1,7 @@ #!/bin/bash -HEIGHT=60 -WIDTH=160 +HEIGHT=30 +WIDTH=80 CHOICE_HEIGHT=4 BACKTITLE="Do you want to block China and/or Korea?" TITLE="Country Block" From 345fd9e787a4b8ad084b786d14eec2c74c1c2c9b Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 14:53:23 -0400 Subject: [PATCH 37/74] added do nothing option to dialog --- conf/dialog.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/conf/dialog.sh b/conf/dialog.sh index a9b85764..edadf5d9 100755 --- a/conf/dialog.sh +++ b/conf/dialog.sh @@ -5,13 +5,14 @@ WIDTH=80 CHOICE_HEIGHT=4 BACKTITLE="Do you want to block China and/or Korea?" TITLE="Country Block" -MENU="A lot of spam originates from Korea and China. If you don't plan on having to ever have those countries connect to your server you may block them. \ - This will update weekly, and block all IP blocks to those countries \ +MENU="A lot of spam, as well as malicious traffic originates from Korea and China. If you don't plan on having to ever have those countries connect to your server you may block them. + This will add a cron that will update weekly, and block all IP blocks to those countries you choose Choose one of the following options:" OPTIONS=(1 "China" 2 "Korea" - 3 "China and Korea") + 3 "China and Korea" + 4 "Do nothing") CHOICE=$(dialog --clear \ --backtitle "$BACKTITLE" \ @@ -50,4 +51,5 @@ case $CHOICE in time /etc/cron.weekly/sinokorea apt-get install -y iptables-persistent ;; + 4) break;; esac \ No newline at end of file From aca54c66bf8981aebafa60973b08235ed316fc52 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 15:00:35 -0400 Subject: [PATCH 38/74] fixing stuff --- conf/dialog.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/dialog.sh b/conf/dialog.sh index edadf5d9..02f83569 100755 --- a/conf/dialog.sh +++ b/conf/dialog.sh @@ -28,7 +28,7 @@ case $CHOICE in echo "Bombing China" echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections - cp china /etc/cron.weekly/china + cp conf/china /etc/cron.weekly/china chmod +x /etc/cron.weekly/china time /etc/cron.weekly/china apt-get install -y iptables-persistent @@ -37,7 +37,7 @@ case $CHOICE in echo "Starting the Korean war again" echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections - cp korea /etc/cron.weekly/korea + cp conf/korea /etc/cron.weekly/korea chmod +x /etc/cron.weekly/korea time /etc/cron.weekly/korea apt-get install -y iptables-persistent @@ -46,7 +46,7 @@ case $CHOICE in echo "Blocking almost 1/3 of the world" echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections - cp sinokorea /etc/cron.weekly/sinokorea + cp conf/sinokorea /etc/cron.weekly/sinokorea chmod +x /etc/cron.weekly/sinokorea time /etc/cron.weekly/sinokorea apt-get install -y iptables-persistent From adf7ca25eac87f07e2e54528a750daa3f7de7557 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 15:23:13 -0400 Subject: [PATCH 39/74] added ability to optionally block Korean and/or Chinese IP address blocks towards the end via a dialog box. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3e6fc0a1..178545ad 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ Script is pretty self explanatory it prepares iptables, ipset, and the cron tab. This also adds persistence, and removes iptables-persistent from 1.0 as a requirement. In fact you won't need it at all. I average thousands of more malicious IP addresses now ~48,000 as of testing. Maximum ipset can handle is 65535 from what I have read. Tested on Ubuntu 14.04LTS for my own servers, so please test on your own systems before fully deploying. +I have also added the capability to block all Chinese and/or Korean IP Addresses as a good number of spam and malicious activity are linked to them. Towards the end after ipset has added thousands of IP addresses, a dialog will appear giving the option to choose if you want to block China, Korea, both, or neither. Simply select the option you desire and it will take care of the rest. The Korean and/or Chinese addresses will only update weekly, as it blocks entire IP blocks off assigned to the country/countries you have chosen. I may add more countries down the line if need be. + Simply run this once, and that's it. sudo ./install.sh alon@ganon.me From d5df6ff09da7168f07b83de2fd7c5f1c002dd4bc Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 15:24:29 -0400 Subject: [PATCH 40/74] added geo-blocking --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 178545ad..63ad60b4 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Script is pretty self explanatory it prepares iptables, ipset, and the cron tab. This also adds persistence, and removes iptables-persistent from 1.0 as a requirement. In fact you won't need it at all. I average thousands of more malicious IP addresses now ~48,000 as of testing. Maximum ipset can handle is 65535 from what I have read. Tested on Ubuntu 14.04LTS for my own servers, so please test on your own systems before fully deploying. -I have also added the capability to block all Chinese and/or Korean IP Addresses as a good number of spam and malicious activity are linked to them. Towards the end after ipset has added thousands of IP addresses, a dialog will appear giving the option to choose if you want to block China, Korea, both, or neither. Simply select the option you desire and it will take care of the rest. The Korean and/or Chinese addresses will only update weekly, as it blocks entire IP blocks off assigned to the country/countries you have chosen. I may add more countries down the line if need be. +I have also added the capability to block all Chinese and/or Korean IP Addresses in 2.1 as a good number of spam and malicious activity are linked to them. Towards the end after ipset has added thousands of IP addresses, a dialog will appear giving the option to choose if you want to block China, Korea, both, or neither. Simply select the option you desire and it will take care of the rest. The Korean and/or Chinese addresses will only update weekly, as it blocks entire IP blocks off assigned to the country/countries you have chosen. I may add more countries down the line if need be. Simply run this once, and that's it. sudo ./install.sh From 7dffae1cb312da892e802f2a5e283ff7f4531d9f Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 16:01:08 -0400 Subject: [PATCH 41/74] Closing China, calls you 'Mr.Trump' --- conf/dialog.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/dialog.sh b/conf/dialog.sh index 02f83569..879e49a3 100755 --- a/conf/dialog.sh +++ b/conf/dialog.sh @@ -25,7 +25,7 @@ CHOICE=$(dialog --clear \ clear case $CHOICE in 1) - echo "Bombing China" + echo "Are you Donald Trump?" echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections cp conf/china /etc/cron.weekly/china From 10aef791d73487286aab89f41dc2fb55024fc5d2 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 17:49:54 -0400 Subject: [PATCH 42/74] dshield --- dshield | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 dshield diff --git a/dshield b/dshield new file mode 100644 index 00000000..d0fc8f7c --- /dev/null +++ b/dshield @@ -0,0 +1,54 @@ +#!/bin/bash +## +## Add the top 20 IP blocks that have been reported by DShield +## +## /etc/cron.daily/dshield +## +## Author: Alon "ChiefGyk" Ganon +## https://alonganon.info +## alon@ganon.me + +datadir=/tmp + +## Get default settings of fail2ban (optional?) +[ -r /etc/default/fail2ban ] && . /etc/default/fail2ban + +umask 000 +blacklistf=$datadir/dshield.txt + +mv -vf $blacklistf $blacklistf.last + +badlisturls="http://feeds.dshield.org/block.txt" + +# Create the chain if it doesn't exist. Harmless if it does. + iptables -vN dshield + +# Grab list(s) at http://feeds.dshield.org/block.txt . Block. +echo "Adding new blocks:" + curl -s http://feeds.dshield.org/block.txt \ + |sort -u \ + |tee $blacklistf \ + |grep -v '^#\|:' \ + |while read IP; do iptables -I dshield 1 -s $IP -j DROP; done + + + +# Which listings had been removed since last time? Unblock. +echo "Removing old blocks:" +if [[ -r $blacklistf.diff ]]; then + # comm is brittle, cannot use sort -rn + time comm -23 $blacklistf.last $blacklistf \ + |tee $blacklistf.delisted \ + |grep -v '^#\|:' \ + |while read IP; do iptables -w -D dshield -s $IP -j DROP || iptables -wv -D dshield -s $IP -j LOGDROP; done + +fi + + +# prepare for next time. + diff -wbay $blacklistf.last $blacklistf > $blacklistf.diff + +# save IPtable rules +iptables-save > /etc/iptables.up.rules + +exit \ No newline at end of file From 06f4a1d55cbcda28e3405729129cc76316077489 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 17:54:21 -0400 Subject: [PATCH 43/74] changing IPtable settings --- dshield | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dshield b/dshield index d0fc8f7c..43b07ba1 100644 --- a/dshield +++ b/dshield @@ -29,7 +29,7 @@ echo "Adding new blocks:" |sort -u \ |tee $blacklistf \ |grep -v '^#\|:' \ - |while read IP; do iptables -I dshield 1 -s $IP -j DROP; done + |while read IP; do iptables -A dshield -p tcp -s $IP -j DROP; done From 4286eff0bde38201625adaa66babce7d706dafa5 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 17:55:36 -0400 Subject: [PATCH 44/74] changing IPtable settings --- dshield | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 dshield diff --git a/dshield b/dshield old mode 100644 new mode 100755 From fe8acc8e4447061ada7148ab1ad40aa3aa823343 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 18:13:18 -0400 Subject: [PATCH 45/74] trying to get the blacklist and dshield merged --- conf/dshield | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dshield | 54 ------------------------------------------ install.sh | 3 +++ 3 files changed, 70 insertions(+), 54 deletions(-) create mode 100644 conf/dshield delete mode 100755 dshield diff --git a/conf/dshield b/conf/dshield new file mode 100644 index 00000000..a96d3fd5 --- /dev/null +++ b/conf/dshield @@ -0,0 +1,67 @@ +#!/bin/bash +# Written by Onder Vincent Koc +# @url: https://github.com/koconder/dshield_automatic_iptables +# @credits: http://wiki.brokenpoet.org/wiki/Get_DShield_Blocklist +# +# Dshield Automatic Import to iptables +# Import Dshield Blocklist in a basic shell script which will run silently via cron +# and also use a seprate chain file to support other iptables rules without flushing +# i.e. fail2ban and ddosdeflate + +# path to iptables +IPTABLES="/sbin/iptables"; + +# list of known spammers +URL="http://feeds.dshield.org/block.txt"; + +# save local copy here +FILE="/tmp/dshield_block.text"; + +# iptables custom chain +CHAIN="dshield"; + +# check to see if the chain already exists +$IPTABLES -L $CHAIN -n + +# check to see if the chain already exists +if [ $? -eq 0 ]; then + + # flush the old rules + $IPTABLES -F $CHAIN + + echo "Flushed old rules. Applying updated dsheild list...." + +else + + # create a new chain set + $IPTABLES -N $CHAIN + + # tie chain to input rules so it runs + $IPTABLES -A INPUT -j $CHAIN + + # don't allow this traffic through + $IPTABLES -A FORWARD -j $CHAIN + + echo "Chain not detected. Creating new chain and adding dsheild list...." + +fi; + +# get a copy of the spam list +wget -qc $URL -O $FILE + +blocklist=$( cat $FILE | awk '/^[0-9]/' | awk '{print $1"/"$3}'| sort -n) +for IP in $blocklist +do + # add the ip address log rule to the chain + $IPTABLES -A $CHAIN -p 0 -s $IP -j LOG --log-prefix "[dsheild BLOCK]" -m limit --limit 3/min --limit-burst 10 + + # add the ip address to the chain + $IPTABLES -A $CHAIN -p 0 -s $IP -j DROP + + echo $IP +done + +echo "Done!" + +# remove the spam list +unlink $FILE diff --git a/dshield b/dshield deleted file mode 100755 index 43b07ba1..00000000 --- a/dshield +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -## -## Add the top 20 IP blocks that have been reported by DShield -## -## /etc/cron.daily/dshield -## -## Author: Alon "ChiefGyk" Ganon -## https://alonganon.info -## alon@ganon.me - -datadir=/tmp - -## Get default settings of fail2ban (optional?) -[ -r /etc/default/fail2ban ] && . /etc/default/fail2ban - -umask 000 -blacklistf=$datadir/dshield.txt - -mv -vf $blacklistf $blacklistf.last - -badlisturls="http://feeds.dshield.org/block.txt" - -# Create the chain if it doesn't exist. Harmless if it does. - iptables -vN dshield - -# Grab list(s) at http://feeds.dshield.org/block.txt . Block. -echo "Adding new blocks:" - curl -s http://feeds.dshield.org/block.txt \ - |sort -u \ - |tee $blacklistf \ - |grep -v '^#\|:' \ - |while read IP; do iptables -A dshield -p tcp -s $IP -j DROP; done - - - -# Which listings had been removed since last time? Unblock. -echo "Removing old blocks:" -if [[ -r $blacklistf.diff ]]; then - # comm is brittle, cannot use sort -rn - time comm -23 $blacklistf.last $blacklistf \ - |tee $blacklistf.delisted \ - |grep -v '^#\|:' \ - |while read IP; do iptables -w -D dshield -s $IP -j DROP || iptables -wv -D dshield -s $IP -j LOGDROP; done - -fi - - -# prepare for next time. - diff -wbay $blacklistf.last $blacklistf > $blacklistf.diff - -# save IPtable rules -iptables-save > /etc/iptables.up.rules - -exit \ No newline at end of file diff --git a/install.sh b/install.sh index 0c0d9d08..ad272cbf 100755 --- a/install.sh +++ b/install.sh @@ -21,6 +21,9 @@ cp conf/blacklist /etc/cron.daily/blacklist chmod a+x /etc/cron.daily/blacklist time /etc/cron.daily/blacklist source conf/dialog.sh +#cp conf/dshield /etc/cron.daily/dshield +#chmod +x /etc/cron.daily/dshield +#time /etc/cron.daily/blacklist iptables-save > /etc/iptables.up.rules sed -i -e "\$apre-up ipset restore < /etc/ipset.up.rules" /etc/network/interfaces sed -i -e "\$apre-up iptables-restore < /etc/iptables.up.rules" /etc/network/interfaces From b9a9b46707ec5707e28644fb4eea7642985c9129 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 18:23:46 -0400 Subject: [PATCH 46/74] merging dshield and blacklist cron together --- conf/blacklist | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/conf/blacklist b/conf/blacklist index b34f3fe8..0a3b88b0 100644 --- a/conf/blacklist +++ b/conf/blacklist @@ -1,5 +1,9 @@ # I found this script somewhere a long time ago and modified it #!/bin/bash +IPTABLES=/sbin/iptables +URL=http://feeds.dshield.org/block.txt +FILE=/tmp/dshield_block.text +CHAIN=dshield IP_TMP=/tmp/ip.tmp IP_BLACKLIST=/etc/ip-blacklist.conf IP_BLACKLIST_TMP=/tmp/ip-blacklist.tmp @@ -42,5 +46,63 @@ do ipset add blacklist $ip done +# Written by Onder Vincent Koc +# @url: https://github.com/koconder/dshield_automatic_iptables +# @credits: http://wiki.brokenpoet.org/wiki/Get_DShield_Blocklist +# +# Dshield Automatic Import to iptables +# Import Dshield Blocklist in a basic shell script which will run silently via cron +# and also use a seprate chain file to support other iptables rules without flushing +# i.e. fail2ban and ddosdeflate + + + +# check to see if the chain already exists +$IPTABLES -L $CHAIN -n + +# check to see if the chain already exists +if [ $? -eq 0 ]; then + + # flush the old rules + $IPTABLES -F $CHAIN + + echo "Flushed old rules. Applying updated dshield list...." + +else + + # create a new chain set + $IPTABLES -N $CHAIN + + # tie chain to input rules so it runs + $IPTABLES -A INPUT -j $CHAIN + + # don't allow this traffic through + $IPTABLES -A FORWARD -j $CHAIN + + echo "Chain not detected. Creating new chain and adding dshield list...." + +fi; + +# get a copy of the spam list +wget -qc $URL -O $FILE + +blocklist=$( cat $FILE | awk '/^[0-9]/' | awk '{print $1"/"$3}'| sort -n) +for IP in $blocklist +do + # add the ip address log rule to the chain + $IPTABLES -A $CHAIN -p 0 -s $IP -j LOG --log-prefix "[dshield BLOCK]" -m limit --limit 3/min --limit-burst 10 + + # add the ip address to the chain + $IPTABLES -A $CHAIN -p 0 -s $IP -j DROP + + echo $IP +done + +echo "Done!" + +# remove the spam list +unlink $FILE + +# Persistence ipset save > /etc/ipset.up.rules iptables-save > /etc/iptables.up.rules \ No newline at end of file From 66a542d66660c0b00197f3055dc283c9842b4dab Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 18:27:01 -0400 Subject: [PATCH 47/74] dialog fix --- conf/dialog.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/dialog.sh b/conf/dialog.sh index 02f83569..983679fb 100755 --- a/conf/dialog.sh +++ b/conf/dialog.sh @@ -51,5 +51,6 @@ case $CHOICE in time /etc/cron.weekly/sinokorea apt-get install -y iptables-persistent ;; - 4) break;; + 4) echo "doing nothing" + ;; esac \ No newline at end of file From 86a504713e7a341d6a9d2db543db895f9d2ce608 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 18:36:55 -0400 Subject: [PATCH 48/74] added dshield --- README.md | 2 ++ conf/dshield | 67 ---------------------------------------------------- 2 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 conf/dshield diff --git a/README.md b/README.md index 178545ad..34966d5b 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ Tested on Ubuntu 14.04LTS for my own servers, so please test on your own systems I have also added the capability to block all Chinese and/or Korean IP Addresses as a good number of spam and malicious activity are linked to them. Towards the end after ipset has added thousands of IP addresses, a dialog will appear giving the option to choose if you want to block China, Korea, both, or neither. Simply select the option you desire and it will take care of the rest. The Korean and/or Chinese addresses will only update weekly, as it blocks entire IP blocks off assigned to the country/countries you have chosen. I may add more countries down the line if need be. +The latest addition in 2.2 is it looks up Dshields top 20 blocks of IP addresses that are malicious, and blocks them daily. It has been merged into the /etc/cron.daily/blacklist created prior. The Dshield script was originally found at https://github.com/koconder/dshield_automatic_iptables + Simply run this once, and that's it. sudo ./install.sh alon@ganon.me diff --git a/conf/dshield b/conf/dshield deleted file mode 100644 index a96d3fd5..00000000 --- a/conf/dshield +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -# Written by Onder Vincent Koc -# @url: https://github.com/koconder/dshield_automatic_iptables -# @credits: http://wiki.brokenpoet.org/wiki/Get_DShield_Blocklist -# -# Dshield Automatic Import to iptables -# Import Dshield Blocklist in a basic shell script which will run silently via cron -# and also use a seprate chain file to support other iptables rules without flushing -# i.e. fail2ban and ddosdeflate - -# path to iptables -IPTABLES="/sbin/iptables"; - -# list of known spammers -URL="http://feeds.dshield.org/block.txt"; - -# save local copy here -FILE="/tmp/dshield_block.text"; - -# iptables custom chain -CHAIN="dshield"; - -# check to see if the chain already exists -$IPTABLES -L $CHAIN -n - -# check to see if the chain already exists -if [ $? -eq 0 ]; then - - # flush the old rules - $IPTABLES -F $CHAIN - - echo "Flushed old rules. Applying updated dsheild list...." - -else - - # create a new chain set - $IPTABLES -N $CHAIN - - # tie chain to input rules so it runs - $IPTABLES -A INPUT -j $CHAIN - - # don't allow this traffic through - $IPTABLES -A FORWARD -j $CHAIN - - echo "Chain not detected. Creating new chain and adding dsheild list...." - -fi; - -# get a copy of the spam list -wget -qc $URL -O $FILE - -blocklist=$( cat $FILE | awk '/^[0-9]/' | awk '{print $1"/"$3}'| sort -n) -for IP in $blocklist -do - # add the ip address log rule to the chain - $IPTABLES -A $CHAIN -p 0 -s $IP -j LOG --log-prefix "[dsheild BLOCK]" -m limit --limit 3/min --limit-burst 10 - - # add the ip address to the chain - $IPTABLES -A $CHAIN -p 0 -s $IP -j DROP - - echo $IP -done - -echo "Done!" - -# remove the spam list -unlink $FILE From 8316782cdb1e93a058e5282b5c00b5eca0a2b095 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 18:52:00 -0400 Subject: [PATCH 49/74] removing unneccessary clutter --- install.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/install.sh b/install.sh index ad272cbf..0c0d9d08 100755 --- a/install.sh +++ b/install.sh @@ -21,9 +21,6 @@ cp conf/blacklist /etc/cron.daily/blacklist chmod a+x /etc/cron.daily/blacklist time /etc/cron.daily/blacklist source conf/dialog.sh -#cp conf/dshield /etc/cron.daily/dshield -#chmod +x /etc/cron.daily/dshield -#time /etc/cron.daily/blacklist iptables-save > /etc/iptables.up.rules sed -i -e "\$apre-up ipset restore < /etc/ipset.up.rules" /etc/network/interfaces sed -i -e "\$apre-up iptables-restore < /etc/iptables.up.rules" /etc/network/interfaces From c15aa078b7b2fecad3dcff35251c95dbe4418fce Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 19:09:17 -0400 Subject: [PATCH 50/74] added #!/bin/bash to install.sh --- install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 0c0d9d08..6d0def6f 100755 --- a/install.sh +++ b/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # Add multiple lists of malicious IP Addresses by Daily Crontab # Also makes ipset and iptables persistent upon reboot # Added by Alon "ChiefGyk" Ganon @@ -20,7 +21,7 @@ iptables -I INPUT -m set --match-set blacklist src -j DROP cp conf/blacklist /etc/cron.daily/blacklist chmod a+x /etc/cron.daily/blacklist time /etc/cron.daily/blacklist -source conf/dialog.sh +source conf/dialog.sh iptables-save > /etc/iptables.up.rules sed -i -e "\$apre-up ipset restore < /etc/ipset.up.rules" /etc/network/interfaces sed -i -e "\$apre-up iptables-restore < /etc/iptables.up.rules" /etc/network/interfaces From b66ab07ea03c083f96a25d92b55309d664e60b14 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 19:56:01 -0400 Subject: [PATCH 51/74] fixed a bug with unable to reload network interface --- conf/china | 4 ++-- conf/korea | 3 +-- conf/sinokorea | 4 ++-- install.sh | 7 ++++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/china b/conf/china index 5924bb83..dbe47978 100644 --- a/conf/china +++ b/conf/china @@ -3,5 +3,5 @@ curl http://www.okean.com/antispam/iptables/rc.firewall.china > /tmp/china.sh chmod +x /tmp/china.sh source /tmp/china.sh rm -f /tmp/china.sh -ipset save > /etc/ipset.up.rules -iptables-save > /etc/iptables.up.rules +invoke-rc.d iptables-persistent save + diff --git a/conf/korea b/conf/korea index bad21291..178e0a0b 100644 --- a/conf/korea +++ b/conf/korea @@ -3,5 +3,4 @@ curl http://www.okean.com/antispam/iptables/rc.firewall.korea > /tmp/korea.sh chmod +x /tmp/korea.sh source /tmp/korea.sh rm -f /tmp/korea.sh -ipset save > /etc/ipset.up.rules -iptables-save > /etc/iptables.up.rules +invoke-rc.d iptables-persistent save diff --git a/conf/sinokorea b/conf/sinokorea index 75ca14d0..1bd06b17 100644 --- a/conf/sinokorea +++ b/conf/sinokorea @@ -3,5 +3,5 @@ curl http://www.okean.com/antispam/iptables/rc.firewall.sinokorea > /tmp/sinokor chmod +x /tmp/sinokorea.sh source /tmp/sinokorea.sh rm -f /tmp/sinokorea.sh -ipset save > /etc/ipset.up.rules -iptables-save > /etc/iptables.up.rules +invoke-rc.d iptables-persistent save + diff --git a/install.sh b/install.sh index 6d0def6f..33066c7a 100755 --- a/install.sh +++ b/install.sh @@ -13,6 +13,8 @@ if [[ $EUID -ne 0 ]]; then echo exit fi +echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections +echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections apt-get update apt-get install -y ipset dialog mkdir /etc/ipset @@ -22,7 +24,6 @@ cp conf/blacklist /etc/cron.daily/blacklist chmod a+x /etc/cron.daily/blacklist time /etc/cron.daily/blacklist source conf/dialog.sh -iptables-save > /etc/iptables.up.rules -sed -i -e "\$apre-up ipset restore < /etc/ipset.up.rules" /etc/network/interfaces -sed -i -e "\$apre-up iptables-restore < /etc/iptables.up.rules" /etc/network/interfaces +apt-get install -y iptables-persistent +invoke-rc.d iptables-persistent save echo "Blacklist has been installed. It will run daily automatically." From 84040e56f8523364027d32d8b9c95e23987fa441 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 20:14:07 -0400 Subject: [PATCH 52/74] fixes --- conf/blacklist | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/blacklist b/conf/blacklist index 0a3b88b0..71e67abf 100644 --- a/conf/blacklist +++ b/conf/blacklist @@ -1,13 +1,12 @@ -# I found this script somewhere a long time ago and modified it #!/bin/bash IPTABLES=/sbin/iptables URL=http://feeds.dshield.org/block.txt FILE=/tmp/dshield_block.text CHAIN=dshield + IP_TMP=/tmp/ip.tmp IP_BLACKLIST=/etc/ip-blacklist.conf IP_BLACKLIST_TMP=/tmp/ip-blacklist.tmp -IP_BLACKLIST_CUSTOM=/etc/ip-blacklist-custom.conf # optional BLACKLISTS=( # Project Honey Pot Directory of Dictionary Attacker IPs "http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1" @@ -104,5 +103,4 @@ echo "Done!" unlink $FILE # Persistence -ipset save > /etc/ipset.up.rules -iptables-save > /etc/iptables.up.rules \ No newline at end of file +invoke-rc.d iptables-persistent save \ No newline at end of file From a1698f82efd454937f14898936c0e0bae9f5ceee Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 20:50:33 -0400 Subject: [PATCH 53/74] ipset persistence, and fixes --- conf/blacklist | 4 +- conf/iptables-persistent | 182 +++++++++++++++++++++++++++++++++++++++ install.sh | 7 +- 3 files changed, 191 insertions(+), 2 deletions(-) create mode 100644 conf/iptables-persistent diff --git a/conf/blacklist b/conf/blacklist index 71e67abf..104233e5 100644 --- a/conf/blacklist +++ b/conf/blacklist @@ -103,4 +103,6 @@ echo "Done!" unlink $FILE # Persistence -invoke-rc.d iptables-persistent save \ No newline at end of file +ipset save > /etc/iptables/rules.ipsets +iptables-save > /etc/iptables/rules.v4 +ip6tables-save > /etc/iptables/rules.v6 \ No newline at end of file diff --git a/conf/iptables-persistent b/conf/iptables-persistent new file mode 100644 index 00000000..323a69b4 --- /dev/null +++ b/conf/iptables-persistent @@ -0,0 +1,182 @@ +#!/bin/sh +# Written by Simon Richter +# modified by Jonathan Wiltshire +# with help from Christoph Anton Mitterer +# and again by Jordan Rinke +# + +### BEGIN INIT INFO +# Provides: iptables-persistent +# Required-Start: mountkernfs $local_fs +# Required-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# X-Start-Before: $network +# X-Stop-After: $network +# Short-Description: Set up iptables rules +# Description: Loads/saves current iptables rules from/to /etc/iptables +# to provide a persistent rule set during boot time +### END INIT INFO + +. /lib/lsb/init-functions + +rc=0 + +load_rules() +{ + log_action_begin_msg "Loading iptables rules" + + #load IPsets + if [ ! -f /etc/iptables/rules.ipsets ]; then + log_action_cont_msg " skipping IPsets (no rules to load)" + else + log_action_cont_msg " IPset" + ipset restore -! < /etc/iptables/rules.ipsets 2> /dev/null + if [ $? -ne 0 ]; then + rc=1 + fi + fi + + #load IPv4 rules + if [ ! -f /etc/iptables/rules.v4 ]; then + log_action_cont_msg " skipping IPv4 (no rules to load)" + else + log_action_cont_msg " IPv4" + iptables-restore < /etc/iptables/rules.v4 2> /dev/null + if [ $? -ne 0 ]; then + rc=1 + fi + fi + + #load IPv6 rules + if [ ! -f /etc/iptables/rules.v6 ]; then + log_action_cont_msg " skipping IPv6 (no rules to load)" + else + log_action_cont_msg " IPv6" + ip6tables-restore < /etc/iptables/rules.v6 2> /dev/null + if [ $? -ne 0 ]; then + rc=1 + fi + fi + + log_action_end_msg $rc +} + +save_rules() +{ + log_action_begin_msg "Saving rules" + + #save IPsets + #need at least iptable_filter loaded: + if ! ipset list | grep -i "name">/dev/null 2>&1; then + log_action_cont_msg " skipping IPset - no sets defined or not loaded" + elif [ -x /usr/sbin/ipset ] || [ -x /sbin/ipset ]; then + log_action_cont_msg " IPset" + ipset save | grep -iv "f2b"> /etc/iptables/rules.ipsets + if [ $? -ne 0 ]; then + rc=1 + fi + fi + + #save IPv4 rules + #need at least iptable_filter loaded: + /sbin/modprobe -q iptable_filter + if [ ! -f /proc/net/ip_tables_names ]; then + log_action_cont_msg " skipping IPv4 (no modules loaded)" + elif [ -x /sbin/iptables-save ]; then + log_action_cont_msg " IPv4" + iptables-save > /etc/iptables/rules.v4 + if [ $? -ne 0 ]; then + rc=1 + fi + fi + + #save IPv6 rules + #need at least ip6table_filter loaded: + /sbin/modprobe -q ip6table_filter + if [ ! -f /proc/net/ip6_tables_names ]; then + log_action_cont_msg " skipping IPv6 (no modules loaded)" + elif [ -x /sbin/ip6tables-save ]; then + log_action_cont_msg " IPv6" + ip6tables-save > /etc/iptables/rules.v6 + if [ $? -ne 0 ]; then + rc=1 + fi + fi + + log_action_end_msg $rc +} + +flush_rules() +{ + log_action_begin_msg "Flushing rules" + + if ! ipset list | grep -i "name">/dev/null 2>&1; then + log_action_cont_msg " skipping IPset (no sets defined or not installed)" + elif [ -x /usr/sbin/ipset ] || [ -x /sbin/ipset ]; then + log_action_cont_msg " IPset" + ipset flush + fi + + + + if [ ! -f /proc/net/ip_tables_names ]; then + log_action_cont_msg " skipping IPv4 (no module loaded)" + elif [ -x /sbin/iptables ]; then + log_action_cont_msg " IPv4" + for param in F Z X; do /sbin/iptables -$param; done + for table in $(cat /proc/net/ip_tables_names) + do + /sbin/iptables -t $table -F + /sbin/iptables -t $table -Z + /sbin/iptables -t $table -X + done + for chain in INPUT FORWARD OUTPUT + do + /sbin/iptables -P $chain ACCEPT + done + fi + + if [ ! -f /proc/net/ip6_tables_names ]; then + log_action_cont_msg " skipping IPv6 (no module loaded)" + elif [ -x /sbin/ip6tables ]; then + log_action_cont_msg " IPv6" + for param in F Z X; do /sbin/ip6tables -$param; done + for table in $(cat /proc/net/ip6_tables_names) + do + /sbin/ip6tables -t $table -F + /sbin/ip6tables -t $table -Z + /sbin/ip6tables -t $table -X + done + for chain in INPUT FORWARD OUTPUT + do + /sbin/ip6tables -P $chain ACCEPT + done + fi + + log_action_end_msg 0 +} + +case "$1" in +start|restart|reload|force-reload) + load_rules + ;; +save) + save_rules + ;; +stop) + # Why? because if stop is used, the firewall gets flushed for a variable + # amount of time during package upgrades, leaving the machine vulnerable + # It's also not always desirable to flush during purge + echo "Automatic flushing disabled, use \"flush\" instead of \"stop\"" + ;; +flush) + flush_rules + ;; +*) + echo "Usage: $0 {start|restart|reload|force-reload|save|flush}" >&2 + exit 1 + ;; +esac + +exit $rc \ No newline at end of file diff --git a/install.sh b/install.sh index 33066c7a..717e4c0c 100755 --- a/install.sh +++ b/install.sh @@ -25,5 +25,10 @@ chmod a+x /etc/cron.daily/blacklist time /etc/cron.daily/blacklist source conf/dialog.sh apt-get install -y iptables-persistent -invoke-rc.d iptables-persistent save +cp conf/iptables-persistent /etc/init.d/iptables-persistent +iptables-save > /etc/iptables/rules.v4 +ip6tables-save > /etc/iptables/rules.v6 +#invoke-rc.d iptables-persistent save +#sed -e '$i \/sbin/iptables-restore < /etc/iptables_rules\n' /etc/rc.local +#sed -i -e '$ \/sb echo "Blacklist has been installed. It will run daily automatically." From 67e40c07b8a8200bf629024fdf5988b3b6dc47a0 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 21:07:11 -0400 Subject: [PATCH 54/74] moved persistence to front, pulled iptables-persistence from another github and forked it. Using that in /etc/init.d/iptables-persistent so it handles ipset as well to make things easier. Also allows you to load and save much easier for both iptables and ipset. --- conf/blacklist | 5 +---- conf/china | 3 +-- conf/dialog.sh | 14 +++----------- conf/korea | 3 ++- conf/sinokorea | 4 ++-- install.sh | 16 +++++----------- 6 files changed, 14 insertions(+), 31 deletions(-) diff --git a/conf/blacklist b/conf/blacklist index 104233e5..2254583d 100644 --- a/conf/blacklist +++ b/conf/blacklist @@ -102,7 +102,4 @@ echo "Done!" # remove the spam list unlink $FILE -# Persistence -ipset save > /etc/iptables/rules.ipsets -iptables-save > /etc/iptables/rules.v4 -ip6tables-save > /etc/iptables/rules.v6 \ No newline at end of file +/etc/init.d/iptables-persistent save \ No newline at end of file diff --git a/conf/china b/conf/china index dbe47978..8a38549e 100644 --- a/conf/china +++ b/conf/china @@ -3,5 +3,4 @@ curl http://www.okean.com/antispam/iptables/rc.firewall.china > /tmp/china.sh chmod +x /tmp/china.sh source /tmp/china.sh rm -f /tmp/china.sh -invoke-rc.d iptables-persistent save - +/etc/init.d/iptables-persistent save diff --git a/conf/dialog.sh b/conf/dialog.sh index 66555510..9ae751c4 100755 --- a/conf/dialog.sh +++ b/conf/dialog.sh @@ -26,31 +26,23 @@ clear case $CHOICE in 1) echo "Are you Donald Trump?" - echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections - echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections cp conf/china /etc/cron.weekly/china chmod +x /etc/cron.weekly/china time /etc/cron.weekly/china - apt-get install -y iptables-persistent ;; 2) echo "Starting the Korean war again" - echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections - echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections cp conf/korea /etc/cron.weekly/korea chmod +x /etc/cron.weekly/korea time /etc/cron.weekly/korea - apt-get install -y iptables-persistent - ;; + ;; 3) echo "Blocking almost 1/3 of the world" - echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections - echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections cp conf/sinokorea /etc/cron.weekly/sinokorea chmod +x /etc/cron.weekly/sinokorea time /etc/cron.weekly/sinokorea - apt-get install -y iptables-persistent ;; + 4) echo "doing nothing" - ;; + ;; esac \ No newline at end of file diff --git a/conf/korea b/conf/korea index 178e0a0b..ba0e110d 100644 --- a/conf/korea +++ b/conf/korea @@ -3,4 +3,5 @@ curl http://www.okean.com/antispam/iptables/rc.firewall.korea > /tmp/korea.sh chmod +x /tmp/korea.sh source /tmp/korea.sh rm -f /tmp/korea.sh -invoke-rc.d iptables-persistent save +/etc/init.d/iptables-persistent save + diff --git a/conf/sinokorea b/conf/sinokorea index 1bd06b17..75ca14d0 100644 --- a/conf/sinokorea +++ b/conf/sinokorea @@ -3,5 +3,5 @@ curl http://www.okean.com/antispam/iptables/rc.firewall.sinokorea > /tmp/sinokor chmod +x /tmp/sinokorea.sh source /tmp/sinokorea.sh rm -f /tmp/sinokorea.sh -invoke-rc.d iptables-persistent save - +ipset save > /etc/ipset.up.rules +iptables-save > /etc/iptables.up.rules diff --git a/install.sh b/install.sh index 717e4c0c..9f97699e 100755 --- a/install.sh +++ b/install.sh @@ -13,22 +13,16 @@ if [[ $EUID -ne 0 ]]; then echo exit fi -echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections -echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections +echo iptables-persistent iptables-persistent/autosave_v4 boolean false | debconf-set-selections +echo iptables-persistent iptables-persistent/autosave_v6 boolean false | debconf-set-selections apt-get update -apt-get install -y ipset dialog -mkdir /etc/ipset +apt-get install -y ipset dialog iptables-persistent +cp conf/iptables-persistent /etc/init.d/iptables-persistent ipset create blacklist hash:net iptables -I INPUT -m set --match-set blacklist src -j DROP cp conf/blacklist /etc/cron.daily/blacklist chmod a+x /etc/cron.daily/blacklist time /etc/cron.daily/blacklist source conf/dialog.sh -apt-get install -y iptables-persistent -cp conf/iptables-persistent /etc/init.d/iptables-persistent -iptables-save > /etc/iptables/rules.v4 -ip6tables-save > /etc/iptables/rules.v6 -#invoke-rc.d iptables-persistent save -#sed -e '$i \/sbin/iptables-restore < /etc/iptables_rules\n' /etc/rc.local -#sed -i -e '$ \/sb +/etc/init.d/iptables-persistent save echo "Blacklist has been installed. It will run daily automatically." From 4645806675f10417abf7538a2bba8c7edd4278ea Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 21:20:24 -0400 Subject: [PATCH 55/74] readme tweaks and other fixes --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3664861a..c3a84ea5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,9 @@ Tested on Ubuntu 14.04LTS for my own servers, so please test on your own systems I have also added the capability to block all Chinese and/or Korean IP Addresses in 2.1 as a good number of spam and malicious activity are linked to them. Towards the end after ipset has added thousands of IP addresses, a dialog will appear giving the option to choose if you want to block China, Korea, both, or neither. Simply select the option you desire and it will take care of the rest. The Korean and/or Chinese addresses will only update weekly, as it blocks entire IP blocks off assigned to the country/countries you have chosen. I may add more countries down the line if need be. -The latest addition in 2.2 is it looks up Dshields top 20 blocks of IP addresses that are malicious, and blocks them daily. It has been merged into the /etc/cron.daily/blacklist created prior. The Dshield script was originally found at https://github.com/koconder/dshield_automatic_iptables +2.2 added Dshields top 20 blocks of IP addresses that are malicious, and blocks them daily. It has been merged into the /etc/cron.daily/blacklist created prior. The Dshield script was originally found at https://github.com/koconder/dshield_automatic_iptables + +2.3 is a big fix for some bugs I had, so longer requires editing interfaces file. Instead install iptables-persistent, replaces the /etc/init.d/iptables-persistent with another one on GitHub ( https://github.com/koconder/dshield_automatic_iptables ). This does the same for IPtables, but also will save and restore ipset lists as well. The new init.d file has added the ability to save iptables and ipsec configuration from the service command. Simply run this once, and that's it. sudo ./install.sh From 6ee8852a6759d5c4c1a3e0aed28ffd5b0cdb7333 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 21:28:20 -0400 Subject: [PATCH 56/74] removed apt installing iptables-persistent, now manually adding it --- install.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 9f97699e..d8f3514a 100755 --- a/install.sh +++ b/install.sh @@ -13,10 +13,8 @@ if [[ $EUID -ne 0 ]]; then echo exit fi -echo iptables-persistent iptables-persistent/autosave_v4 boolean false | debconf-set-selections -echo iptables-persistent iptables-persistent/autosave_v6 boolean false | debconf-set-selections apt-get update -apt-get install -y ipset dialog iptables-persistent +apt-get install -y ipset dialog cp conf/iptables-persistent /etc/init.d/iptables-persistent ipset create blacklist hash:net iptables -I INPUT -m set --match-set blacklist src -j DROP From 88365d43acf47830d746757812359e179a4d1a33 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Wed, 29 Jun 2016 21:37:56 -0400 Subject: [PATCH 57/74] polished, more finalized, from now on minor features added (lists, new countries), but the foundation I believe is complete --- install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index d8f3514a..9f97699e 100755 --- a/install.sh +++ b/install.sh @@ -13,8 +13,10 @@ if [[ $EUID -ne 0 ]]; then echo exit fi +echo iptables-persistent iptables-persistent/autosave_v4 boolean false | debconf-set-selections +echo iptables-persistent iptables-persistent/autosave_v6 boolean false | debconf-set-selections apt-get update -apt-get install -y ipset dialog +apt-get install -y ipset dialog iptables-persistent cp conf/iptables-persistent /etc/init.d/iptables-persistent ipset create blacklist hash:net iptables -I INPUT -m set --match-set blacklist src -j DROP From c47812526903710e77a60311c3df65ceba31f3fb Mon Sep 17 00:00:00 2001 From: Alon Ganon Date: Wed, 29 Jun 2016 21:43:36 -0400 Subject: [PATCH 58/74] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c3a84ea5..1075d5da 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,9 @@ I have also added the capability to block all Chinese and/or Korean IP Addresses 2.2 added Dshields top 20 blocks of IP addresses that are malicious, and blocks them daily. It has been merged into the /etc/cron.daily/blacklist created prior. The Dshield script was originally found at https://github.com/koconder/dshield_automatic_iptables -2.3 is a big fix for some bugs I had, so longer requires editing interfaces file. Instead install iptables-persistent, replaces the /etc/init.d/iptables-persistent with another one on GitHub ( https://github.com/koconder/dshield_automatic_iptables ). This does the same for IPtables, but also will save and restore ipset lists as well. The new init.d file has added the ability to save iptables and ipsec configuration from the service command. +2.3 is a big fix for some bugs I had, no longer requires editing interfaces file. Instead install iptables-persistent, replaces the /etc/init.d/iptables-persistent with another one on GitHub ( https://github.com/koconder/dshield_automatic_iptables ). This does the same for IPtables, but also will save and restore ipset lists as well. The new init.d file has added the ability to save iptables and ipsec configuration from the service command. Simply run this once, and that's it. sudo ./install.sh alon@ganon.me -https://alonganon.info \ No newline at end of file +https://alonganon.info From 0d69474688d9f63d57007cc110d595af4904cb4d Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 08:29:22 -0400 Subject: [PATCH 59/74] updated added tor exit node being optional --- README.md | 6 ++++-- conf/geoblock.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ conf/tor.sh | 22 ++++++++++++++++++++++ install.sh | 7 ++++--- 4 files changed, 78 insertions(+), 5 deletions(-) create mode 100755 conf/geoblock.sh create mode 100755 conf/tor.sh diff --git a/README.md b/README.md index 1075d5da..a2212d06 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,11 @@ I have also added the capability to block all Chinese and/or Korean IP Addresses 2.2 added Dshields top 20 blocks of IP addresses that are malicious, and blocks them daily. It has been merged into the /etc/cron.daily/blacklist created prior. The Dshield script was originally found at https://github.com/koconder/dshield_automatic_iptables -2.3 is a big fix for some bugs I had, no longer requires editing interfaces file. Instead install iptables-persistent, replaces the /etc/init.d/iptables-persistent with another one on GitHub ( https://github.com/koconder/dshield_automatic_iptables ). This does the same for IPtables, but also will save and restore ipset lists as well. The new init.d file has added the ability to save iptables and ipsec configuration from the service command. +2.3 is a big fix for some bugs I had, so longer requires editing interfaces file. Instead install iptables-persistent, replaces the /etc/init.d/iptables-persistent with another one on GitHub ( https://github.com/koconder/dshield_automatic_iptables ). This does the same for IPtables, but also will save and restore ipset lists as well. The new init.d file has added the ability to save iptables and ipsec configuration from the service command. + +2.4 Added the Tor exit node blocking being optional, and rearranged some code and files. Simply run this once, and that's it. sudo ./install.sh alon@ganon.me -https://alonganon.info +https://alonganon.info \ No newline at end of file diff --git a/conf/geoblock.sh b/conf/geoblock.sh new file mode 100755 index 00000000..9ae751c4 --- /dev/null +++ b/conf/geoblock.sh @@ -0,0 +1,48 @@ +#!/bin/bash + +HEIGHT=30 +WIDTH=80 +CHOICE_HEIGHT=4 +BACKTITLE="Do you want to block China and/or Korea?" +TITLE="Country Block" +MENU="A lot of spam, as well as malicious traffic originates from Korea and China. If you don't plan on having to ever have those countries connect to your server you may block them. + This will add a cron that will update weekly, and block all IP blocks to those countries you choose + Choose one of the following options:" + +OPTIONS=(1 "China" + 2 "Korea" + 3 "China and Korea" + 4 "Do nothing") + +CHOICE=$(dialog --clear \ + --backtitle "$BACKTITLE" \ + --title "$TITLE" \ + --menu "$MENU" \ + $HEIGHT $WIDTH $CHOICE_HEIGHT \ + "${OPTIONS[@]}" \ + 2>&1 >/dev/tty) + +clear +case $CHOICE in + 1) + echo "Are you Donald Trump?" + cp conf/china /etc/cron.weekly/china + chmod +x /etc/cron.weekly/china + time /etc/cron.weekly/china + ;; + 2) + echo "Starting the Korean war again" + cp conf/korea /etc/cron.weekly/korea + chmod +x /etc/cron.weekly/korea + time /etc/cron.weekly/korea + ;; + 3) + echo "Blocking almost 1/3 of the world" + cp conf/sinokorea /etc/cron.weekly/sinokorea + chmod +x /etc/cron.weekly/sinokorea + time /etc/cron.weekly/sinokorea + ;; + + 4) echo "doing nothing" + ;; +esac \ No newline at end of file diff --git a/conf/tor.sh b/conf/tor.sh new file mode 100755 index 00000000..9d5b077a --- /dev/null +++ b/conf/tor.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# tor.sh - Yes/No +# created by Alon "ChiefGyk" Ganon +# Alon@ganon.me +# This will give the option of blocking Tor exit nodes +dialog --title "Disable Tor Exit Nodes?" \ +--backtitle "" \ +--yesno "Would you like to block all Tor exit nodes? This will block all traffic coming from Tor which will impair people using it to \ +avoid censorship. However the majority of malicious traffic is sourced from Tor. If you change your mind later you can comment/uncomment line 14 \ +of /etc/cron.daily/blacklist where it specifies Tor Exit Nodes" 15 60 + +# Get exit status +# 0 means user hit [yes] button. +# 1 means user hit [no] button. +# 255 means user hit [Esc] key. +response=$? +case $response in + 0) sed -e '13 s/^/#/' /etc/conf.daily/blacklist + echo "Tor Exit Nodes Blocked";; + 1) echo "Freedom";; + 255) echo "[ESC] key pressed.";; +esac \ No newline at end of file diff --git a/install.sh b/install.sh index 9f97699e..004e81c1 100755 --- a/install.sh +++ b/install.sh @@ -13,6 +13,9 @@ if [[ $EUID -ne 0 ]]; then echo exit fi +cp conf/blacklist /etc/cron.daily/blacklist +chmod a+x /etc/cron.daily/blacklist +source conf/tor.sh echo iptables-persistent iptables-persistent/autosave_v4 boolean false | debconf-set-selections echo iptables-persistent iptables-persistent/autosave_v6 boolean false | debconf-set-selections apt-get update @@ -20,9 +23,7 @@ apt-get install -y ipset dialog iptables-persistent cp conf/iptables-persistent /etc/init.d/iptables-persistent ipset create blacklist hash:net iptables -I INPUT -m set --match-set blacklist src -j DROP -cp conf/blacklist /etc/cron.daily/blacklist -chmod a+x /etc/cron.daily/blacklist time /etc/cron.daily/blacklist -source conf/dialog.sh +source conf/geoblock.sh /etc/init.d/iptables-persistent save echo "Blacklist has been installed. It will run daily automatically." From 795ca8a2e0dbd3a1c47605f08847805d7f0e3df8 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 08:30:00 -0400 Subject: [PATCH 60/74] removed redundant dialog.sh --- conf/dialog.sh | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) delete mode 100755 conf/dialog.sh diff --git a/conf/dialog.sh b/conf/dialog.sh deleted file mode 100755 index 9ae751c4..00000000 --- a/conf/dialog.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -HEIGHT=30 -WIDTH=80 -CHOICE_HEIGHT=4 -BACKTITLE="Do you want to block China and/or Korea?" -TITLE="Country Block" -MENU="A lot of spam, as well as malicious traffic originates from Korea and China. If you don't plan on having to ever have those countries connect to your server you may block them. - This will add a cron that will update weekly, and block all IP blocks to those countries you choose - Choose one of the following options:" - -OPTIONS=(1 "China" - 2 "Korea" - 3 "China and Korea" - 4 "Do nothing") - -CHOICE=$(dialog --clear \ - --backtitle "$BACKTITLE" \ - --title "$TITLE" \ - --menu "$MENU" \ - $HEIGHT $WIDTH $CHOICE_HEIGHT \ - "${OPTIONS[@]}" \ - 2>&1 >/dev/tty) - -clear -case $CHOICE in - 1) - echo "Are you Donald Trump?" - cp conf/china /etc/cron.weekly/china - chmod +x /etc/cron.weekly/china - time /etc/cron.weekly/china - ;; - 2) - echo "Starting the Korean war again" - cp conf/korea /etc/cron.weekly/korea - chmod +x /etc/cron.weekly/korea - time /etc/cron.weekly/korea - ;; - 3) - echo "Blocking almost 1/3 of the world" - cp conf/sinokorea /etc/cron.weekly/sinokorea - chmod +x /etc/cron.weekly/sinokorea - time /etc/cron.weekly/sinokorea - ;; - - 4) echo "doing nothing" - ;; -esac \ No newline at end of file From f02acfe0c5ccd70d2ea5b1e24254a0101ade117a Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 08:56:43 -0400 Subject: [PATCH 61/74] fixed typo --- conf/tor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/tor.sh b/conf/tor.sh index 9d5b077a..a539182f 100755 --- a/conf/tor.sh +++ b/conf/tor.sh @@ -6,7 +6,7 @@ dialog --title "Disable Tor Exit Nodes?" \ --backtitle "" \ --yesno "Would you like to block all Tor exit nodes? This will block all traffic coming from Tor which will impair people using it to \ -avoid censorship. However the majority of malicious traffic is sourced from Tor. If you change your mind later you can comment/uncomment line 14 \ +avoid censorship. However the majority of malicious traffic is sourced from Tor. If you change your mind later you can comment/uncomment line 13 \ of /etc/cron.daily/blacklist where it specifies Tor Exit Nodes" 15 60 # Get exit status From 5c5fc025c2f8c69f59eb4f4d093e884d551d55f9 Mon Sep 17 00:00:00 2001 From: Alon Ganon Date: Thu, 30 Jun 2016 09:25:46 -0400 Subject: [PATCH 62/74] fixed minor issue had to use new iptables-persistent --- conf/sinokorea | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/sinokorea b/conf/sinokorea index 75ca14d0..549fb173 100644 --- a/conf/sinokorea +++ b/conf/sinokorea @@ -3,5 +3,5 @@ curl http://www.okean.com/antispam/iptables/rc.firewall.sinokorea > /tmp/sinokor chmod +x /tmp/sinokorea.sh source /tmp/sinokorea.sh rm -f /tmp/sinokorea.sh -ipset save > /etc/ipset.up.rules -iptables-save > /etc/iptables.up.rules +/etc/init.d/iptables-persistent save + From 8a6e59af47e0e5343b3ea95c1eeae5a56f33502a Mon Sep 17 00:00:00 2001 From: Alon Ganon Date: Thu, 30 Jun 2016 09:28:21 -0400 Subject: [PATCH 63/74] wrong link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a2212d06..e62aa6b7 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,11 @@ I have also added the capability to block all Chinese and/or Korean IP Addresses 2.2 added Dshields top 20 blocks of IP addresses that are malicious, and blocks them daily. It has been merged into the /etc/cron.daily/blacklist created prior. The Dshield script was originally found at https://github.com/koconder/dshield_automatic_iptables -2.3 is a big fix for some bugs I had, so longer requires editing interfaces file. Instead install iptables-persistent, replaces the /etc/init.d/iptables-persistent with another one on GitHub ( https://github.com/koconder/dshield_automatic_iptables ). This does the same for IPtables, but also will save and restore ipset lists as well. The new init.d file has added the ability to save iptables and ipsec configuration from the service command. +2.3 is a big fix for some bugs I had, so longer requires editing interfaces file. Instead install iptables-persistent, replaces the /etc/init.d/iptables-persistent with another one on GitHub ( https://github.com/jordanrinke/ipsets-persistent ). This does the same for IPtables, but also will save and restore ipset lists as well. The new init.d file has added the ability to save iptables and ipsec configuration from the service command. 2.4 Added the Tor exit node blocking being optional, and rearranged some code and files. Simply run this once, and that's it. sudo ./install.sh alon@ganon.me -https://alonganon.info \ No newline at end of file +https://alonganon.info From a9fa2533b6f658b4501bf058c4c2a227c8f9c033 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 14:37:21 -0400 Subject: [PATCH 64/74] credit fixes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b224e7d9..e4d51143 100644 --- a/README.md +++ b/README.md @@ -11,18 +11,18 @@ I have also added the capability to block all Chinese and/or Korean IP Addresses 2.2 added Dshields top 20 blocks of IP addresses that are malicious, and blocks them daily. It has been merged into the /etc/cron.daily/blacklist created prior. The Dshield script was originally found at https://github.com/koconder/dshield_automatic_iptables -2.3 is a big fix for some bugs I had, so longer requires editing interfaces file. Instead install iptables-persistent, replaces the /etc/init.d/iptables-persistent with another one on GitHub ( https://github.com/jordanrinke/ipsets-persistent ). Read below where it says ipsets-persistent +2.3 is a big fix for some bugs I had, so longer requires editing interfaces file. Instead install iptables-persistent, replaces the /etc/init.d/iptables-persistent with another one on GitHub. Read below where it says ipsets-persistent 2.4 Added the Tor exit node blocking being optional, and rearranged some code and files. Simply run this once, and that's it. sudo ./install.sh alon@ganon.me - https://alonganon.info ipsets-persistent +https://github.com/jordanrinke/ipsets-persistent ================= init.d script for iptables-persistent on Debian/Ubuntu that also saves/loads ipsets From e70eabbd21b90fb244d12bd01e822da7e71e0ed6 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 14:59:29 -0400 Subject: [PATCH 65/74] clutter --- dshield_auto.sh | 67 ------------------------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 dshield_auto.sh diff --git a/dshield_auto.sh b/dshield_auto.sh deleted file mode 100644 index a96d3fd5..00000000 --- a/dshield_auto.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -# Written by Onder Vincent Koc -# @url: https://github.com/koconder/dshield_automatic_iptables -# @credits: http://wiki.brokenpoet.org/wiki/Get_DShield_Blocklist -# -# Dshield Automatic Import to iptables -# Import Dshield Blocklist in a basic shell script which will run silently via cron -# and also use a seprate chain file to support other iptables rules without flushing -# i.e. fail2ban and ddosdeflate - -# path to iptables -IPTABLES="/sbin/iptables"; - -# list of known spammers -URL="http://feeds.dshield.org/block.txt"; - -# save local copy here -FILE="/tmp/dshield_block.text"; - -# iptables custom chain -CHAIN="dshield"; - -# check to see if the chain already exists -$IPTABLES -L $CHAIN -n - -# check to see if the chain already exists -if [ $? -eq 0 ]; then - - # flush the old rules - $IPTABLES -F $CHAIN - - echo "Flushed old rules. Applying updated dsheild list...." - -else - - # create a new chain set - $IPTABLES -N $CHAIN - - # tie chain to input rules so it runs - $IPTABLES -A INPUT -j $CHAIN - - # don't allow this traffic through - $IPTABLES -A FORWARD -j $CHAIN - - echo "Chain not detected. Creating new chain and adding dsheild list...." - -fi; - -# get a copy of the spam list -wget -qc $URL -O $FILE - -blocklist=$( cat $FILE | awk '/^[0-9]/' | awk '{print $1"/"$3}'| sort -n) -for IP in $blocklist -do - # add the ip address log rule to the chain - $IPTABLES -A $CHAIN -p 0 -s $IP -j LOG --log-prefix "[dsheild BLOCK]" -m limit --limit 3/min --limit-burst 10 - - # add the ip address to the chain - $IPTABLES -A $CHAIN -p 0 -s $IP -j DROP - - echo $IP -done - -echo "Done!" - -# remove the spam list -unlink $FILE From f3b130997102f60ff6e5b600cc7740f38b248c5d Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 15:00:52 -0400 Subject: [PATCH 66/74] clutter --- dshield_auto.sh | 67 ------------------------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 dshield_auto.sh diff --git a/dshield_auto.sh b/dshield_auto.sh deleted file mode 100644 index a96d3fd5..00000000 --- a/dshield_auto.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -# Written by Onder Vincent Koc -# @url: https://github.com/koconder/dshield_automatic_iptables -# @credits: http://wiki.brokenpoet.org/wiki/Get_DShield_Blocklist -# -# Dshield Automatic Import to iptables -# Import Dshield Blocklist in a basic shell script which will run silently via cron -# and also use a seprate chain file to support other iptables rules without flushing -# i.e. fail2ban and ddosdeflate - -# path to iptables -IPTABLES="/sbin/iptables"; - -# list of known spammers -URL="http://feeds.dshield.org/block.txt"; - -# save local copy here -FILE="/tmp/dshield_block.text"; - -# iptables custom chain -CHAIN="dshield"; - -# check to see if the chain already exists -$IPTABLES -L $CHAIN -n - -# check to see if the chain already exists -if [ $? -eq 0 ]; then - - # flush the old rules - $IPTABLES -F $CHAIN - - echo "Flushed old rules. Applying updated dsheild list...." - -else - - # create a new chain set - $IPTABLES -N $CHAIN - - # tie chain to input rules so it runs - $IPTABLES -A INPUT -j $CHAIN - - # don't allow this traffic through - $IPTABLES -A FORWARD -j $CHAIN - - echo "Chain not detected. Creating new chain and adding dsheild list...." - -fi; - -# get a copy of the spam list -wget -qc $URL -O $FILE - -blocklist=$( cat $FILE | awk '/^[0-9]/' | awk '{print $1"/"$3}'| sort -n) -for IP in $blocklist -do - # add the ip address log rule to the chain - $IPTABLES -A $CHAIN -p 0 -s $IP -j LOG --log-prefix "[dsheild BLOCK]" -m limit --limit 3/min --limit-burst 10 - - # add the ip address to the chain - $IPTABLES -A $CHAIN -p 0 -s $IP -j DROP - - echo $IP -done - -echo "Done!" - -# remove the spam list -unlink $FILE From 55ab6ec99a8a9d98ec9dc9b9f565e6bcd5e96ccf Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 15:04:44 -0400 Subject: [PATCH 67/74] readme --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1df5ff5a..81235f01 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ -<<<<<<< HEAD # ipset-assassin -ipset-assassin (formerly named blocklist) + This will install a cron to run daily and pull lists from multiple sites to block malicious IP addresses. Adding around ~40,000 or more IP addresses per day, all voluntarily and freely contributed. If setting up Fail2Ban I suggest you help contribute to blocklist.de which is one of the lists used here. Script is pretty self explanatory it prepares iptables, ipset, and the cron tab. Simply run as root and it will do the work for you. @@ -21,10 +20,10 @@ sudo ./install.sh alon@ganon.me https://alonganon.info - -ipsets-persistent +====== +#ipsets-persistent https://github.com/jordanrinke/ipsets-persistent -================= + init.d script for iptables-persistent on Debian/Ubuntu that also saves/loads ipsets @@ -32,9 +31,10 @@ init.d script for iptables-persistent on Debian/Ubuntu that also saves/loads ips I added checking for and saving ipsets. sets are saved in the same place as the other rules in a file named rules.ipset. Rules are only saved if they are defined, same with flushing and loading. Instead of checking to see if ipset is installed on the load, I just check for the rules.ipset file, since if that doesn't exist loading does't make sense. There might be better ways to do it, feel free to submit a pull etc. this is just the way I made it work for me. ======= -dshield_automatic_iptables +#dshield_automatic_iptables + https://github.com/koconder/dshield_automatic_iptables -========================== + Auto Import dshield blocklist and import to iptables as a chain. It has been merged into the /etc/cron.daily/blacklist created prior in conf/blacklist. From 99a852ad34443abfe3df0dcff34bd8bb6505990f Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 15:17:01 -0400 Subject: [PATCH 68/74] updated readme --- README.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 81235f01..95a9736c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ipset-assassin -This will install a cron to run daily and pull lists from multiple sites to block malicious IP addresses. Adding around ~40,000 or more IP addresses per day, all voluntarily and freely contributed. If setting up Fail2Ban I suggest you help contribute to blocklist.de which is one of the lists used here. +This will install a cron to run daily and pull lists from multiple sites to block malicious IP addresses. Adding around ~40,000 or more IP addresses per day, all voluntarily and freely contributed. If setting up Fail2Ban I suggest you help contribute to blocklist.de which is one of the lists used here. Script is pretty self explanatory it prepares iptables, ipset, and the cron tab. Simply run as root and it will do the work for you. 2.0 has been rewritten with help from some research to use IPset and far more tables and lists resourced. Please do not run this more than once per day, per server. @@ -14,6 +14,21 @@ I have also added the capability to block all Chinese and/or Korean IP Addresses 2.3 is a big fix for some bugs I had, so longer requires editing interfaces file. Instead install iptables-persistent, replaces the /etc/init.d/iptables-persistent with another one on GitHub. Read below where it says ipsets-persistent 2.4 Added the Tor exit node blocking being optional, and rearranged some code and files. +2.41 Added Malc0de blocklist + +The lists used: +Project Honey Pot: http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1 +TOR Exit Nodes: http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1 +BruteForceBlocker: http://danger.rulez.sk/projects/bruteforceblocker/blist.php +Spamhaus: http://www.spamhaus.org/drop/drop.lasso +C.I. Army: http://cinsscore.com/list/ci-badguys.txt +OpenBL.org: http://www.openbl.org/lists/base.txt +Autoshun: http://www.autoshun.org/files/shunlist.csv +Blocklist.de: http://lists.blocklist.de/lists/all.txt +Dshield: http://feeds.dshield.org/block.txt +Malware Domain List: https://www.malwaredomainlist.com/hostslist/ip.txt +ZeusTracker: https://zeustracker.abuse.ch/blocklist.php?download=ipblocklist +malc0de IP blacklist: http://malc0de.com/bl/IP_Blacklist.txt" Simply run this once, and that's it. sudo ./install.sh From 1cdf97158f35d2108bfac4ad22f282b608d1e4c4 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 15:18:58 -0400 Subject: [PATCH 69/74] updated readme --- README.md | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 95a9736c..745c799a 100644 --- a/README.md +++ b/README.md @@ -17,18 +17,30 @@ I have also added the capability to block all Chinese and/or Korean IP Addresses 2.41 Added Malc0de blocklist The lists used: -Project Honey Pot: http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1 -TOR Exit Nodes: http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1 -BruteForceBlocker: http://danger.rulez.sk/projects/bruteforceblocker/blist.php -Spamhaus: http://www.spamhaus.org/drop/drop.lasso -C.I. Army: http://cinsscore.com/list/ci-badguys.txt -OpenBL.org: http://www.openbl.org/lists/base.txt -Autoshun: http://www.autoshun.org/files/shunlist.csv -Blocklist.de: http://lists.blocklist.de/lists/all.txt -Dshield: http://feeds.dshield.org/block.txt -Malware Domain List: https://www.malwaredomainlist.com/hostslist/ip.txt -ZeusTracker: https://zeustracker.abuse.ch/blocklist.php?download=ipblocklist -malc0de IP blacklist: http://malc0de.com/bl/IP_Blacklist.txt" +Project Honey Pot: +http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1 +TOR Exit Nodes: +http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1 +BruteForceBlocker: +http://danger.rulez.sk/projects/bruteforceblocker/blist.php +Spamhaus: +http://www.spamhaus.org/drop/drop.lasso +C.I. Army: +http://cinsscore.com/list/ci-badguys.txt +OpenBL.org: +http://www.openbl.org/lists/base.txt +Autoshun: +http://www.autoshun.org/files/shunlist.csv +Blocklist.de: +http://lists.blocklist.de/lists/all.txt +Dshield: +http://feeds.dshield.org/block.txt +Malware Domain List: +https://www.malwaredomainlist.com/hostslist/ip.txt +ZeusTracker: +https://zeustracker.abuse.ch/blocklist.php?download=ipblocklist +malc0de IP blacklist: +http://malc0de.com/bl/IP_Blacklist.txt" Simply run this once, and that's it. sudo ./install.sh From 025dc9a02ba4095d42a04b532176b2d075205ecb Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 15:19:35 -0400 Subject: [PATCH 70/74] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 745c799a..45f954c7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ I have also added the capability to block all Chinese and/or Korean IP Addresses 2.41 Added Malc0de blocklist The lists used: -Project Honey Pot: +Project Honey Pot http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1 TOR Exit Nodes: http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1 From 24a2062ca60b51de5ee5cb590bc2a8ca5b1bedbc Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 15:21:06 -0400 Subject: [PATCH 71/74] updated readme --- README.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/README.md b/README.md index 45f954c7..0c0e11a2 100644 --- a/README.md +++ b/README.md @@ -17,30 +17,18 @@ I have also added the capability to block all Chinese and/or Korean IP Addresses 2.41 Added Malc0de blocklist The lists used: -Project Honey Pot http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1 -TOR Exit Nodes: http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1 -BruteForceBlocker: http://danger.rulez.sk/projects/bruteforceblocker/blist.php -Spamhaus: http://www.spamhaus.org/drop/drop.lasso -C.I. Army: http://cinsscore.com/list/ci-badguys.txt -OpenBL.org: http://www.openbl.org/lists/base.txt -Autoshun: http://www.autoshun.org/files/shunlist.csv -Blocklist.de: http://lists.blocklist.de/lists/all.txt -Dshield: http://feeds.dshield.org/block.txt -Malware Domain List: https://www.malwaredomainlist.com/hostslist/ip.txt -ZeusTracker: https://zeustracker.abuse.ch/blocklist.php?download=ipblocklist -malc0de IP blacklist: -http://malc0de.com/bl/IP_Blacklist.txt" +http://malc0de.com/bl/IP_Blacklist.txt Simply run this once, and that's it. sudo ./install.sh From 894fdc1d21037cf3d03384a3d9bf4774c1dbec5e Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 15:21:34 -0400 Subject: [PATCH 72/74] updated readme --- README.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/README.md b/README.md index 0c0e11a2..6398c85c 100644 --- a/README.md +++ b/README.md @@ -16,20 +16,6 @@ I have also added the capability to block all Chinese and/or Korean IP Addresses 2.4 Added the Tor exit node blocking being optional, and rearranged some code and files. 2.41 Added Malc0de blocklist -The lists used: -http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1 -http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1 -http://danger.rulez.sk/projects/bruteforceblocker/blist.php -http://www.spamhaus.org/drop/drop.lasso -http://cinsscore.com/list/ci-badguys.txt -http://www.openbl.org/lists/base.txt -http://www.autoshun.org/files/shunlist.csv -http://lists.blocklist.de/lists/all.txt -http://feeds.dshield.org/block.txt -https://www.malwaredomainlist.com/hostslist/ip.txt -https://zeustracker.abuse.ch/blocklist.php?download=ipblocklist -http://malc0de.com/bl/IP_Blacklist.txt - Simply run this once, and that's it. sudo ./install.sh alon@ganon.me From 2d51e5d0ab78785ed8fea1bdf133647ae6df3eac Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Thu, 30 Jun 2016 16:38:52 -0400 Subject: [PATCH 73/74] code fix --- install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/install.sh b/install.sh index 004e81c1..893d1091 100755 --- a/install.sh +++ b/install.sh @@ -13,6 +13,10 @@ if [[ $EUID -ne 0 ]]; then echo exit fi +echo iptables-persistent iptables-persistent/autosave_v4 boolean false | debconf-set-selections +echo iptables-persistent iptables-persistent/autosave_v6 boolean false | debconf-set-selections +apt-get update +apt-get install -y ipset dialog iptables-persistent cp conf/blacklist /etc/cron.daily/blacklist chmod a+x /etc/cron.daily/blacklist source conf/tor.sh From c02be38f07dcd1336c3c0449540490ff1bdcc307 Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Sat, 2 Jul 2016 18:24:45 -0400 Subject: [PATCH 74/74] Added MaxMind, StopForumSpam, and GreenSnow to the list of ipset filters --- conf/blacklist | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/blacklist b/conf/blacklist index 17fc9257..a27a2797 100644 --- a/conf/blacklist +++ b/conf/blacklist @@ -29,6 +29,12 @@ BLACKLISTS=( "https://zeustracker.abuse.ch/blocklist.php?download=ipblocklist" # malc0de IP blacklist "http://malc0de.com/bl/IP_Blacklist.txt" +# MaxMind GeoIP Anonymous Proxies +"https://www.maxmind.com/en/proxy-detection-sample-list" +# StopForumSpam +"https://www.stopforumspam.com/downloads/toxic_ip_cidr.txt" +# GreenSnow +"http://blocklist.greensnow.co/greensnow.txt" ) for i in "${BLACKLISTS[@]}" do