Skip to content

[HIGH] Prevent SQL injection through embed_params type names #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

[HIGH] Prevent SQL injection through embed_params type names #744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/pg/connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,17 @@ def cancel
(?<placeholder>\$(?:[1-9]\d*)) # placeholder we are interested in
/mx
private_constant :PLACEHOLDER_RE
SAFE_TYPE_NAME_PART_RE = /\A[A-Za-z_][A-Za-z0-9_$]*\z/
private_constant :SAFE_TYPE_NAME_PART_RE

private def quote_type_name(name)
name = name.to_s.dup
array_suffix = name.slice!(/(?:\[\])+\z/) || ""
name = name.split(".", -1).map do |part|
SAFE_TYPE_NAME_PART_RE.match?(part) ? part : quote_ident(part)
end.join(".")
name + array_suffix
end

# Compiles your prepared SQL statement and the given positional arguments into plain SQL string.
#
Expand Down Expand Up @@ -708,7 +719,7 @@ def embed_params(sql, params, type_map: type_map_for_queries)
if tname.to_s.empty?
raise(ArgumentError, "Database type name of OID #{oid.inspect} missing#{errtext}")
else
"::#{ tname }"
"::#{quote_type_name(tname)}"
end
end
end
Expand Down