diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-01-28 16:28:19 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-28 16:28:19 -0500 |
commit | ca05054ea2a8aff81822f310c5dafb68ae26e10e (patch) | |
tree | 4c0167fa3d1aa0f08b9bc9e54d1a75b017594397 /lib/gitlab | |
parent | 2b1ddb0f807b328aae00b1d9b0fb7f62e8adbe59 (diff) | |
download | gitlab-ce-ca05054ea2a8aff81822f310c5dafb68ae26e10e.tar.gz |
Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blocking
This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/ip_check.rb | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/lib/gitlab/ip_check.rb b/lib/gitlab/ip_check.rb deleted file mode 100644 index f2e9b50d225..00000000000 --- a/lib/gitlab/ip_check.rb +++ /dev/null @@ -1,34 +0,0 @@ -module Gitlab - class IpCheck - - def initialize(ip) - @ip = ip - - application_settings = ApplicationSetting.current - @ip_blocking_enabled = application_settings.ip_blocking_enabled - @dnsbl_servers_list = application_settings.dnsbl_servers_list - end - - def spam? - @ip_blocking_enabled && blacklisted? - end - - private - - def blacklisted? - on_dns_blacklist? - end - - def on_dns_blacklist? - dnsbl_check = DNSXLCheck.new - prepare_dnsbl_list(dnsbl_check) - dnsbl_check.test(@ip) - end - - def prepare_dnsbl_list(dnsbl_check) - @dnsbl_servers_list.split(',').map(&:strip).reject(&:empty?).each do |domain| - dnsbl_check.add_list(domain, 1) - end - end - end -end |