repsheet_visualizer 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0bf1075fbcd0219cc0d7aaf9e414bce1c97f4e82
+  data.tar.gz: 07a44a473a4d62fc5ef5266f417f31dbce69f6b8
+SHA512:
+  metadata.gz: 307376a60eeea4e67ed8a60b4cdb9c5064ed56281e5199ce8ced8854905149dcbd164540dee2ab0a132e413bb183d667de7dd0803747001bc56195b1fe4ff577
+  data.tar.gz: 087dd95a4f7601f36e895f1380dc169b008b269e2c25ba8663939ce15ab0c9fa42370e1b701bf71a596396e49c6988779dfd8a8ddbb4199f8ab872b65e2e579b

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3@repsheet_vizualizer --create
+rvm use ruby-2.0@repsheet_vizualizer --create

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    repsheet_visualizer (0.1.3)
+    repsheet_visualizer (0.1.7)
       geoip
       json
       redis
@@ -10,6 +10,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    diff-lcs (1.2.4)
     geoip (1.2.1)
     json (1.8.0)
     kgio (2.8.0)
@@ -19,8 +20,16 @@ GEM
     raindrops (0.11.0)
     rake (10.0.4)
     redis (3.0.4)
-    sinatra (1.4.2)
-      rack (~> 1.5, >= 1.5.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.3)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.1)
+    sinatra (1.4.3)
+      rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     tilt (1.4.1)
@@ -36,4 +45,5 @@ DEPENDENCIES
   bundler
   rake
   repsheet_visualizer!
+  rspec
   unicorn

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new('spec')
+
+task :default => :spec

data/lib/repsheet_visualizer/application/app.rb

@@ -2,9 +2,9 @@ require 'geoip'
 require 'sinatra'
 require 'redis'
 require 'json'
+require_relative 'backend'
 
 class RepsheetVisualizer < Sinatra::Base
-  # Grab the mount point before every request
   before do
     @mount = mount
   end
@@ -20,7 +20,6 @@ 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
@@ -42,101 +41,25 @@ class RepsheetVisualizer < Sinatra::Base
     defined?(settings.redis_expiry) ? (settings.redis_expiry * 60 * 60) : (24 * 60 * 60)
   end
 
-  # TODO: These methods should get moved out to another place
-  def summary(connection)
-    suspects = {}
-    blacklisted = {}
-
-    if connection.exists("offenders")
-      connection.zrevrangebyscore("offenders", "+inf", "0").each do |actor|
-        next if connection.get("#{actor}:repsheet:blacklist") == "true"
-        suspects[actor] = Hash.new 0
-        suspects[actor][:detected] = connection.smembers("#{actor}:detected").join(", ")
-        suspects[actor][:total] = connection.zscore("offenders", actor).to_i
-      end
-
-      connection.keys("*:*:blacklist").map {|d| d.split(":").first}.reject {|ip| ip.empty?}.each do |actor|
-        connection.get("#{actor}:repsheet:blacklist") == "true"
-        blacklisted[actor] = Hash.new 0
-        blacklisted[actor][:detected] = connection.smembers("#{actor}:detected").join(", ")
-        connection.smembers("#{actor}:detected").each do |rule|
-          blacklisted[actor][:total] += connection.get("#{actor}:#{rule}:count").to_i
-        end
-      end
-    else
-      connection.keys("*:requests").map {|d| d.split(":").first}.reject {|ip| ip.empty?}.each do |actor|
-        detected = connection.smembers("#{actor}:detected").join(", ")
-        blacklist = connection.get("#{actor}:repsheet:blacklist")
-
-        if !detected.empty? && blacklist != "true"
-          suspects[actor] = Hash.new 0
-          suspects[actor][:detected] = detected
-          connection.smembers("#{actor}:detected").each do |rule|
-            suspects[actor][:total] += connection.get("#{actor}:#{rule}:count").to_i
-          end
-        end
-
-        if blacklist == "true"
-          blacklisted[actor] = Hash.new 0
-          blacklisted[actor][:detected] = detected
-          connection.smembers("#{actor}:detected").each do |rule|
-            blacklisted[actor][:total] += connection.get("#{actor}:#{rule}:count").to_i
-          end
-        end
-      end
-    end
-
-    [suspects.sort_by{|k,v| -v[:total]}.take(10), blacklisted]
-  end
-
-  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
-
-  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)
-      next if details.nil?
-      data[address] = [details.latitude, details.longitude]
-    end
-    data
-  end
-
   # This is the actual application
   get '/' do
-    @suspects, @blacklisted = summary(redis_connection)
+    @suspects, @blacklisted = Backend.summary(redis_connection)
     erb :actors
   end
 
   get '/breakdown' do
-    @data, @aggregate = breakdown(redis_connection)
+    @data, @aggregate = Backend.breakdown(redis_connection)
     erb :breakdown
   end
 
   get '/worldview' do
-    @data = worldview(redis_connection, geoip_database)
+    @data = Backend.worldview(redis_connection, geoip_database)
     erb :worldview
   end
 
   get '/activity/:ip' do
     @ip = params[:ip]
-    @data = activity(redis_connection)
+    @data = Backend.activity(redis_connection)
     erb :activity
   end
 

data/lib/repsheet_visualizer/application/backend.rb

@@ -0,0 +1,97 @@
+class Backend
+  def self.summary(connection)
+    if connection.exists("offenders")
+      suspects, blacklisted = optimized(connection)
+    else
+      suspects, blacklisted = standard(connection)
+    end
+
+    [suspects.sort_by{|k,v| -v[:total]}.take(10), blacklisted]
+  end
+
+  def self.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
+
+  def self.activity(connection)
+    connection.lrange("#{@ip}:requests", 0, -1)
+  end
+
+  def self.worldview(connection, database)
+    data = {}
+    offenders = connection.keys("*:repsheet*").map {|o| o.split(":").first}
+    offenders.each do |address|
+      details = database.country(address)
+      next if details.nil?
+      data[address] = [details.latitude, details.longitude]
+    end
+    data
+  end
+
+  private
+
+  def self.triggered_rules(connection, actor)
+    connection.zrange("#{actor}:detected", 0, -1)
+  end
+
+  def self.optimized(connection)
+    suspects = {}
+
+    connection.zrevrangebyscore("offenders", "+inf", "0").each do |actor|
+      next if connection.get("#{actor}:repsheet:blacklist") == "true"
+      suspects[actor] = Hash.new 0
+      suspects[actor][:detected] = detected.join(", ")
+      suspects[actor][:total] = connection.zscore("offenders", actor).to_i
+    end
+
+    [suspects, blacklist(connection)]
+  end
+
+  def self.standard(connection)
+    suspects = {}
+
+    connection.keys("*:requests").map {|d| d.split(":").first}.reject {|ip| ip.empty?}.each do |actor|
+      detected = triggered_rules(connection, actor)
+      blacklist = connection.get("#{actor}:repsheet:blacklist")
+
+      if !detected.empty? && blacklist != "true"
+        suspects[actor] = Hash.new 0
+        suspects[actor][:detected] = detected.join(", ")
+        suspects[actor][:total] = score_actor(connection, actor)
+      end
+    end
+
+    [suspects, blacklist(connection)]
+  end
+
+  def self.blacklist(connection)
+    blacklisted = {}
+
+    connection.keys("*:*:blacklist").map {|d| d.split(":").first}.reject {|ip| ip.empty?}.each do |actor|
+      next unless connection.get("#{actor}:repsheet:blacklist") == "true"
+
+      blacklisted[actor] = Hash.new 0
+      blacklisted[actor][:detected] = triggered_rules(connection, actor).join(", ")
+      blacklisted[actor][:total] = score_actor(connection, actor)
+    end
+
+    blacklisted
+  end
+
+  def self.score_actor(connection, actor)
+    connection.zrange("#{actor}:detected", 0, -1).reduce(0) do |memo, rule|
+      memo += connection.zscore("#{actor}:detected", rule).to_i
+    end
+  end
+end

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

@@ -35,7 +35,7 @@
           <div class="nav-collapse collapse">
             <ul class="nav">
               <li><a href="<%= @mount %>">Actors</a></li>
-              <li><a href="<%= @mount %>breakdown">Breakdown</a></li>
+              <!-- <li><a href="<%= @mount %>breakdown">Breakdown</a></li> -->
               <li><a href="<%= @mount %>worldview">Worldview</a></li>
             </ul>
           </div>

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

@@ -90,7 +90,7 @@
 	  <div class="nav-collapse collapse">
 	    <ul class="nav">
 	      <li class="active"><a href="<%= @mount %>">Actors</a></li>
-	      <li><a href="<%= @mount %>breakdown">Breakdown</a></li>
+	      <!-- <li><a href="<%= @mount %>breakdown">Breakdown</a></li> -->
 	      <li><a href="<%= @mount %>worldview">Worldview</a></li>
 	    </ul>
 	  </div>

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

@@ -38,7 +38,7 @@
 	  <div class="nav-collapse collapse">
 	    <ul class="nav">
 	      <li><a href="<%= @mount %>">Actors</a></li>
-	      <li><a href="<%= @mount %>breakdown">Breakdown</a></li>
+	      <!-- <li><a href="<%= @mount %>breakdown">Breakdown</a></li> -->
 	      <li class="active"><a href="<%= @mount %>worldview">Worldview</a></li>
 	    </ul>
 	  </div>

data/lib/repsheet_visualizer/version.rb

@@ -1,3 +1,3 @@
 module RepsheetVisualizer
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/repsheet_visualizer.rb

@@ -1 +1,2 @@
 require 'repsheet_visualizer/application/app.rb'
+require 'repsheet_visualizer/application/backend.rb'

data/repsheet_visualizer.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "unicorn"
+  spec.add_development_dependency "rspec"
 end

data/script/fill

@@ -6,21 +6,29 @@ r = Redis.new
 r.flushdb
 
 255.times do |i|
-  r.set("1.1.1.#{i}:950001:count", rand(1000))
-  r.lpush("1.1.1.#{i}:requests", "request")
-  r.sadd("1.1.1.#{i}:detected", "950001")
+  r.zincrby("1.1.1.#{i}:detected", rand(1000), "950001")
+  r.lpush("1.1.1.#{i}:requests", "123, Chrome, GET, foo, bar")
+
   if i > 220
     r.set("1.1.1.#{i}:repsheet:blacklist", "true")
   end
+
+  r.expire("1.1.1.#{i}:requests", (24 * 60 * 60))
+  r.expire("1.1.1.#{i}:detected", (24 * 60 * 60))
 end
 
 255.times do |i|
-  r.lpush("2.2.2.#{i}:requests", "request")
+  r.lpush("1.1.1.#{i}:requests", "123, Chrome, POST, foo, bar")
 end
 
 
 20.times do |i|
-  r.sadd("1.1.1.1:detected", "9900#{i + 10}")
-  r.set("1.1.1.1:9900#{i + 10}:count", 1000)
+  r.zincrby("1.1.1.1:detected", 1000, "9900#{i + 10}")
 end
 
+r.lpush("1.1.1.1:requests", "123, Chrome, PUT, foo, bar")
+r.lpush("1.1.1.1:requests", "123, Chrome, DELETE, foo, bar")
+r.lpush("1.1.1.1:requests", "123, Chrome, HEAD, foo, bar")
+r.lpush("1.1.1.1:requests", "123, Chrome, TRACE, foo, bar")
+r.lpush("1.1.1.1:requests", "123, Chrome, OPTIONS, foo, bar")
+r.lpush("1.1.1.1:requests", "123, Chrome, CONNECT, foo, bar")

data/spec/backend_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Backend do
+  before(:each) {@connection = Redis.new}
+  after(:each) {@connection.flushdb}
+
+  describe ".summary" do
+    it "call the optimized routine if the proper keys exist" do
+      @connection.zincrby("offenders", 10, "1.1.1.1")
+      @connection.sadd("detected", "950001")
+      Backend.should_receive(:optimized) { [{},{}] }
+      Backend.summary(@connection)
+    end
+
+    it "calls the standard routine if they don't" do
+      @connection.del("offenders")
+      @connection.sadd("detected", "950001")
+      Backend.should_receive(:standard) { [{},{}] }
+      Backend.summary(@connection)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'redis'
+require_relative '../lib/repsheet_visualizer/application/backend'
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.order = 'random'
+end

metadata

@@ -1,126 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: repsheet_visualizer
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - Aaron Bedra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geoip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Visualizer for Repsheet
@@ -132,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .rvmrc
 - Gemfile
 - Gemfile.lock
@@ -141,6 +141,7 @@ files:
 - bin/repsheet_visualizer
 - lib/repsheet_visualizer.rb
 - lib/repsheet_visualizer/application/app.rb
+- lib/repsheet_visualizer/application/backend.rb
 - lib/repsheet_visualizer/application/public/css/blue/asc.gif
 - lib/repsheet_visualizer/application/public/css/blue/bg.gif
 - lib/repsheet_visualizer/application/public/css/blue/desc.gif
@@ -162,29 +163,32 @@ files:
 - lib/repsheet_visualizer/version.rb
 - repsheet_visualizer.gemspec
 - script/fill
+- spec/backend_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/Repsheet/visualizer
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A visualization package for Repsheet
-test_files: []
+test_files:
+- spec/backend_spec.rb
+- spec/spec_helper.rb