lrd_rack_bug 0.3.1 → 0.3.1.1

data/lib/rack/bug/autoloading.rb

@@ -1,6 +1,7 @@
 class Rack::Bug
   autoload :FilteredBacktrace,      "rack/bug/filtered_backtrace"
   autoload :Options,                "rack/bug/options"
+  autoload :Logger,                 "rack/bug/logger"
   autoload :Panel,                  "rack/bug/panel"
   autoload :PanelApp,               "rack/bug/panel_app"
   autoload :ParamsSignature,        "rack/bug/params_signature"

data/lib/rack/bug/logger.rb

@@ -0,0 +1,47 @@
+class Rack::Bug
+  class Logger
+    def initialize(level, path)
+      @level = level
+      @log_path = path
+      @logfile = nil
+    end
+
+    attr_accessor :level
+
+    DEBUG    =  0
+    INFO     =  1
+    WARN     =  2
+    ERROR    =  3
+    FATAL    =  4
+    UNKNOWN  =  5
+
+    def log(severity, message)
+      if defined? Rails and not Rails.logger.nil?
+        Rails.logger.add(severity, "[Rack::Bug]: " + message)
+      end
+
+      if severity >= @level
+        logfile.puts(message)
+      end
+    end
+
+    def logfile
+      @logfile ||= File::open(path, "a+")
+    rescue
+      $stderr
+    end
+
+    def debug;   log(DEBUG,   yield) if @level >= DEBUG;   end
+    def info;    log(INFO,    yield) if @level >= INFO;    end
+    def warn;    log(WARN,    yield) if @level >= WARN;    end
+    def error;   log(ERROR,   yield) if @level >= ERROR;   end
+    def fatal;   log(FATAL,   yield) if @level >= FATAL;   end
+    def unknown; log(UNKNOWN, yield) if @level >= UNKNOWN; end
+  end
+
+  module Logging
+    def logger(env)
+      env["rack-bug.logger"]
+    end
+  end
+end

data/lib/rack/bug/options.rb

@@ -64,13 +64,15 @@ class Rack::Bug
 
     def initialize_options(options={})
       @default_options = {
-        'rack-bug.ip_masks' => [IPAddr.new("127.0.0.1")],
-        'rack-bug.password' => nil,
-        'rack-bug.verbose'  => nil,
-        'rack-bug.secret_key' => nil,
-        'rack-bug.intercept_redirects' => false,
-        'rack-bug.panels' => [],
-        'rack-bug.panel_classes' => [
+        'rack-bug.ip_masks'             =>  [IPAddr.new("127.0.0.1")],
+        'rack-bug.password'             =>  nil,
+        'rack-bug.verbose'              =>  nil,
+        'rack-bug.secret_key'           =>  nil,
+        'rack-bug.intercept_redirects'  =>  false,
+        'rack-bug.panels'               =>  [],
+        'rack-bug.log_level'            =>  Logger::DEBUG,
+        'rack-bug.log_path'             =>  "log/rack_bug.log",
+        'rack-bug.panel_classes'        =>  [
           RailsInfoPanel,
           TimerPanel,
           RequestVariablesPanel,

data/lib/rack/bug/panels/speedtracer_panel.rb

@@ -49,19 +49,17 @@ class Rack::Bug
       end
 
       def make_database
-      #  begin
-          require 'rack/bug/panels/speedtracer_panel/database'
-          return Database.new("speedtracer")
-#        rescue Object => ex
-#          msg = "Speedtracer issue while loading SQLite DB:" + [ex.class, ex.message, ex.backtrace[0..4]].inspect 
-#          if Rails.logger
-#            Rails.logger.debug msg
-#          else
-#            puts msg
-#          end
-#
-#          return {}
-#        end
+        require 'rack/bug/panels/speedtracer_panel/database'
+        return Database.new("speedtracer")
+      rescue Object => ex
+        msg = "Speedtracer issue while loading SQLite DB:" + [ex.class, ex.message, ex.backtrace[0..4]].inspect 
+        if Rails.logger
+          Rails.logger.debug msg
+        else
+          puts msg
+        end
+
+        return {}
       end
 
     end

data/lib/rack/bug.rb

@@ -3,6 +3,7 @@ require "digest"
 require "rack"
 require "digest/sha1"
 require "rack/bug/autoloading"
+require 'rack/bug/logger'
 
 class Rack::Bug
   include Options
@@ -29,14 +30,16 @@ class Rack::Bug
     @app = asset_server(app)
     instance_eval(&block) if block_given?
     
+    @logger = Logger.new(read_option(:log_level), read_option(:log_path))
     @toolbar = Toolbar.new(RedirectInterceptor.new(@app))
   end
-
+  attr_reader :logger
 
   def call(env)
     env.replace @default_options.merge(env)
     @env = env
     @original_request = Rack::Request.new(@env)
+    env['rack-bug.logger'] = @logger
 
     if toolbar_requested? && ip_authorized? && password_authorized? && toolbar_xhr?
       @toolbar.call(env)
@@ -81,17 +84,30 @@ private
   def ip_authorized?
     return true unless options["rack-bug.ip_masks"]
 
-    options["rack-bug.ip_masks"].any? do |ip_mask|
-      ip_mask.include?(IPAddr.new(@original_request.ip))
+    logger.debug{ "Checking #{@original_request.ip} against ip_masks" }
+    ip = IPAddr.new(@original_request.ip)
+
+    mask = options["rack-bug.ip_masks"].find do |ip_mask|
+      ip_mask.include?(ip)
+    end
+    if mask
+      logger.debug{ "Matched #{mask}" }
+      return true
+    else
+      logger.debug{ "Matched no masks" }
+      return false
     end
   end
 
   def password_authorized?
     return true unless options["rack-bug.password"]
 
+    logger.debug{"Checking password"}
+
     expected_sha = Digest::SHA1.hexdigest ["rack_bug", options["rack-bug.password"]].join(":")
     actual_sha = @original_request.cookies["rack_bug_password"]
 
+    logger.debug{"Password result: #{actual_sha == expected_sha}"}
     actual_sha == expected_sha
   end
 end

data/lrd_rack_bug.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lrd_rack_bug}
-  s.version = "0.3.1"
+  s.version = "0.3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp", "Evan Dorn", "Judson Lester"]

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: lrd_rack_bug
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 81
   prerelease: 
   segments: 
   - 0
   - 3
   - 1
-  version: 0.3.1
+  - 1
+  version: 0.3.1.1
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -79,6 +80,7 @@ files:
 - lib/rack/bug/views/error.html.erb
 - lib/rack/bug/options.rb
 - lib/rack/bug/panel.rb
+- lib/rack/bug/logger.rb
 - lib/rack/bug/filtered_backtrace.rb
 - lib/rack/bug/panels/request_variables_panel.rb
 - lib/rack/bug/panels/redis_panel.rb