Attachment 863435 Details for Bug 1065517 – 4-1-beta-array_injection.patch

[patch] 4-1-beta-array_injection.patch

4-1-beta-array_injection.patch (text/plain), 2.19 KB, created by Kurt Seifried on 2014-02-14 21:40:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Seifried

Created: 2014-02-14 21:40:21 UTC

Size: 2.19 KB

patch

obsolete

>From 20406b952280259165c126d1e956719cccf4a2d0 Mon Sep 17 00:00:00 2001
>From: Aaron Patterson <aaron.patterson@gmail.com>
>Date: Wed, 12 Feb 2014 16:22:40 -0800
>Subject: [PATCH] Correctly escape PostgreSQL arrays.
>
>Thanks Godfrey Chan for reporting this!
>---
> .../lib/active_record/connection_adapters/postgresql/cast.rb      | 6 +++++-
> activerecord/test/cases/adapters/postgresql/datatype_test.rb      | 8 ++++++++
> 2 files changed, 13 insertions(+), 1 deletion(-)
>
>diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/cast.rb b/activerecord/lib/active_record/connection_adapters/postgresql/cast.rb
>index 35ce881..68da526 100644
>--- a/activerecord/lib/active_record/connection_adapters/postgresql/cast.rb
>+++ b/activerecord/lib/active_record/connection_adapters/postgresql/cast.rb
>@@ -142,12 +142,16 @@ module ActiveRecord
>             end
>           end
> 
>+          ARRAY_ESCAPE = "\\" * 2 * 2 # escape the backslash twice for PG arrays
>+
>           def quote_and_escape(value)
>             case value
>             when "NULL", Numeric
>               value
>             else
>-              "\"#{value.gsub(/"/,"\\\"")}\""
>+              value = value.gsub(/\\/, ARRAY_ESCAPE)
>+              value.gsub!(/"/,"\\\"")
>+              "\"#{value}\""
>             end
>           end
> 
>diff --git a/activerecord/test/cases/adapters/postgresql/datatype_test.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
>index 04a458f..5c3a797 100644
>--- a/activerecord/test/cases/adapters/postgresql/datatype_test.rb
>+++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
>@@ -78,6 +78,14 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
>      PostgresqlBitString, PostgresqlOid, PostgresqlTimestampWithZone, PostgresqlUUID].each(&:delete_all)
>   end
> 
>+  def test_array_escaping
>+    unknown = %(foo\\",bar,baz,\\)
>+    nicknames = ["hello_#{unknown}"]
>+    ar = PostgresqlArray.create!(nicknames: nicknames, id: 100)
>+    ar.reload
>+    assert_equal nicknames, ar.nicknames
>+  end
>+
>   def test_data_type_of_array_types
>     assert_equal :integer, @first_array.column_for_attribute(:commission_by_quarter).type
>     assert_equal :text, @first_array.column_for_attribute(:nicknames).type
>-- 
>1.8.4.1
>

Actions: View | Diff

Attachments on bug 1065517: 863434 | 863435