From 89943a21e2dc4f77c7ceb6e27e379947a5b6dd8a Mon Sep 17 00:00:00 2001
From: Kenji Okimoto <okimoto@clear-code.com>
Date: Fri, 13 Oct 2017 14:41:40 +0900
Subject: [PATCH] Support double quotes in record_accessor bracket notation

In previous version, following just raise error:

```
record_accessor_create(%q($["key1"]["key2"]))
```
---
 lib/fluent/plugin_helper/record_accessor.rb |  5 +++--
 test/plugin_helper/test_record_accessor.rb  | 23 ++++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/lib/fluent/plugin_helper/record_accessor.rb b/lib/fluent/plugin_helper/record_accessor.rb
index fc4e64b31d..b353a0a338 100644
--- a/lib/fluent/plugin_helper/record_accessor.rb
+++ b/lib/fluent/plugin_helper/record_accessor.rb
@@ -133,8 +133,9 @@ def self.parse_bracket_notation(param)
 
           until param.empty?
             if in_bracket
-              if param[0] == "'"
-                if i = param.index("']")
+              if param[0] == "'" || param[0] == '"'
+                if i = param.index("']") || param.index('"]')
+                  raise Fluent::ConfigError, "Mismatched quotes. Invalid syntax: #{orig_param}" unless param[0] == param[i]
                   result << param[1..i - 1]
                   param = param[i + 2..-1]
                   in_bracket = false
diff --git a/test/plugin_helper/test_record_accessor.rb b/test/plugin_helper/test_record_accessor.rb
index d5887d3956..f32d563fc0 100644
--- a/test/plugin_helper/test_record_accessor.rb
+++ b/test/plugin_helper/test_record_accessor.rb
@@ -24,20 +24,23 @@ class Dummy < Fluent::Plugin::TestBase
     end
 
     data('dot' => '$.key1.key2[0]',
-         'bracket' => "$['key1']['key2'][0]")
+         'bracket' => "$['key1']['key2'][0]",
+         'bracket w/ double quotes' => '$["key1"]["key2"][0]')
     test "nested keys ['key1', 'key2', 0]" do |param|
       result = Fluent::PluginHelper::RecordAccessor::Accessor.parse_parameter(param)
       assert_equal ['key1', 'key2', 0], result
     end
 
-    data('bracket' => "$['key1'][0]['ke y2']")
+    data('bracket' => "$['key1'][0]['ke y2']",
+         'bracket w/ double quotes' => '$["key1"][0]["ke y2"]')
     test "nested keys ['key1', 0, 'ke y2']" do |param|
       result = Fluent::PluginHelper::RecordAccessor::Accessor.parse_parameter(param)
       assert_equal ['key1', 0, 'ke y2'], result
     end
 
     data('dot' => '$.[0].key1.[1].key2',
-         'bracket' => "$[0]['key1'][1]['key2']")
+         'bracket' => "$[0]['key1'][1]['key2']",
+         'bracket w/ double quotes' => '$[0]["key1"][1]["key2"]')
     test "nested keys [0, 'key1', 1, 'key2']" do |param|
       result = Fluent::PluginHelper::RecordAccessor::Accessor.parse_parameter(param)
       assert_equal [0, 'key1', 1, 'key2'], result
@@ -49,7 +52,9 @@ class Dummy < Fluent::Plugin::TestBase
          "more chars" => "$.key1[0]foo",
          "whitespace char included key in dot notation" => "$.key[0].ke y",
          "empty keys with dot" => "$.",
-         "empty keys with bracket" => "$[")
+         "empty keys with bracket" => "$[",
+         "mismatched quotes1" => "$['key1']['key2\"]",
+         "mismatched quotes2" => '$["key1"]["key2\']')
     test 'invalid syntax' do |param|
       assert_raise Fluent::ConfigError do
         Fluent::PluginHelper::RecordAccessor::Accessor.parse_parameter(param)
@@ -78,14 +83,16 @@ class Dummy < Fluent::Plugin::TestBase
     end
 
     data('dot' => '$.key1.key2[0]',
-         'bracket' => "$['key1']['key2'][0]")
+         'bracket' => "$['key1']['key2'][0]",
+         'bracket w/ double quotes' => '$["key1"]["key2"][0]')
     test "nested keys ['key1', 'key2', 0]" do |param|
       r = {'key1' => {'key2' => [1, 2, 3]}}
       accessor = @d.record_accessor_create(param)
       assert_equal 1, accessor.call(r)
     end
 
-    data('bracket' => "$['key1'][0]['ke y2']")
+    data('bracket' => "$['key1'][0]['ke y2']",
+         'bracket w/ double quotes' => '$["key1"][0]["ke y2"]')
     test "nested keys ['key1', 0, 'ke y2']" do |param|
       r = {'key1' => [{'ke y2' => "value"}]}
       accessor = @d.record_accessor_create(param)
@@ -98,7 +105,9 @@ class Dummy < Fluent::Plugin::TestBase
          "whitespace char included key in dot notation" => "$.key[0].ke y",
          "more chars" => "$.key1[0]foo",
          "empty keys with dot" => "$.",
-         "empty keys with bracket" => "$[")
+         "empty keys with bracket" => "$[",
+         "mismatched quotes1" => "$['key1']['key2\"]",
+         "mismatched quotes2" => '$["key1"]["key2\']')
     test 'invalid syntax' do |param|
       assert_raise Fluent::ConfigError do
         @d.record_accessor_create(param)