Skip to content

update(deps): bump libs to 0.23.2 #2183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
therealbobo wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

update(deps): bump libs to 0.23.2 #2183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/modules/driver.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ else()
# In case you want to test against another driver version (or branch, or commit) just pass the variable -
# ie., `cmake -DDRIVER_VERSION=dev ..`
if(NOT DRIVER_VERSION)
set(DRIVER_VERSION "9.0.0+driver")
set(DRIVER_CHECKSUM "SHA256=ef563fe19f9cdbdfcf17cee3e83c79e8387b78a87e0593eb3e2787c9b8540113")
set(DRIVER_VERSION "9.1.0+driver")
set(DRIVER_CHECKSUM "SHA256=14cba5b610bf48cd0a0a94b1156ed86bfb552c7ed24b68b1028360fa3af18cbb")
endif()

# cd /path/to/build && cmake /path/to/source
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/falcosecurity-libs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ else()
# In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable -
# ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..`
if(NOT FALCOSECURITY_LIBS_VERSION)
set(FALCOSECURITY_LIBS_VERSION "0.22.2")
set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=53cfb7062cac80623dec7496394739aabdfee8a774942f94be0990d81e3b2fbc")
set(FALCOSECURITY_LIBS_VERSION "0.23.2")
set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=928128add70724938ee8dcc57ef3653aec162f7d575975a559b04b238a3b448c")
endif()

# cd /path/to/build && cmake /path/to/source
Expand Down
13 changes: 9 additions & 4 deletions userspace/chisel/chisel_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ draios/sysdig project.
#include <libscap/strl.h>
#include <libsinsp/sinsp.h>
#include <libsinsp/sinsp_int.h>
#include <libsinsp/user.h>
#include <chisel/chisel.h>
#include <chisel/chisel_api.h>
#include <libsinsp/filter.h>
Expand Down Expand Up @@ -835,10 +836,10 @@ int lua_cbacks::get_thread_table_int(lua_State *ls, bool include_fds, bool bareb
lua_pushnumber(ls, (uint32_t)tinfo.m_fdlimit);
lua_settable(ls, -3);
lua_pushliteral(ls, "uid");
lua_pushnumber(ls, (uint32_t)tinfo.get_user()->uid);
lua_pushnumber(ls, tinfo.m_uid);
lua_settable(ls, -3);
lua_pushliteral(ls, "gid");
lua_pushnumber(ls, (uint32_t)tinfo.get_group()->gid);
lua_pushnumber(ls, tinfo.m_gid);
lua_settable(ls, -3);
lua_pushliteral(ls, "nchilds");
lua_pushnumber(ls, (uint32_t)tinfo.get_num_not_leader_threads());
Expand Down Expand Up @@ -866,7 +867,11 @@ int lua_cbacks::get_thread_table_int(lua_State *ls, bool include_fds, bool bareb
// Extract the user name
//
lua_pushliteral(ls, "username");
lua_pushstring(ls, tinfo.get_user()->name);
{
auto container_id = ch->m_inspector->m_plugin_tables.get_container_id(tinfo);
auto* user_info = ch->m_inspector->m_usergroup_manager->get_user(container_id, tinfo.m_uid);
lua_pushstring(ls, user_info ? user_info->name : "<NA>");
}
lua_settable(ls, -3);

//
Expand Down Expand Up @@ -1144,7 +1149,7 @@ int lua_cbacks::get_container_table(lua_State *ls)
// Retrieve the container list
//
const auto ctable = ch->m_inspector->m_thread_manager
->get_table(sinsp_thread_manager::s_containers_table_name);
->get_table("containers");

lua_newtable(ls);

Expand Down
7 changes: 4 additions & 3 deletions userspace/sinspui/cursescomponents.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,15 +933,16 @@ void curses_textbox::process_event_spy(sinsp_evt* evt, int32_t next_res)
wattrset(m_win, m_parent->m_colors[sinsp_cursesui::LED_COLOR]);

const auto ctable = m_inspector->m_thread_manager
->get_table(sinsp_thread_manager::s_containers_table_name);
->get_table("containers");

std::string container_name = "host";
if(!m_tinfo->get_container_id().empty())
auto container_id = m_inspector->m_plugin_tables.get_container_id(*m_tinfo);
if(!container_id.empty())
{
if(ctable != nullptr) {
auto fld_name = ctable->get_field<std::string>("name");

auto container_info = ctable->get_entry(m_tinfo->get_container_id());
auto container_info = ctable->get_entry(container_id);
container_info.read_field(fld_name, container_name);
}
}
Expand Down
7 changes: 4 additions & 3 deletions userspace/sinspui/cursesui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,17 @@ void json_spy_renderer::process_event_spy(sinsp_evt* evt, int32_t next_res)

line["p"] = tinfo->m_comm;

if(!tinfo->get_container_id().empty())
auto container_id = m_inspector->m_plugin_tables.get_container_id(*tinfo);
if(!container_id.empty())
{
const auto ctable = m_inspector->m_thread_manager
->get_table(sinsp_thread_manager::s_containers_table_name);
->get_table("containers");

if(ctable != nullptr) {
auto fld_name = ctable->get_field<std::string>("name");
std::string container_name;

auto container_info = ctable->get_entry(tinfo->get_container_id());
auto container_info = ctable->get_entry(container_id);
container_info.read_field(fld_name, container_name);

if(!container_name.empty())
Expand Down
Loading