[OE-core] [PATCH] ruby: fix CVE-2019-16254

[rahul chauhan]

Hi community members,

This patch Fixes CVE-2019-16254 on zeus branch.
patch test failed, since I did not use --subject-prefix="zeus][PATCH" at
the time of patch submission to openembedded-core at lists.openembedded.org.

should i resubmit this patch with --subject-prefix="zeus][PATCH"
or
can anyone guide me what should do next in  this situation ?

Thanks & Regards
Rahul Chauhan

On Mon, Feb 10, 2020 at 11:47 PM Rahul Chauhan <rahulchauhankitps at gmail.com>
wrote:

> Signed-off-by: Rahul Chauhan <rahulchauhankitps at gmail.com>
> ---
>  .../ruby/ruby/fix-CVE-2019-16254.patch             | 106
> +++++++++++++++++++++
>  meta/recipes-devtools/ruby/ruby_2.5.5.bb           |   1 +
>  2 files changed, 107 insertions(+)
>  create mode 100644
> meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch
>
> diff --git a/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch
> b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch
> new file mode 100644
> index 0000000..704c850
> --- /dev/null
> +++ b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch
> @@ -0,0 +1,106 @@
> +From 18d5289b4579822e391b3f5c16541e6552e9f06c Mon Sep 17 00:00:00 2001
> +From: Yusuke Endoh <mame at ruby-lang.org>
> +Date: Tue, 1 Oct 2019 12:29:18 +0900
> +Subject: [PATCH] WEBrick: prevent response splitting and header injection
> +
> +This is a follow up to d9d4a28f1cdd05a0e8dabb36d747d40bbcc30f16.
> +The commit prevented CRLR, but did not address an isolated CR or an
> +isolated LF.
> +
> +Upstream-Status: Backport
> https://github.com/ruby/ruby/commit/3ce238b5f9795581eb84114dcfbdf4aa086bfecc
> +CVE: CVE-2019-16254
> +
> +Co-Authored-By: NARUSE, Yui <naruse at airemix.jp>
> +Signed-off-by: Rahul Chauhan <rahulchauhankitps at gmail.com>
> +---
> + lib/webrick/httpresponse.rb       |  3 ++-
> + test/webrick/test_httpresponse.rb | 46
> +++++++++++++++++++++++++++++++++++++--
> + 2 files changed, 46 insertions(+), 3 deletions(-)
> +
> +diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb
> +index 6d77692..d26324c 100644
> +--- a/lib/webrick/httpresponse.rb
> ++++ b/lib/webrick/httpresponse.rb
> +@@ -367,7 +367,8 @@ def set_error(ex, backtrace=false)
> +     private
> +
> +     def check_header(header_value)
> +-      if header_value =~ /\r\n/
> ++      header_value = header_value.to_s
> ++      if /[\r\n]/ =~ header_value
> +         raise InvalidHeader
> +       else
> +         header_value
> +diff --git a/test/webrick/test_httpresponse.rb
> b/test/webrick/test_httpresponse.rb
> +index 6263e0a..24a6968 100644
> +--- a/test/webrick/test_httpresponse.rb
> ++++ b/test/webrick/test_httpresponse.rb
> +@@ -29,7 +29,7 @@ def setup
> +       @res.keep_alive  = true
> +     end
> +
> +-    def test_prevent_response_splitting_headers
> ++    def test_prevent_response_splitting_headers_crlf
> +       res['X-header'] = "malicious\r\nCookie: hack"
> +       io = StringIO.new
> +       res.send_response io
> +@@ -39,7 +39,7 @@ def test_prevent_response_splitting_headers
> +       refute_match 'hack', io.string
> +     end
> +
> +-    def test_prevent_response_splitting_cookie_headers
> ++    def test_prevent_response_splitting_cookie_headers_crlf
> +       user_input = "malicious\r\nCookie: hack"
> +       res.cookies << WEBrick::Cookie.new('author', user_input)
> +       io = StringIO.new
> +@@ -50,6 +50,48 @@ def test_prevent_response_splitting_cookie_headers
> +       refute_match 'hack', io.string
> +     end
> +
> ++    def test_prevent_response_splitting_headers_cr
> ++      res['X-header'] = "malicious\rCookie: hack"
> ++      io = StringIO.new
> ++      res.send_response io
> ++      io.rewind
> ++      res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io))
> ++      assert_equal '500', res.code
> ++      refute_match 'hack', io.string
> ++    end
> ++
> ++    def test_prevent_response_splitting_cookie_headers_cr
> ++      user_input = "malicious\rCookie: hack"
> ++      res.cookies << WEBrick::Cookie.new('author', user_input)
> ++      io = StringIO.new
> ++      res.send_response io
> ++      io.rewind
> ++      res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io))
> ++      assert_equal '500', res.code
> ++      refute_match 'hack', io.string
> ++    end
> ++
> ++    def test_prevent_response_splitting_headers_lf
> ++      res['X-header'] = "malicious\nCookie: hack"
> ++      io = StringIO.new
> ++      res.send_response io
> ++      io.rewind
> ++      res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io))
> ++      assert_equal '500', res.code
> ++      refute_match 'hack', io.string
> ++    end
> ++
> ++    def test_prevent_response_splitting_cookie_headers_lf
> ++      user_input = "malicious\nCookie: hack"
> ++      res.cookies << WEBrick::Cookie.new('author', user_input)
> ++      io = StringIO.new
> ++      res.send_response io
> ++      io.rewind
> ++      res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io))
> ++      assert_equal '500', res.code
> ++      refute_match 'hack', io.string
> ++    end
> ++
> +     def test_304_does_not_log_warning
> +       res.status      = 304
> +       res.setup_header
> +--
> +2.7.4
> diff --git a/meta/recipes-devtools/ruby/ruby_2.5.5.bb
> b/meta/recipes-devtools/ruby/ruby_2.5.5.bb
> index 223b037..58bb97f 100644
> --- a/meta/recipes-devtools/ruby/ruby_2.5.5.bb
> +++ b/meta/recipes-devtools/ruby/ruby_2.5.5.bb
> @@ -3,6 +3,7 @@ require ruby.inc
>  SRC_URI += " \
>
> file://0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \
>             file://run-ptest \
> +           file://fix-CVE-2019-16254.patch \
>             "
>
>  SRC_URI[md5sum] = "7e156fb526b8f4bb1b30a3dd8a7ce400"
> --
> 2.7.4
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20200211/a6e2a875/attachment.html>