fix: use the member filter check list

Signed-off-by: Roberto Scolaro <[email protected]>

Author: therealbobo

userspace/chisel/chisel.cpp

@@ -204,8 +204,8 @@ void chiselinfo::init(string filterstr, string formatterstr)
 
 void chiselinfo::set_filter(string filterstr)
 {
-
-	sinsp_filter_compiler compiler(m_inspector, filterstr);
+	auto filter_factory = std::make_shared<sinsp_filter_factory>(m_inspector, *m_filter_check_list);
+	sinsp_filter_compiler compiler(filter_factory, filterstr);
 	if(m_filter)
 	{
 		delete m_filter;

userspace/chisel/chisel_api.cpp

@@ -738,7 +738,8 @@ int lua_cbacks::get_thread_table_int(lua_State *ls, bool include_fds, bool bareb
 		{
 			try
 			{
-				compiler = std::make_unique<sinsp_filter_compiler>(ch->m_inspector, filterstr);
+				auto filter_factory = std::make_shared<sinsp_filter_factory>(ch->m_inspector, *ch->m_filter_check_list);
+				compiler = std::make_unique<sinsp_filter_compiler>(filter_factory, filterstr);
 				filter = compiler->compile();
 			}
 			catch(const sinsp_exception& e)

userspace/chisel/chisel_table.cpp

@@ -23,8 +23,6 @@ draios/sysdig project.
 
 */
 
-#include <algorithm>
-
 #include <libsinsp/sinsp.h>
 #include <chisel/chisel_table.h>
 
@@ -159,7 +157,8 @@ void chisel_table::configure(vector<chisel_view_column_info>* entries, const str
 	//////////////////////////////////////////////////////////////////////////////////////
 	if(filter != "")
 	{
-		sinsp_filter_compiler compiler(m_inspector, filter);
+		auto filter_factory = std::make_shared<sinsp_filter_factory>(m_inspector, *m_filter_check_list);
+		sinsp_filter_compiler compiler(filter_factory, filter);
 		m_filter = compiler.compile().release();
 	}
 

userspace/chisel/chisel_viewinfo.cpp

@@ -22,7 +22,6 @@ falcosecurity/libs project, has been reintroduced to the
 draios/sysdig project.
 
 */
-#include <algorithm>
 #include <libsinsp/sinsp.h>
 #include <chisel/chisel_viewinfo.h>
 

userspace/sinspui/cursescomponents.cpp

@@ -47,16 +47,11 @@ using namespace std;
 
 extern bool g_filterchecks_force_raw_times;
 
-// todo(jasondellaluce): this list is static and prevents from using
-// plugin-defined extraction fields. The right way would be to have a filtercheck
-// list owned by each component and populate depending on the loaded plugins.
-// this is not something that we plan on supporting for now.
-static sinsp_filter_check_list s_filterlist;
-
 ///////////////////////////////////////////////////////////////////////////////
 // spy_text_renderer implementation
 ///////////////////////////////////////////////////////////////////////////////
 spy_text_renderer::spy_text_renderer(sinsp* inspector, 
+	std::shared_ptr<sinsp_filter_check_list> filter_check_list,
 	sinsp_cursesui* parent,
 	int32_t viz_type, 
 	sysdig_output_type sotype, 
@@ -65,6 +60,7 @@ spy_text_renderer::spy_text_renderer(sinsp* inspector,
 {
 	m_formatter = NULL;
 	m_inspector = inspector;
+	m_filter_check_list = filter_check_list;
 	m_viz_type = viz_type;
 	m_linecnt = 0;
 
@@ -79,13 +75,13 @@ spy_text_renderer::spy_text_renderer(sinsp* inspector,
 			{
 				m_formatter = new sinsp_evt_formatter(m_inspector,
 					"*(latency=%evt.latency.human) (fd=%fd.name) %evt.num %evt.time %evt.cpu %container.name (%container.id) %proc.name (%thread.tid:%thread.vtid) %evt.dir %evt.type %evt.info",
-					s_filterlist);
+					*m_filter_check_list);
 			}
 			else
 			{
 				m_formatter = new sinsp_evt_formatter(m_inspector,
 					"*(latency=%evt.latency.human) (fd=%fd.name) %evt.num %evt.time %evt.cpu %proc.name %thread.tid %evt.dir %evt.type %evt.info",
-					s_filterlist);
+					*m_filter_check_list);
 			}
 		}
 		else
@@ -94,11 +90,11 @@ spy_text_renderer::spy_text_renderer(sinsp* inspector,
 			{
 				m_formatter = new sinsp_evt_formatter(m_inspector,
 					"*%evt.num %evt.time %evt.cpu %container.name (%container.id) %proc.name (%thread.tid:%thread.vtid) %evt.dir %evt.type %evt.info",
-					s_filterlist);
+					*m_filter_check_list);
 			}
 			else
 			{
-				m_formatter = new sinsp_evt_formatter(m_inspector, DEFAULT_OUTPUT_STR, s_filterlist);
+				m_formatter = new sinsp_evt_formatter(m_inspector, DEFAULT_OUTPUT_STR, *m_filter_check_list);
 			}
 		}
 	}
@@ -737,7 +733,7 @@ chisel_table_action curses_table_sidemenu::handle_input(int ch)
 ///////////////////////////////////////////////////////////////////////////////
 // curses_textbox implementation
 ///////////////////////////////////////////////////////////////////////////////
-curses_textbox::curses_textbox(sinsp* inspector, sinsp_cursesui* parent, int32_t viz_type, spy_text_renderer::sysdig_output_type sotype)
+curses_textbox::curses_textbox(sinsp* inspector, std::shared_ptr<sinsp_filter_check_list> filter_check_list, sinsp_cursesui* parent, int32_t viz_type, spy_text_renderer::sysdig_output_type sotype)
 {
 	ASSERT(inspector != NULL);
 	ASSERT(parent != NULL);
@@ -748,6 +744,7 @@ curses_textbox::curses_textbox(sinsp* inspector, sinsp_cursesui* parent, int32_t
 	m_filter = NULL;
 	m_text_renderer = NULL;
 	m_inspector = inspector;
+	m_filter_check_list = filter_check_list;
 	n_prints = 0;
 	m_paused = false;
 	m_sidemenu = NULL;
@@ -766,8 +763,9 @@ curses_textbox::curses_textbox(sinsp* inspector, sinsp_cursesui* parent, int32_t
 	config.m_scroll_on_append = true;
 	config.m_bounding_box = true;
 
-	m_text_renderer = new spy_text_renderer(inspector, 
-		parent, 
+	m_text_renderer = new spy_text_renderer(inspector,
+		m_filter_check_list,
+		parent,
 		viz_type, 
 		sotype, 
 		m_parent->m_print_containers,
@@ -854,8 +852,12 @@ curses_textbox::~curses_textbox()
 
 void curses_textbox::set_filter(string filter)
 {
-	sinsp_filter_compiler compiler(m_inspector, filter);
-	m_filter = compiler.compile();
+	if(filter != "")
+	{
+		auto filter_factory = std::make_shared<sinsp_filter_factory>(m_inspector, *m_filter_check_list);
+		sinsp_filter_compiler compiler(filter_factory, filter);
+		m_filter = compiler.compile();
+	}
 }
 
 void curses_textbox::print_no_data()

userspace/sinspui/cursescomponents.h

@@ -57,7 +57,8 @@ class spy_text_renderer
 	};
 
 	spy_text_renderer(sinsp* inspector, 
-		sinsp_cursesui* parent, 
+		std::shared_ptr<sinsp_filter_check_list> filter_check_list,
+		sinsp_cursesui* parent,
 		int32_t viz_type, 
 		sysdig_output_type sotype, 
 		bool print_containers,
@@ -67,6 +68,7 @@ class spy_text_renderer
 
 	sinsp_evt_formatter* m_formatter;
 	sinsp* m_inspector;
+	std::shared_ptr<sinsp_filter_check_list> m_filter_check_list;
 	int32_t m_viz_type;
 	uint64_t m_linecnt;
 };
@@ -186,7 +188,7 @@ class curses_textbox :
 public sinsp_chart, public search_caller_interface
 {
 public:
-	curses_textbox(sinsp* inspector, sinsp_cursesui* parent, int32_t viz_type, spy_text_renderer::sysdig_output_type sotype);
+	curses_textbox(sinsp* inspector, std::shared_ptr<sinsp_filter_check_list> filter_check_list, sinsp_cursesui* parent, int32_t viz_type, spy_text_renderer::sysdig_output_type sotype);
 	~curses_textbox();
 	void render();
 	void set_filter(std::string filter);
@@ -214,6 +216,7 @@ public sinsp_chart, public search_caller_interface
 	ctext* m_ctext;
 	sinsp_cursesui* m_parent;
 	sinsp* m_inspector;
+	std::shared_ptr<sinsp_filter_check_list> m_filter_check_list;
 	std::unique_ptr<sinsp_filter> m_filter;
 	uint32_t n_prints;
 	bool m_paused;

userspace/sinspui/cursesui.cpp

@@ -63,19 +63,22 @@ int do_sleep(DWORD usec)
 ///////////////////////////////////////////////////////////////////////////////
 // json_spy_renderer implementation
 ///////////////////////////////////////////////////////////////////////////////
-json_spy_renderer::json_spy_renderer(sinsp* inspector, 
+json_spy_renderer::json_spy_renderer(sinsp* inspector,
+	std::shared_ptr<sinsp_filter_check_list> filter_check_list,
 	sinsp_cursesui* parent,
 	int32_t viz_type, 
 	spy_text_renderer::sysdig_output_type sotype, 
 	bool print_containers,
 	sinsp_evt::param_fmt text_fmt)
 {
 	m_inspector = inspector;
+	m_filter_check_list = filter_check_list;
 	m_filter = NULL;
 	m_root = Json::Value(Json::arrayValue);
 	m_linecnt = 0;
 
-	m_json_spy_renderer = new spy_text_renderer(inspector, 
+	m_json_spy_renderer = new spy_text_renderer(inspector,
+		m_filter_check_list,
 		parent,
 		viz_type, 
 		sotype, 
@@ -92,7 +95,8 @@ void json_spy_renderer::set_filter(string filter)
 {
 	if(filter != "")
 	{
-		sinsp_filter_compiler compiler(m_inspector, filter);
+		auto filter_factory = std::make_shared<sinsp_filter_factory>(m_inspector, *m_filter_check_list);
+		sinsp_filter_compiler compiler(filter_factory, filter);
 		m_filter = compiler.compile();
 	}
 }
@@ -651,6 +655,7 @@ void sinsp_cursesui::start(bool is_drilldown, bool is_spy_switch)
 		if(m_output_type == chisel_table::OT_JSON)
 		{
 			m_json_spy_renderer= new json_spy_renderer(m_inspector,
+				m_filter_check_list,
 				this,
 				m_selected_view,
 				spy_text_renderer::OT_NORMAL,
@@ -662,7 +667,7 @@ void sinsp_cursesui::start(bool is_drilldown, bool is_spy_switch)
 #ifndef NOCURSESUI
 		else
 		{
-			m_spy_box = new curses_textbox(m_inspector, this, m_selected_view, dig_otype);
+			m_spy_box = new curses_textbox(m_inspector, m_filter_check_list, this, m_selected_view, dig_otype);
 			m_spy_box->reset();
 			m_chart = m_spy_box;
 			m_spy_box->set_filter(m_complete_filter);
@@ -2278,7 +2283,9 @@ chisel_table_action sinsp_cursesui::handle_textbox_input(int ch)
 			{
 				if(*str != "")
 				{
-					sinsp_filter_compiler compiler(m_inspector, *str);
+					// TODO(therealbobo): use a populated filter check list
+					auto filter_factory = std::make_shared<sinsp_filter_factory>(m_inspector, *m_filter_check_list);
+					sinsp_filter_compiler compiler(filter_factory, *str);
 					std::unique_ptr<sinsp_filter> f;
 
 					try

userspace/sinspui/cursesui.h

@@ -331,7 +331,8 @@ class sinsp_mouse_to_key_list
 class json_spy_renderer
 {
 public:
-	json_spy_renderer(sinsp* inspector, 
+	json_spy_renderer(sinsp* inspector,
+		std::shared_ptr<sinsp_filter_check_list> filter_check_list,
 		sinsp_cursesui* parent,
 		int32_t viz_type, 
 		spy_text_renderer::sysdig_output_type sotype, 
@@ -350,6 +351,7 @@ class json_spy_renderer
 
 	spy_text_renderer* m_json_spy_renderer;
 	sinsp* m_inspector;
+	std::shared_ptr<sinsp_filter_check_list> m_filter_check_list;
 	Json::Value m_root;
 	std::unique_ptr<sinsp_filter> m_filter;
 	uint64_t m_linecnt;