Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
OHR Support
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
97
Issues
97
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
OHR Support
Commits
6d87b8b2
Commit
6d87b8b2
authored
Jan 06, 2013
by
Holger Just
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SQL Injection Vulnerability in Ruby on Rails (CVE-2012-5664) #1195
parent
bd509a40
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
139 additions
and
3 deletions
+139
-3
10-patches.rb
config/initializers/10-patches.rb
+139
-3
No files found.
config/initializers/10-patches.rb
View file @
6d87b8b2
...
...
@@ -152,13 +152,13 @@ module ActionController
end
end
# Backported fix for CVE-2012-2695
# https://groups.google.com/group/rubyonrails-security/browse_thread/thread/9782f44c4540cf59
# TODO: Remove this once we are on Rails >= 3.2.6
require
'active_record/base'
module
ActiveRecord
class
Base
class
<<
self
# Backported fix for CVE-2012-2695
# https://groups.google.com/group/rubyonrails-security/browse_thread/thread/9782f44c4540cf59
# TODO: Remove this once we are on Rails >= 3.2.6
def
sanitize_sql_hash_for_conditions
(
attrs
,
default_table_name
=
quoted_table_name
,
top_level
=
true
)
attrs
=
expand_hash_conditions_for_aggregates
(
attrs
)
...
...
@@ -187,6 +187,142 @@ module ActiveRecord
replace_bind_variables
(
conditions
,
expand_range_bind_variables
(
attrs
.
values
))
end
alias_method
:sanitize_sql_hash
,
:sanitize_sql_hash_for_conditions
# CVE-2012-5664
# https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/DCNTNp_qjFM
# TODO: remove once we are on Rails >= 3.2.10
def
method_missing
(
method_id
,
*
arguments
,
&
block
)
if
match
=
DynamicFinderMatch
.
match
(
method_id
)
attribute_names
=
match
.
attribute_names
super
unless
all_attributes_exists?
(
attribute_names
)
if
match
.
finder?
finder
=
match
.
finder
bang
=
match
.
bang?
# def self.find_by_login_and_activated(*args)
# options = args.extract_options!
# attributes = construct_attributes_from_arguments(
# [:login,:activated],
# args
# )
# finder_options = { :conditions => attributes }
# validate_find_options(options)
# set_readonly_option!(options)
#
# if options[:conditions]
# with_scope(:find => finder_options) do
# find(:first, options)
# end
# else
# find(:first, options.merge(finder_options))
# end
# end
self
.
class_eval
<<-
EOS
,
__FILE__
,
__LINE__
+
1
def self.
#{
method_id
}
(*args)
options = if args.length >
#{
attribute_names
.
size
}
args.extract_options!
else
{}
end
attributes = construct_attributes_from_arguments(
[:
#{
attribute_names
.
join
(
',:'
)
}
],
args
)
finder_options = { :conditions => attributes }
validate_find_options(options)
set_readonly_option!(options)
#{
'result = '
if
bang
}
if options[:conditions]
with_scope(:find => finder_options) do
find(:
#{
finder
}
, options)
end
else
find(:
#{
finder
}
, options.merge(finder_options))
end
#{
'result || raise(RecordNotFound, "Couldn\'t find #{name} with #{attributes.to_a.collect {|pair| "#{pair.first} = #{pair.second}"}.join(\', \')}")'
if
bang
}
end
EOS
send
(
method_id
,
*
arguments
)
elsif
match
.
instantiator?
instantiator
=
match
.
instantiator
# def self.find_or_create_by_user_id(*args)
# guard_protected_attributes = false
#
# if args[0].is_a?(Hash)
# guard_protected_attributes = true
# attributes = args[0].with_indifferent_access
# find_attributes = attributes.slice(*[:user_id])
# else
# find_attributes = attributes = construct_attributes_from_arguments([:user_id], args)
# end
#
# options = { :conditions => find_attributes }
# set_readonly_option!(options)
#
# record = find(:first, options)
#
# if record.nil?
# record = self.new { |r| r.send(:attributes=, attributes, guard_protected_attributes) }
# yield(record) if block_given?
# record.save
# record
# else
# record
# end
# end
self
.
class_eval
<<-
EOS
,
__FILE__
,
__LINE__
+
1
def self.
#{
method_id
}
(*args)
attributes = [:
#{
attribute_names
.
join
(
',:'
)
}
]
protected_attributes_for_create, unprotected_attributes_for_create = {}, {}
args.each_with_index do |arg, i|
if arg.is_a?(Hash)
protected_attributes_for_create = args[i].with_indifferent_access
else
unprotected_attributes_for_create[attributes[i]] = args[i]
end
end
find_attributes = (protected_attributes_for_create.merge(unprotected_attributes_for_create)).slice(*attributes)
options = { :conditions => find_attributes }
set_readonly_option!(options)
record = find(:first, options)
if record.nil?
record = self.new do |r|
r.send(:attributes=, protected_attributes_for_create, true) unless protected_attributes_for_create.empty?
r.send(:attributes=, unprotected_attributes_for_create, false) unless unprotected_attributes_for_create.empty?
end
#{
'yield(record) if block_given?'
}
#{
'record.save'
if
instantiator
==
:create
}
record
else
record
end
end
EOS
send
(
method_id
,
*
arguments
,
&
block
)
end
elsif
match
=
DynamicScopeMatch
.
match
(
method_id
)
attribute_names
=
match
.
attribute_names
super
unless
all_attributes_exists?
(
attribute_names
)
if
match
.
scope?
self
.
class_eval
<<-
EOS
,
__FILE__
,
__LINE__
+
1
def self.
#{
method_id
}
(*args) # def self.scoped_by_user_name_and_password(*args)
options = args.extract_options! # options = args.extract_options!
attributes = construct_attributes_from_arguments( # attributes = construct_attributes_from_arguments(
[:
#{
attribute_names
.
join
(
',:'
)
}
], args # [:user_name, :password], args
) # )
#
scoped(:conditions => attributes) # scoped(:conditions => attributes)
end # end
EOS
send
(
method_id
,
*
arguments
)
end
else
super
end
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment