pg_application_name 1.0.0 → 1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_application_name (0.8.0)
+    pg_application_name (1.1.0)
       pg
       rails (>= 3.0.0)
       rspec-rails

data/lib/pg_application_name/postgres_monkey_patch.rb

@@ -5,14 +5,16 @@ require 'active_record/connection_adapters/abstract_adapter'
 module ActiveRecord::ConnectionAdapters
   class PostgreSQLAdapter < AbstractAdapter
     def set_server_variable(var, value)
-      var = var.to_s.gsub(/'/, "''")
-      value = value.to_s.gsub(/'/, "''")
-      execute("set #{var} = '#{value}'")
+      if var[0...63].to_s.split(' ').size == 1
+        value = value[0...63].to_s.gsub(/'/, "''")
+        execute("set #{var} = '#{value}'")
+      end
     end
 
     def get_user_variable(var)
-      var = var.gsub(/'/, "''")
-      return execute("show #{var}").values[0][0]
+      if var[0...63].split(' ').size == 1
+        return execute("show #{var}").values[0][0]
+      end
     end
 
     def set_server_application_name(value)

data/lib/pg_application_name/version.rb

@@ -1,4 +1,4 @@
 module PgApplicationName
   # the current version of this gem
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/pg_application_name.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
  s.name        = 'pg_application_name'
  s.version     = PgApplicationName::VERSION
  s.license     = 'New BSD License'
- s.date        = '2012-09-14'
+ s.date        = '2012-09-18'
  s.summary     = "Stamp an ActiveRecord connection to a postgres database with an appropriate application_name."
  s.description = "This gem stamps an identification mark on the postgres database connection using the postgres connection variable 'application_name'. Such a stamp can be viewed in pg_stat_activity."
  s.authors     = ["Keith Gabryelski"]

data/spec/pg_application_name/connection_pool_monkey_patch_spec.rb

@@ -3,5 +3,59 @@ require 'spec_helper'
 module ActiveRecord::ConnectionAdapters
   describe ConnectionPool do
 
+    describe "#connection_application_name=" do
+      it "sets @connection_application_name" do
+        ActiveRecord::ConnectionAdapters::ConnectionPool.connection_application_name = "New name"
+        ActiveRecord::ConnectionAdapters::ConnectionPool.
+            instance_variable_get(:@connection_application_name).should == "New name"
+      end
+    end # #connection_application_name=
+
+    describe "#connection_application_name" do
+      context "when @connection_application_name is set" do
+        it "returns @connection_application_name value" do
+          ActiveRecord::ConnectionAdapters::ConnectionPool.connection_application_name.should == "New name"
+        end
+      end
+
+      context "when @connection_application_name isn't set" do
+        it "sets and returns @connection_application_name" do
+          ActiveRecord::ConnectionAdapters::ConnectionPool.connection_application_name = nil
+          ActiveRecord::ConnectionAdapters::ConnectionPool.connection_application_name.
+              should == "#{Rails.application.class.name}/#{Process.pid}"
+        end
+      end
+    end # #connection_application_name
+
+    describe "#initialize_connection_application_name" do
+      it "sets @connection_application_name and sets server_application_name" do
+        ActiveRecord::ConnectionAdapters::ConnectionPool.initialize_connection_application_name("New application name")
+        ActiveRecord::ConnectionAdapters::ConnectionPool.
+            instance_variable_get(:@connection_application_name).should == "New application name"
+        ActiveRecord::Base.connection.get_user_variable("application_name").should == "New application name"
+      end
+    end
+
+    describe "alias_method_chain :new_connection, :set_application_name" do
+      context "new_connection_without_set_application_name" do
+        it "calls new_connection method" do
+          ActiveRecord::Base.connection.set_server_variable(:application_name, "foo")
+          ActiveRecord::Base.connection_pool.send(:new_connection_without_set_application_name)
+          ActiveRecord::Base.connection.execute("select application_name from pg_stat_activity;").
+              values.flatten.select{|app_name| app_name == "foo"}.should have(1).item
+        end
+      end # new_connection_without_set_application_name
+
+      context "new_connection" do
+        it "calls new_connection_with_set_application_name method" do
+          ActiveRecord::Base.connection.set_server_variable(:application_name, "foo")
+          ActiveRecord::ConnectionAdapters::ConnectionPool.connection_application_name = "bar"
+          ActiveRecord::Base.connection_pool.send(:new_connection)
+          ActiveRecord::Base.connection.execute("select application_name from pg_stat_activity;").
+              values.flatten.select{|app_name| app_name == "bar"}.should have(1).item
+        end
+      end # new_connection
+    end # new_connection_without_set_application_name
+
   end # ConnectionPool
 end # ActiveRecord::ConnectionAdapters

data/spec/pg_application_name/postgres_monkey_patch_spec.rb

@@ -3,5 +3,45 @@ require 'spec_helper'
 module ActiveRecord::ConnectionAdapters
   describe PostgreSQLAdapter do
 
+    describe "set_server_variable" do
+      context "when call the method with safe params" do
+        it "sets application name to the 'New name'" do
+          ActiveRecord::Base.connection.set_server_variable(:application_name, "New name")
+          ActiveRecord::Base.connection.execute("select application_name from pg_stat_activity;").
+              values.flatten.select{|app_name| app_name == "New name"}.should have(1).item
+        end
+      end # when call the method with safe params
+
+      context "when call the method without safe params" do
+        it "injection did not work" do
+          ActiveRecord::Base.connection.
+              set_server_variable(:application_name, "New name'; select * from pg_stat_activity where application_name = 'New name").
+              values.should be_blank
+        end
+      end # when call the method without safe params
+    end # set_server_variable
+
+    describe "get_user_variable" do
+      context "when call the method with safe param" do
+        it "returns user variable" do
+          ActiveRecord::Base.connection.get_user_variable("application_name").
+              should == "#{Rails.application.class.name}/#{Process.pid}"
+        end
+      end # when call the method with safe param
+
+      context "when parameter has blank space" do
+        it "returns nil" do
+          ActiveRecord::Base.connection.get_user_variable("application name'").should be_nil
+        end
+      end # when parameter has blank space
+    end # get_user_variable
+
+    describe "set_server_application_name" do
+      it "should receive set_server_variable method" do
+        ActiveRecord::Base.connection.should_receive(:set_server_variable).with(:application_name, "new name")
+        ActiveRecord::Base.connection.set_server_application_name("new name")
+      end
+    end # set_server_application_name
+
   end # PostgreSQLAdapter
 end # ActiveRecord::ConnectionAdapters

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_application_name
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg