better_newrelic_sql_obfuscator 1.0.0 → 1.0.1

data/.rvmrc

@@ -0,0 +1 @@
+rvm use ruby-1.8.7@better_newrelic_obfuscator --create --install

data/Gemfile

@@ -6,9 +6,10 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "minitest", ">= 0"
-  gem "yard", "~> 0.6.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem 'rake'
+  gem "minitest"
+  gem "yard"
+  gem "bundler"
+  gem "jeweler"
+  gem "rcov"
 end

data/Gemfile.lock

@@ -9,14 +9,15 @@ GEM
     minitest (2.10.0)
     rake (0.9.2.2)
     rcov (0.9.11)
-    yard (0.6.8)
+    yard (0.7.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.4)
+  bundler
+  jeweler
   minitest
+  rake
   rcov
-  yard (~> 0.6.0)
+  yard

data/Rakefile

@@ -28,7 +28,7 @@ Jeweler::RubygemsDotOrgTasks.new
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/better_newrelic_sql_obfuscator.gemspec

@@ -4,20 +4,21 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{better_newrelic_sql_obfuscator}
-  s.version = "1.0.0"
+  s.name = "better_newrelic_sql_obfuscator"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Renewable Funding, LLC"]
-  s.date = %q{2012-01-11}
-  s.description = %q{see Summary}
-  s.email = %q{devteam@renewfund.com}
+  s.date = "2012-01-12"
+  s.description = "see Summary"
+  s.email = "devteam@renewfund.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
   ]
   s.files = [
     ".document",
+    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -26,36 +27,39 @@ Gem::Specification.new do |s|
     "VERSION",
     "better_newrelic_sql_obfuscator.gemspec",
     "lib/better_newrelic_sql_obfuscator.rb",
+    "test/better_newrelic_sql_obfuscator_unit_test.rb",
     "test/helper.rb"
   ]
-  s.homepage = %q{http://github.com/projectdx/better_newrelic_sql_obfuscator}
+  s.homepage = "http://github.com/projectdx/better_newrelic_sql_obfuscator"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Obfuscate SQL in NewRelic in a way that doesn't suck}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Obfuscate SQL in NewRelic in a way that doesn't suck"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end
 end

data/lib/better_newrelic_sql_obfuscator.rb

@@ -54,7 +54,7 @@ module BetterNewrelicSqlObfuscator
       obfuscated_sql = [field_expression, comparison, obfuscate_value(sensitive_data)].compact.join
 
       # Don't obfuscate if we have a field expression that's on the whitelist or is on a 'nickname' field
-      if field_expression.present?
+      unless field_expression.to_s.empty?
         table_name, field_name = field_expression.to_s.gsub('"', '').split('.')
         case
         when whitelisted?('%s.%s' % [table_name, field_name])

data/test/better_newrelic_sql_obfuscator_unit_test.rb

@@ -0,0 +1,84 @@
+require File.expand_path( File.dirname( __FILE__ ) + '/helper' )
+require 'minitest/autorun'
+
+class BetterNewrelicSqlObfuscatorUnitTest < MiniTest::Unit::TestCase
+
+  describe ".obfuscate_value" do
+    it "should salt and md5" do
+      expected = "'%s'" % Digest::MD5.hexdigest('3:foo')
+      assert_equal expected, BetterNewrelicSqlObfuscator.obfuscate_value('foo')
+    end
+  end
+
+  describe '.obfuscate (generic)' do
+
+    def assert_obfuscated_eq(sql, expected, message = nil)
+      actual = BetterNewrelicSqlObfuscator.obfuscate(sql)
+      assert_equal expected, actual, message
+    end
+  
+    def assert_not_obfuscated(sql, message = nil)
+      assert_obfuscated_eq(sql, sql, message)
+    end
+  
+    def ob_value(value)
+      BetterNewrelicSqlObfuscator.obfuscate_value(value)
+    end
+  
+    it "should replace quoted strings floating out there by themselves" do
+      assert_obfuscated_eq  %Q{select * from some_table where f_table_name = 'sensitive data'},
+      %Q{select * from some_table where f_table_name = #{ob_value("sensitive data")}}
+    end
+
+    it "should be copacetic with double-apostrophe quoting" do
+      assert_obfuscated_eq  %Q{select * from some_table where f_table_name = '' and b_table_name = 'sensitive'' data'},
+      %Q{select * from some_table where f_table_name = #{ob_value('')} and b_table_name = #{ob_value("sensitive'' data")}}
+    end
+
+    it "should be copacetic with E'foo' string quoting" do
+      assert_obfuscated_eq  %Q{select * from some_table where f_table_name = E'sensitive\\' data'},
+      %Q{select * from some_table where f_table_name = E#{ob_value("sensitive\\' data")}}
+    end
+
+    it "should replace quoted strings when compared against a double-quoted table-dot-field expression" do
+      assert_obfuscated_eq  %Q{select * from some_table where "some_table"."some_field" = 'sensitive data'},
+      %Q{select * from some_table where "some_table"."some_field" = #{ob_value('sensitive data')}}
+    end
+
+    it "should replace quoted strings when compared against a double-quoted table-dot-field expression using whatever comparison operator" do
+      assert_obfuscated_eq  %Q{select * from some_table where "some_table"."some_field" somehow_matches 'sensitive data'},
+      %Q{select * from some_table where "some_table"."some_field" somehow_matches #{ob_value('sensitive data')}}
+    end
+
+    it "should not replace quoted strings if they're used against a field that's on the whitelist" do
+      begin
+        BetterNewrelicSqlObfuscator.whitelist 'some_table.whitelisted_field'
+        assert_not_obfuscated %Q{select * from some_table where "some_table"."whitelisted_field"='perfectly harmless value'}
+      ensure
+        BetterNewrelicSqlObfuscator::WhitelistHash.delete('some_table.whitelisted_field') # don't clobber config/initializers
+      end
+    end
+
+    it "should not eat subsequent expressions" do
+      begin
+        BetterNewrelicSqlObfuscator.whitelist 'some_table.whitelisted_field'
+        assert_obfuscated_eq \
+        %Q{select * from some_table where "some_table"."whitelisted_field"='perfectly harmless value' and "secret"."address"=E'i am the \\'lizard king'},
+        %Q{select * from some_table where "some_table"."whitelisted_field"='perfectly harmless value' and "secret"."address"=E#{ob_value('i am the \\\'lizard king')}}
+      ensure
+        BetterNewrelicSqlObfuscator::WhitelistHash.delete('some_table.whitelisted_field') # don't clobber config/initializers
+      end
+    end
+
+    it "should not replace quoted strings if an arbitrary block expression returns true on them" do
+      ob_proc = Proc.new { |table, field| [table, field] == %w[wibble wobble] }
+      begin
+        BetterNewrelicSqlObfuscator.dont_obfuscate_table_and_field(&ob_proc)
+        assert_not_obfuscated %Q{select * from some_table where "wibble"."wobble"='a_nickname'}
+      ensure
+        BetterNewrelicSqlObfuscator::DontObfuscateProcs.delete(ob_proc) # don't clobber config/initializers
+      end
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: better_newrelic_sql_obfuscator
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Renewable Funding, LLC
@@ -15,12 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-11 00:00:00 -08:00
-default_executable: 
+date: 2012-01-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id001
+  name: rake
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,60 +41,54 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id002
   name: minitest
-  requirement: *id001
+  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 0
-        - 6
-        - 0
-        version: 0.6.0
+        version: "0"
+  version_requirements: *id003
   name: yard
-  requirement: *id002
+  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
+        version: "0"
+  version_requirements: *id004
   name: bundler
-  requirement: *id003
+  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
+        - 0
+        version: "0"
+  version_requirements: *id005
   name: jeweler
-  requirement: *id004
+  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,8 +97,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id006
   name: rcov
-  requirement: *id005
+  prerelease: false
   type: :development
 description: see Summary
 email: devteam@renewfund.com
@@ -105,6 +112,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -113,8 +121,8 @@ files:
 - VERSION
 - better_newrelic_sql_obfuscator.gemspec
 - lib/better_newrelic_sql_obfuscator.rb
+- test/better_newrelic_sql_obfuscator_unit_test.rb
 - test/helper.rb
-has_rdoc: true
 homepage: http://github.com/projectdx/better_newrelic_sql_obfuscator
 licenses: 
 - MIT
@@ -144,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Obfuscate SQL in NewRelic in a way that doesn't suck