From ab3b4523567fef50e6ef183d002e8191379a0927 Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Fri, 15 Mar 2019 09:15:17 +0900
Subject: [PATCH 1/2] parser_regexp: Check named capture. ref #2330

Signed-off-by: Masahiro Nakagawa <repeatedly@gmail.com>
---
 lib/fluent/plugin/parser_regexp.rb | 4 ++++
 test/plugin/test_parser_regexp.rb  | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/lib/fluent/plugin/parser_regexp.rb b/lib/fluent/plugin/parser_regexp.rb
index c0636ebf34..79ad558269 100644
--- a/lib/fluent/plugin/parser_regexp.rb
+++ b/lib/fluent/plugin/parser_regexp.rb
@@ -40,6 +40,10 @@ def configure(conf)
           @expression = Regexp.compile(@expression.source, options)
         end
         @regexp = @expression # For backward compatibility
+
+        if @expression.named_captures.empty?
+          raise Fluent::ConfigError, "No named captures in 'expression' parameter. The regexp must have at least one named capture"
+        end
       end
 
       def parse(text)
diff --git a/test/plugin/test_parser_regexp.rb b/test/plugin/test_parser_regexp.rb
index b8ed02125c..7fc5a98604 100644
--- a/test/plugin/test_parser_regexp.rb
+++ b/test/plugin/test_parser_regexp.rb
@@ -153,6 +153,15 @@ def create_driver(conf)
     end
 
     sub_test_case "configure" do
+      def test_bad_expression
+        conf = {
+          'expression' => %q!/.*/!,
+        }
+        assert_raise Fluent::ConfigError do
+          create_driver(conf)
+        end
+      end
+
       def test_default_options
         conf = {
           'expression' => %q!/^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] \[(?<date>[^\]]*)\] "(?<flag>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)$/!,

From 6a263b1c36f0c228f6a003f45922b673bf35e7c2 Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Fri, 15 Mar 2019 10:15:22 +0900
Subject: [PATCH 2/2] parser_regexp: Fix broken test due to no named capture

Signed-off-by: Masahiro Nakagawa <repeatedly@gmail.com>
---
 test/compat/test_parser.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/compat/test_parser.rb b/test/compat/test_parser.rb
index 4d5ba27dec..f5261640ba 100644
--- a/test/compat/test_parser.rb
+++ b/test/compat/test_parser.rb
@@ -84,7 +84,7 @@ def test_setting_estimate_current_event_value
        multiline: Regexp::MULTILINE,
        both: Regexp::IGNORECASE & Regexp::MULTILINE)
   def test_regexp_parser_config(options)
-    source = "a"
+    source = "(?<test>.*)"
     parser = Fluent::TextParser::RegexpParser.new(Regexp.new(source, options), { "dummy" => "dummy" })
     regexp = parser.instance_variable_get("@regexp")
     assert_equal(options, regexp.options)