Merge pull request #265 from draios/remove-trailing-newline-output

Remove trailing newlines from output
falcosecurity · Aug 10, 2017 · d1265ff · d1265ff
2 parents 9d6fe87 + ebed9f8
commit d1265ff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/userspace/engine/lua/compiler.lua b/userspace/engine/lua/compiler.lua
@@ -20,6 +20,7 @@ local compiler = {}
 
 compiler.verbose = false
 compiler.all_events = false
+compiler.trim = parser.trim
 
 function compiler.set_verbose(verbose)
    compiler.verbose = verbose

diff --git a/userspace/engine/lua/parser.lua b/userspace/engine/lua/parser.lua
@@ -127,6 +127,7 @@ function trim(s)
    if (type(s) ~= "string") then return s end
   return (s:gsub("^%s*(.-)%s*$", "%1"))
 end
+parser.trim = trim
 
 local function terminal (tag)
    -- Rather than trim the whitespace in this way, it would be nicer to exclude it from the capture...

diff --git a/userspace/engine/lua/rule_loader.lua b/userspace/engine/lua/rule_loader.lua
@@ -243,6 +243,10 @@ function load_rules(rules_content, rules_mgr, verbose, all_events, extra, replac
 	    state.ordered_rule_names[#state.ordered_rule_names+1] = v['rule']
 	 end
 
+	 -- The output field might be a folded-style, which adds a
+	 -- newline to the end. Remove any trailing newlines.
+	 v['output'] = compiler.trim(v['output'])
+
 	 state.rules_by_name[v['rule']] = v
 
       else