repsheet_visualizer 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    repsheet_visualizer (0.0.7)
+    repsheet_visualizer (0.0.8)
       geoip
       json
       redis

data/lib/repsheet_visualizer/application/app.rb

@@ -4,6 +4,11 @@ require 'redis'
 require 'json'
 
 class RepsheetVisualizer < Sinatra::Base
+  # Grab the mount point before every request
+  before do
+    @mount = mount
+  end
+
   helpers do
     def action(data)
       if data[:blacklist].nil? || data[:blacklist] == "false"
@@ -14,10 +19,10 @@ class RepsheetVisualizer < Sinatra::Base
     end
   end
 
+  # Settings methods
   def redis_connection
     host = defined?(settings.redis_host) ? settings.redis_host : "localhost"
     port = defined?(settings.redis_port) ? settings.redis_port : 6379
-
     Redis.new(:host => host, :port => port)
   end
 
@@ -32,64 +37,78 @@ class RepsheetVisualizer < Sinatra::Base
     defined?(settings.mount) ? (settings.mount + "/") : "/"
   end
 
-  get '/' do
-    redis = redis_connection
-    data = redis.keys("*:requests").map {|d| d.split(":").first}.reject {|ip| ip.empty?}
-    @actors = {}
-    data.each do |actor|
-      @actors[actor] = {}
-      @actors[actor][:repsheet] = redis.get("#{actor}:repsheet")
-      @actors[actor][:blacklist] = redis.get("#{actor}:repsheet:blacklist")
-      @actors[actor][:detected] = redis.smembers("#{actor}:detected").join(", ")
+  # TODO: These methods should get moved out to another place
+  def summary(connection)
+    actors = {}
+    connection.keys("*:requests").map {|d| d.split(":").first}.reject {|ip| ip.empty?}.each do |actor|
+      actors[actor] = Hash.new 0
+      actors[actor][:repsheet] = connection.get("#{actor}:repsheet")
+      actors[actor][:blacklist] = connection.get("#{actor}:repsheet:blacklist")
+      actors[actor][:detected] = connection.smembers("#{actor}:detected").join(", ")
+      connection.smembers("#{actor}:detected").each do |rule|
+        actors[actor][:total] += connection.get("#{actor}:#{rule}:count").to_i
+      end
     end
-    @mount = mount
-    erb :actors
+    actors
   end
 
-  get '/activity/:ip' do
-    redis = redis_connection
-    @ip = params[:ip]
-    @activity = redis.lrange("#{@ip}:requests", 0, -1)
-    @mount = mount
-    erb :activity
+  def breakdown(connection)
+    data = {}
+    offenders = connection.keys("*:repsheet").map {|o| o.split(":").first}
+    offenders.each do |offender|
+      data[offender] = {"totals" => {}}
+      connection.smembers("#{offender}:detected").each do |rule|
+        data[offender]["totals"][rule] = connection.get "#{offender}:#{rule}:count"
+      end
+    end
+    aggregate = Hash.new 0
+    data.each {|ip,data| data["totals"].each {|rule,count| aggregate[rule] += count.to_i}}
+    [data, aggregate]
   end
 
-  post '/action' do
-    redis = redis_connection
-    if params["action"] == "allow"
-      redis.set("#{params[:ip]}:repsheet:blacklist", "false")
-    else
-      redis.set("#{params[:ip]}:repsheet:blacklist", "true")
+  def activity(connection)
+    connection.lrange("#{@ip}:requests", 0, -1)
+  end
+
+  def worldview(connection, database)
+    data = {}
+    offenders = connection.keys("*:repsheet*").map {|o| o.split(":").first}
+    offenders.each do |address|
+      details = database.country(address)
+      data[address] = [details.latitude, details.longitude]
     end
-    @mount = mount
-    redirect back
+    data
+  end
+
+  # This is the actual application
+  get '/' do
+    @data = summary(redis_connection)
+    erb :actors
   end
 
   get '/breakdown' do
-    redis = redis_connection
-    @data = {}
-    offenders = redis.keys("*:repsheet").map {|o| o.split(":").first}
-    offenders.each do |offender|
-      @data[offender] = {"totals" => {}}
-      redis.smembers("#{offender}:detected").each do |rule|
-        @data[offender]["totals"][rule] = redis.get "#{offender}:#{rule}:count"
-      end
-    end
-    @aggregate = Hash.new 0
-    @data.each {|ip,data| data["totals"].each {|rule,count| @aggregate[rule] += count.to_i}}
-    @mount = mount
+    @data, @aggregate = breakdown(redis_connection)
     erb :breakdown
   end
 
   get '/worldview' do
-    db = geoip_database
-    redis = redis_connection
-    @data = {}
-    offenders = redis.keys("*:repsheet*").map {|o| o.split(":").first}
-    offenders.each do |address|
-      details = db.country(address)
-      @data[address] = [details.latitude, details.longitude]
-    end
+    @data = worldview(redis_connection, geoip_database)
     erb :worldview
   end
+
+  get '/activity/:ip' do
+    @ip = params[:ip]
+    @data = activity(redis_connection)
+    erb :activity
+  end
+
+  post '/action' do
+    connection = redis_connection
+    if params["action"] == "allow"
+      connection.set("#{params[:ip]}:repsheet:blacklist", "false")
+    else
+      connection.set("#{params[:ip]}:repsheet:blacklist", "true")
+    end
+    redirect back
+  end
 end

data/lib/repsheet_visualizer/application/public/javascripts/application.js

@@ -1,5 +1,8 @@
 $(document).ready(function() {
-    $("#actors").tablesorter({sortList: [[2,1], [1,1]],widgets: ['zebra']});
+    // Bring up tablesorter and sort by people who have committed the
+    // most number of ModSecurity violations and who are not yet on
+    // the blacklist
+    $("#actors").tablesorter({sortList: [[2,0], [4,1]],widgets: ['zebra']});
 });
 
 function angle(d) {

data/lib/repsheet_visualizer/application/views/activity.erb

@@ -46,7 +46,7 @@
       <h2>Activity for <%= @ip %></h2>
       <div><a href="<%= @mount %>">Back</a></div>
       <ul>
-	<% @activity.each do |action| %>
+	<% @data.each do |action| %>
 	  <li><%= action %></li>
 	<% end %>
       </ul>

data/lib/repsheet_visualizer/application/views/actors.erb

@@ -56,24 +56,26 @@
 	    <th>Repsheet?</th>
 	    <th>Blacklist?</th>
       	    <th>Triggered Rules</th>
+	    <th>Offenses</th>
 	    <th>Activity</th>
 	    <th>Action</th>
 	  </tr>
 	</thead>
 	<tbody>
-	  <% @actors.each do |actor,data| %>
+	  <% @data.each do |actor,details| %>
 	    <tr>
 	      <td><%= actor %></td>
-	      <td><%= data[:repsheet] %></td>
-	      <td><%= data[:blacklist] %></td>
-	      <td><%= data[:detected] %></td>
+	      <td><%= details[:repsheet] %></td>
+	      <td><%= details[:blacklist] %></td>
+	      <td><%= details[:detected] %></td>
+	      <td><%= details[:total] %></td>
 	      <td><a href="<%= @mount %>activity/<%= actor %>">Click to see activity</a>
 	      <td>
 		<form method="post" action="<%= @mount %>action" class="button_to">
 		  <div>
-		    <input value="<%= action(data) %>" type="submit" />
+		    <input value="<%= action(details) %>" type="submit" />
 		    <input type="hidden" name="ip" value="<%= actor %>"/>
-		    <input type="hidden" name="action" value="<%= action(data) %>"/>
+		    <input type="hidden" name="action" value="<%= action(details) %>"/>
 		  </div>
 		</form>
 	      </td>

data/lib/repsheet_visualizer/version.rb

@@ -1,3 +1,3 @@
 module RepsheetVisualizer
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repsheet_visualizer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geoip
@@ -176,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1556641184775599076
+      hash: -3255625678553513827
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1556641184775599076
+      hash: -3255625678553513827
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25