activerecord 3.1.5 → 3.1.6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Rails 3.1.6 (Jun 12, 2012)
+
+*   protect against the nesting of hashes changing the
+    table context in the next call to build_from_hash. This fix
+    covers this case as well.
+
+    CVE-2012-2695
+
 ## Rails 3.1.5 (May 31, 2012) ##
 
 *   Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -423,7 +423,9 @@ module ActiveRecord
       end
 
       def tables(name = nil, database = nil) #:nodoc:
-        sql = ["SHOW TABLES", database].compact.join(' IN ')
+        sql = "SHOW TABLES "
+        sql << "IN #{quote_table_name(database)} " if database
+
         execute(sql, 'SCHEMA').collect do |field|
           field.first
         end

data/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -630,7 +630,10 @@ module ActiveRecord
       end
 
       def tables(name = nil, database = nil) #:nodoc:
-        result = execute(["SHOW TABLES", database].compact.join(' IN '), 'SCHEMA')
+        sql = "SHOW TABLES "
+        sql << "IN #{quote_table_name(database)} " if database
+
+        result = execute(sql, 'SCHEMA')
         tables = result.collect { |field| field[0] }
         result.free
         tables

data/lib/active_record/relation/predicate_builder.rb

@@ -1,16 +1,16 @@
 module ActiveRecord
   class PredicateBuilder # :nodoc:
-    def self.build_from_hash(engine, attributes, default_table, check_column = true)
+    def self.build_from_hash(engine, attributes, default_table, allow_table_name = true)
       predicates = attributes.map do |column, value|
         table = default_table
 
-        if value.is_a?(Hash)
+        if allow_table_name && value.is_a?(Hash)
           table = Arel::Table.new(column, engine)
           build_from_hash(engine, value, table, false)
         else
           column = column.to_s
 
-          if check_column && column.include?('.')
+          if allow_table_name && column.include?('.')
             table_name, column = column.split('.', 2)
             table = Arel::Table.new(table_name, engine)
           end

data/lib/active_record/version.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 1
-  - 5
-  version: 3.1.5
+  - 6
+  version: 3.1.6
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-31 00:00:00 Z
+date: 2012-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 3
         - 1
-        - 5
-        version: 3.1.5
+        - 6
+        version: 3.1.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 3
         - 1
-        - 5
-        version: 3.1.5
+        - 6
+        version: 3.1.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency