From af1da5ead4c3ad6322303edf70dfd7a5ddc98acc Mon Sep 17 00:00:00 2001 From: Seth Call Date: Fri, 23 Oct 2015 15:08:54 -0500 Subject: [PATCH] * add pointers to admin --- ruby/lib/jam_ruby/models/download_tracker.rb | 2 ++ ruby/lib/jam_ruby/models/ip_blacklist.rb | 8 ++++++++ ruby/lib/jam_ruby/models/user_blacklist.rb | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/ruby/lib/jam_ruby/models/download_tracker.rb b/ruby/lib/jam_ruby/models/download_tracker.rb index 2d6d5a9e9..7509ad133 100644 --- a/ruby/lib/jam_ruby/models/download_tracker.rb +++ b/ruby/lib/jam_ruby/models/download_tracker.rb @@ -78,6 +78,7 @@ module JamRuby body = "User has downloaded from too many IP addresses #{user.id}\n" body << "Download Count: #{violation['count']}\n" body << "User URL #{user.admin_url}\n" + body << "Add to blacklist: #{UserBlacklist.admin_url}" AdminMailer.alerts({ subject:"Account IP Access Violation. USER: #{user.email}", @@ -93,6 +94,7 @@ module JamRuby if violation body = "IP Address: #{remote_ip}\n" body << "Download Count: #{violation['count']}\n" + body << "Add to blacklist: #{IpBlacklist.admin_url}" AdminMailer.alerts({ subject:"Single IP Access Violation. IP:#{remote_ip}", diff --git a/ruby/lib/jam_ruby/models/ip_blacklist.rb b/ruby/lib/jam_ruby/models/ip_blacklist.rb index 5e50a2fba..e62020e26 100644 --- a/ruby/lib/jam_ruby/models/ip_blacklist.rb +++ b/ruby/lib/jam_ruby/models/ip_blacklist.rb @@ -11,6 +11,14 @@ module JamRuby IpBlacklist.count(:conditions => "remote_ip = '#{remote_ip}'") == 1 end + def self.admin_url + APP_CONFIG.admin_root_url + "/admin/ip_blacklists/" + end + + def admin_url + APP_CONFIG.admin_root_url + "/admin/ip_blacklists/" + id + end + def to_s remote_ip end diff --git a/ruby/lib/jam_ruby/models/user_blacklist.rb b/ruby/lib/jam_ruby/models/user_blacklist.rb index 6d5796af8..287ae5391 100644 --- a/ruby/lib/jam_ruby/models/user_blacklist.rb +++ b/ruby/lib/jam_ruby/models/user_blacklist.rb @@ -12,6 +12,14 @@ module JamRuby UserBlacklist.count(:conditions => "user_id= '#{user.id}'") == 1 end + def self.admin_url + APP_CONFIG.admin_root_url + "/admin/user_blacklists/" + end + + def admin_url + APP_CONFIG.admin_root_url + "/admin/user_blacklists/" + id + end + def to_s user end