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
c3d3bec4
Commit
c3d3bec4
authored
Jun 13, 2012
by
Holger Just
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix SQL injection via nested hashes in conditions (CVE-2012-2694) #1036
parent
8d56d327
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
4 deletions
+11
-4
10-patches.rb
config/initializers/10-patches.rb
+11
-4
No files found.
config/initializers/10-patches.rb
View file @
c3d3bec4
...
@@ -116,26 +116,33 @@ module ActionController
...
@@ -116,26 +116,33 @@ module ActionController
end
end
end
end
# Backported fix for CVE-2012-2660
# Backported fix for
# CVE-2012-2660
# https://groups.google.com/group/rubyonrails-security/browse_thread/thread/f1203e3376acec0f
# https://groups.google.com/group/rubyonrails-security/browse_thread/thread/f1203e3376acec0f
# TODO: Remove this once we are on Rails >= 3.2.4
#
# CVE-2012-2694
# https://groups.google.com/group/rubyonrails-security/browse_thread/thread/8c82d9df8b401c5e
#
# TODO: Remove this once we are on Rails >= 3.2.6
require
'action_controller/request'
require
'action_controller/request'
class
Request
class
Request
protected
protected
# Remove nils from the params hash
# Remove nils from the params hash
def
deep_munge
(
hash
)
def
deep_munge
(
hash
)
keys
=
hash
.
keys
.
find_all
{
|
k
|
hash
[
k
]
==
[
nil
]
}
keys
.
each
{
|
k
|
hash
[
k
]
=
nil
}
hash
.
each_value
do
|
v
|
hash
.
each_value
do
|
v
|
case
v
case
v
when
Array
when
Array
v
.
grep
(
Hash
)
{
|
x
|
deep_munge
(
x
)
}
v
.
grep
(
Hash
)
{
|
x
|
deep_munge
(
x
)
}
v
.
compact!
when
Hash
when
Hash
deep_munge
(
v
)
deep_munge
(
v
)
end
end
end
end
keys
=
hash
.
keys
.
find_all
{
|
k
|
hash
[
k
]
==
[
nil
]
}
keys
.
each
{
|
k
|
hash
[
k
]
=
nil
}
hash
hash
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