repsheet_visualizer 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e94ea6745421bc91f5402614572cc4ba36c36892
-  data.tar.gz: 9f3ad8a26e7c2f161f82397b3a883b1d013fe104
+  metadata.gz: 1b737b725b7160b792f3ea3b2cb515e8a72b938a
+  data.tar.gz: 6c353ceeb6a2c36b639fc4822fd0c79c0ffe5133
 SHA512:
-  metadata.gz: e4b606bc0185ac1331cf4216bbfe570de19f0bfe510bf38d698c78869ca4d744de84493d486acff3a28198b8fa42ca397e540ad832d083c6c5263aa3d23622f6
-  data.tar.gz: 357db6d3cfb1fa9eba2fad54487f644ca0f38e2de0777c2c4cc3ddd5d2ef7d2a9f971bf0fd63c11f9112c6708430737a8a1a25529968c4b14a63cffdc38b7b49
+  metadata.gz: 4c154468545845141adf4d6d3d1cf96b35fc33c269bbe456f54862832c366ac554bacb28c2139de1e5ed5793d08b9c1be51b8222a9e296f45cf138cca54ed850
+  data.tar.gz: 41464c6aff82d33219ad62596123931ce7fa7e5f0801f9d30957cbb7e0ee5274545bcdb013b5699dc9e68feec703e740b9cf733a6fd3c357310d163046884b48

data/Gemfile.lock

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

data/lib/repsheet_visualizer/application/app.rb

@@ -18,6 +18,10 @@ class RepsheetVisualizer < Sinatra::Base
         "allow"
       end
     end
+
+    def h(text)
+      Rack::Utils.escape_html(text)
+    end
   end
 
   def redis_connection
@@ -41,7 +45,6 @@ class RepsheetVisualizer < Sinatra::Base
     defined?(settings.redis_expiry) ? (settings.redis_expiry * 60 * 60) : (24 * 60 * 60)
   end
 
-  # This is the actual application
   get '/' do
     @suspects, @blacklisted = Backend.summary(redis_connection)
     erb :actors
@@ -59,7 +62,8 @@ class RepsheetVisualizer < Sinatra::Base
 
   get '/activity/:ip' do
     @ip = params[:ip]
-    @data = Backend.activity(redis_connection)
+    @data = Backend.activity(redis_connection, @ip)
+    @action = action(@ip)
     erb :activity
   end
 

data/lib/repsheet_visualizer/application/backend.rb

@@ -24,8 +24,8 @@ class Backend
     [{},{}]
   end
 
-  def self.activity(connection)
-    connection.lrange("#{@ip}:requests", 0, -1)
+  def self.activity(connection, actor)
+    connection.lrange("#{actor}:requests", 0, -1)
   end
 
   def self.worldview(connection, database)
@@ -52,10 +52,10 @@ class Backend
       next if connection.get("#{actor}:repsheet:blacklist") == "true"
       suspects[actor] = Hash.new 0
       suspects[actor][:detected] = triggered_rules(connection, actor).join(", ")
-      suspects[actor][:total] = connection.zscore("offenders", actor).to_i
+      suspects[actor][:total] = score_actor(connection, actor, nil, true)
     end
 
-    [suspects, blacklist(connection)]
+    [suspects, blacklist(connection, true)]
   end
 
   def self.standard(connection)
@@ -68,29 +68,31 @@ class Backend
       if !detected.empty? && blacklist != "true"
         suspects[actor] = Hash.new 0
         suspects[actor][:detected] = detected.join(", ")
-        suspects[actor][:total] = score_actor(connection, actor)
+        suspects[actor][:total] = score_actor(connection, actor, detected)
       end
     end
 
     [suspects, blacklist(connection)]
   end
 
-  def self.blacklist(connection)
+  def self.blacklist(connection, optimized=false)
     blacklisted = {}
 
     connection.keys("*:*:blacklist").map {|d| d.split(":").first}.reject {|ip| ip.empty?}.each do |actor|
       next unless connection.get("#{actor}:repsheet:blacklist") == "true"
-
+      detected = triggered_rules(connection, actor)
       blacklisted[actor] = Hash.new 0
-      blacklisted[actor][:detected] = triggered_rules(connection, actor).join(", ")
-      blacklisted[actor][:total] = score_actor(connection, actor)
+      blacklisted[actor][:detected] = detected.join(", ")
+      blacklisted[actor][:total] = score_actor(connection, actor, detected, optimized)
     end
 
     blacklisted
   end
 
-  def self.score_actor(connection, actor)
-    connection.zrange("#{actor}:detected", 0, -1).reduce(0) do |memo, rule|
+  def self.score_actor(connection, actor, detected, optimized=false)
+    return connection.zscore("offenders", "#{actor}").to_i
+
+    detected.reduce(0) do |memo, rule|
       memo += connection.zscore("#{actor}:detected", rule).to_i
     end
   end

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

@@ -10,15 +10,15 @@
     <link href="<%= @mount %>css/bootstrap.css" rel="stylesheet">
     <style>
       body {
-      padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
       }
     </style>
     <link href="<%= @mount %>css/bootstrap-responsive.css" rel="stylesheet">
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
-        <script src="<%= @mount %>javascripts/html5shiv.js"></script>
-        <![endif]-->
+      <script src="<%= @mount %>javascripts/html5shiv.js"></script>
+    <![endif]-->
 
     <link rel="shortcut icon" href="/<%= @mount %>/images/favicon.ico">
 
@@ -47,9 +47,9 @@
       <h2>Activity for <%= @ip %></h2>
       <form method="post" action="<%= @mount %>action" class="button_to">
         <div>
-          <input value="<%= action(@ip) %>" type="submit" />
+          <input value="<%= @action %>" type="submit" />
           <input type="hidden" name="ip" value="<%= @ip %>"/>
-          <input type="hidden" name="action" value="<%= action(@ip) %>"/>
+          <input type="hidden" name="action" value="<%= @action %>"/>
         </div>
       </form>
 
@@ -59,7 +59,7 @@
 
       <ul>
         <% @data.each do |action| %>
-        <li><%= action %></li>
+        <li><%= h action %></li>
         <% end %>
       </ul>
     </div>

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

@@ -128,9 +128,9 @@
 		<td width=90>
 		  <form method="post" action="<%= @mount %>action" class="button_to">
 		    <div>
-		      <input value="<%= action(actor) %>" type="submit" />
+		      <input value="<%= action(actor, 'false') %>" type="submit" />
 		      <input type="hidden" name="ip" value="<%= actor %>"/>
-		      <input type="hidden" name="action" value="<%= action(actor) %>"/>
+		      <input type="hidden" name="action" value="<%= action(actor, 'false') %>"/>
 		    </div>
 		  </form>
 		</td>
@@ -166,9 +166,9 @@
 		<td width=70>
 		  <form method="post" action="<%= @mount %>action" class="button_to">
 		    <div>
-		      <input value="<%= action(actor, details[:blacklist]) %>" type="submit" />
+		      <input value="<%= action(actor, 'true') %>" type="submit" />
 		      <input type="hidden" name="ip" value="<%= actor %>"/>
-		      <input type="hidden" name="action" value="<%= action(actor, details[:blacklist]) %>"/>
+		      <input type="hidden" name="action" value="<%= action(actor, 'true') %>"/>
 		    </div>
 		  </form>
 		</td>

data/lib/repsheet_visualizer/version.rb

@@ -1,3 +1,3 @@
 module RepsheetVisualizer
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repsheet_visualizer
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Aaron Bedra