Projects
openEuler:22.03:LTS:LoongArch
rubygem-activerecord
_service:tar_scm_kernel_repo:CVE-2023-22794.patch
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:tar_scm_kernel_repo:CVE-2023-22794.patch of Package rubygem-activerecord
From 3db858cbc99e332e6f209d50be2b7420211f4c33 Mon Sep 17 00:00:00 2001 From: John Hawthorn <john@hawthorn.email> Date: Tue, 6 Sep 2022 15:49:26 -0700 Subject: [PATCH] Make sanitize_as_sql_comment more strict Though this method was likely never meant to take user input, it was attempting sanitization. That sanitization could be bypassed with carefully crafted input. This commit makes the sanitization more robust by replacing any occurrances of "/*" or "*/" with "/ *" or "* /". It also performs a first pass to remove one surrounding comment to avoid compatibility issues for users relying on the existing removal. This also clarifies in the documentation of annotate that it should not be provided user input. [CVE-2023-22794] --- .../connection_adapters/abstract/quoting.rb | 11 ++++++++++- .../lib/active_record/relation/query_methods.rb | 2 ++ activerecord/test/cases/annotate_test.rb | 11 ++++++++--- activerecord/test/cases/relation_test.rb | 10 +++------- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/activerecord-6.1.4.1/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord-6.1.4.1/lib/active_record/connection_adapters/abstract/quoting.rb index 143cd32606..aac5bfe0a0 100644 --- a/activerecord-6.1.4.1/lib/active_record/connection_adapters/abstract/quoting.rb +++ b/activerecord-6.1.4.1/lib/active_record/connection_adapters/abstract/quoting.rb @@ -138,7 +138,16 @@ def quoted_binary(value) # :nodoc: end def sanitize_as_sql_comment(value) # :nodoc: - value.to_s.gsub(%r{ (/ (?: | \g<1>) \*) \+? \s* | \s* (\* (?: | \g<2>) /) }x, "") + # Sanitize a string to appear within a SQL comment + # For compatibility, this also surrounding "/*+", "/*", and "*/" + # charcacters, possibly with single surrounding space. + # Then follows that by replacing any internal "*/" or "/ *" with + # "* /" or "/ *" + comment = value.to_s.dup + comment.gsub!(%r{\A\s*/\*\+?\s?|\s?\*/\s*\Z}, "") + comment.gsub!("*/", "* /") + comment.gsub!("/*", "/ *") + comment end def column_name_matcher # :nodoc: diff --git a/activerecord-6.1.4.1/lib/active_record/relation/query_methods.rb b/activerecord-6.1.4.1/lib/active_record/relation/query_methods.rb index 5451ebef46..8be5d5b0a1 100644 --- a/activerecord-6.1.4.1/lib/active_record/relation/query_methods.rb +++ b/activerecord-6.1.4.1/lib/active_record/relation/query_methods.rb @@ -1035,6 +1035,8 @@ def skip_preloading! # :nodoc: # # SELECT "users"."name" FROM "users" /* selecting */ /* user */ /* names */ # # The SQL block comment delimiters, "/*" and "*/", will be added automatically. + # + # Some escaping is performed, however untrusted user input should not be used. def annotate(*args) check_if_method_has_arguments!(:annotate, args) spawn.annotate!(*args) diff --git a/test/cases/annotate_test.rb b/test/cases/annotate_test.rb index 4d71d28f83..21b95a97a1 100644 --- a/test/cases/annotate_test.rb +++ b/test/cases/annotate_test.rb @@ -18,17 +18,22 @@ def test_annotate_wraps_content_in_an_inline_comment def test_annotate_is_sanitized quoted_posts_id, quoted_posts = regexp_escape_table_name("posts.id"), regexp_escape_table_name("posts") - assert_sql(%r{\ASELECT #{quoted_posts_id} FROM #{quoted_posts} /\* foo \*/}i) do + assert_sql(%r{SELECT #{quoted_posts_id} FROM #{quoted_posts} /\* \* /foo/ \* \*/}i) do posts = Post.select(:id).annotate("*/foo/*") assert posts.first end - assert_sql(%r{\ASELECT #{quoted_posts_id} FROM #{quoted_posts} /\* foo \*/}i) do + assert_sql(%r{SELECT #{quoted_posts_id} FROM #{quoted_posts} /\* \*\* //foo// \*\* \*/}i) do posts = Post.select(:id).annotate("**//foo//**") assert posts.first end - assert_sql(%r{\ASELECT #{quoted_posts_id} FROM #{quoted_posts} /\* foo \*/ /\* bar \*/}i) do + assert_sql(%r{SELECT #{quoted_posts_id} FROM #{quoted_posts} /\* \* \* //foo// \* \* \*/}i) do + posts = Post.select(:id).annotate("* *//foo//* *") + assert posts.first + end + + assert_sql(%r{SELECT #{quoted_posts_id} FROM #{quoted_posts} /\* \* /foo/ \* \*/ /\* \* /bar \*/}i) do posts = Post.select(:id).annotate("*/foo/*").annotate("*/bar") assert posts.first end diff --git a/test/cases/relation_test.rb b/test/cases/relation_test.rb index ba0d96b68c..48b752a127 100644 --- a/test/cases/relation_test.rb +++ b/test/cases/relation_test.rb @@ -345,7 +345,7 @@ def test_relation_with_annotation_chains_sql_comments def test_relation_with_annotation_filters_sql_comment_delimiters post_with_annotation = Post.where(id: 1).annotate("**//foo//**") - assert_match %r{= 1 /\* foo \*/}, post_with_annotation.to_sql + assert_includes post_with_annotation.to_sql, "= 1 /* ** //foo// ** */" end def test_relation_with_annotation_includes_comment_in_count_query @@ -367,13 +367,9 @@ def test_relation_without_annotation_does_not_include_an_empty_comment def test_relation_with_optimizer_hints_filters_sql_comment_delimiters post_with_hint = Post.where(id: 1).optimizer_hints("**//BADHINT//**") - assert_match %r{BADHINT}, post_with_hint.to_sql - assert_no_match %r{\*/BADHINT}, post_with_hint.to_sql - assert_no_match %r{\*//BADHINT}, post_with_hint.to_sql - assert_no_match %r{BADHINT/\*}, post_with_hint.to_sql - assert_no_match %r{BADHINT//\*}, post_with_hint.to_sql + assert_includes post_with_hint.to_sql, "/*+ ** //BADHINT// ** */" post_with_hint = Post.where(id: 1).optimizer_hints("/*+ BADHINT */") - assert_match %r{/\*\+ BADHINT \*/}, post_with_hint.to_sql + assert_includes post_with_hint.to_sql, "/*+ BADHINT */" end def test_does_not_duplicate_optimizer_hints_on_merge -- 2.35.1
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.