Handle invalid placeholder attributes

Signed-off-by: Kenji Okimoto <okimoto@clear-code.com>
y-ken · Jan 31, 2019 · 7f455f8 · 7f455f8
1 parent aeba796
commit 7f455f8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/lib/fluent/plugin/filter_geoip.rb b/lib/fluent/plugin/filter_geoip.rb
@@ -86,6 +86,7 @@ def configure(conf)
       @placeholder_keys = @map.values.join.scan(REGEXP_PLACEHOLDER_SCAN).map{|placeholder| placeholder[0] }.uniq
       @placeholder_keys.each do |key|
         m = key.match(REGEXP_PLACEHOLDER_SINGLE)
+        raise Fluent::ConfigError, "Invalid placeholder attributes: #{key}" unless m
         geoip_key = m[:geoip_key]
         case @backend_library
         when :geoip

diff --git a/test/plugin/test_filter_geoip.rb b/test/plugin/test_filter_geoip.rb
@@ -115,6 +115,19 @@ def db.lookup(ip)
       ]
     end
 
+    test "invalid placeholder attributes" do
+      assert_raise(Fluent::ConfigParseError) do
+        create_driver %[
+          geoip_lookup_keys host
+          backend_library geoip2_c
+
+          <record>
+            geoip.city_name       ${city.names.en["host]}
+          </record>
+        ]
+      end
+    end
+
     data(geoip: "geoip",
          geoip2_compat: "geoip2_compat")
     test "unsupported key" do |backend|