Skip to content
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

Use current process ID to investigate proc filesystem to workaround in-container non-root owned symlinks #5701

Closed
wants to merge 2 commits into from
Closed

Use current process ID to investigate proc filesystem to workaround in-container non-root owned symlinks #5701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49b5327
Added librsync-dev package dependency for alpine linux build from source
craigcomstock Feb 25, 2025
6fe36b4
Use current process ID to investigate proc filesystem to workaround i…
craigcomstock Feb 25, 2025
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 INSTALL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ See docs/BSD.md

sudo zypper install gdb gcc make lmdb autoconf automake libtool git python3 pcre2-devel libopenssl-devel pam-devel

* AlpineOS (3.11.3 x86_64 2020-04-13)
* Alpine Linux (3.21.3 2025-02-25)

sudo apk add alpine-sdk lmdb-dev openssl-dev bison flex-dev acl-dev pcre2-dev autoconf automake libtool git python3 gdb
sudo apk add alpine-sdk lmdb-dev openssl-dev bison flex-dev acl-dev pcre2-dev autoconf automake libtool git python3 gdb librsync-dev
./autogen.sh --without-pam

* Termux (2020-04-24)
Expand Down
22 changes: 12 additions & 10 deletions libenv/unix_iface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,20 +1390,21 @@ JsonElement* GetProcFileInfo(EvalContext *ctx, const char* filename, const char*
void GetNetworkingInfo(EvalContext *ctx)
{
const char *procdir_root = GetRelocatedProcdirRoot();
int promiser_pid = (int) getpid();

Buffer *pbuf = BufferNew();

JsonElement *inet = JsonObjectCreate(2);

BufferPrintf(pbuf, "%s/proc/net/netstat", procdir_root);
BufferPrintf(pbuf, "%s/proc/%d/net/netstat", procdir_root, promiser_pid);
JsonElement *inet_stats = GetNetworkingStatsInfo(BufferData(pbuf));

if (inet_stats != NULL)
{
JsonObjectAppendElement(inet, "stats", inet_stats);
}

BufferPrintf(pbuf, "%s/proc/net/route", procdir_root);
BufferPrintf(pbuf, "%s/proc/%d/net/route", procdir_root, promiser_pid);
JsonElement *routes = GetProcFileInfo(ctx, BufferData(pbuf), NULL, NULL, &NetworkingRoutesPostProcessInfo, NULL,
// format: Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT
// eth0 00000000 0102A8C0 0003 0 0 1024 00000000 0 0 0
Expand Down Expand Up @@ -1451,7 +1452,7 @@ void GetNetworkingInfo(EvalContext *ctx)

JsonElement *inet6 = JsonObjectCreate(3);

BufferPrintf(pbuf, "%s/proc/net/snmp6", procdir_root);
BufferPrintf(pbuf, "%s/proc/%d/net/snmp6", procdir_root, promiser_pid);
JsonElement *inet6_stats = GetProcFileInfo(ctx, BufferData(pbuf), NULL, NULL, NULL, NULL,
"^\\s*(?<key>\\S+)\\s+(?<value>\\d+)");

Expand All @@ -1477,7 +1478,7 @@ void GetNetworkingInfo(EvalContext *ctx)
JsonDestroy(inet6_stats);
}

BufferPrintf(pbuf, "%s/proc/net/ipv6_route", procdir_root);
BufferPrintf(pbuf, "%s/proc/%d/net/ipv6_route", procdir_root, promiser_pid);
JsonElement *inet6_routes = GetProcFileInfo(ctx, BufferData(pbuf), NULL, NULL, &NetworkingIPv6RoutesPostProcessInfo, NULL,
// format: dest dest_prefix source source_prefix next_hop metric refcnt use flags interface
// fe800000000000000000000000000000 40 00000000000000000000000000000000 00 00000000000000000000000000000000 00000100 00000000 00000000 00000001 eth0
Expand All @@ -1492,7 +1493,7 @@ void GetNetworkingInfo(EvalContext *ctx)
JsonObjectAppendElement(inet6, "routes", inet6_routes);
}

BufferPrintf(pbuf, "%s/proc/net/if_inet6", procdir_root);
BufferPrintf(pbuf, "%s/proc/%d/net/if_inet6", procdir_root, promiser_pid);
JsonElement *inet6_addresses = GetProcFileInfo(ctx, BufferData(pbuf), NULL, "interface", &NetworkingIPv6AddressesPostProcessInfo, &NetworkingIPv6AddressesTiebreaker,
// format: address device_number prefix_length scope flags interface_name
// 00000000000000000000000000000001 01 80 10 80 lo
Expand All @@ -1515,7 +1516,7 @@ void GetNetworkingInfo(EvalContext *ctx)
// face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
// eth0: 74850544807 75236137 0 0 0 0 0 1108775 63111535625 74696758 0 0 0 0 0 0

BufferPrintf(pbuf, "%s/proc/net/dev", procdir_root);
BufferPrintf(pbuf, "%s/proc/%d/net/dev", procdir_root, promiser_pid);
JsonElement *interfaces_data =
GetProcFileInfo(ctx, BufferData(pbuf), "interfaces_data", "device", NULL, NULL,
"^\\s*(?<device>[^:]+)\\s*:\\s*"
Expand Down Expand Up @@ -1543,34 +1544,35 @@ void GetNetworkingInfo(EvalContext *ctx)
JsonElement* GetNetworkingConnections(EvalContext *ctx)
{
const char *procdir_root = GetRelocatedProcdirRoot();
int promiser_pid = (int) getpid();
JsonElement *json = JsonObjectCreate(5);
const char* ports_regex = "^\\s*\\d+:\\s+(?<raw_local>[0-9A-F:]+)\\s+(?<raw_remote>[0-9A-F:]+)\\s+(?<raw_state>[0-9]+)";

JsonElement *data = NULL;
Buffer *pbuf = BufferNew();

BufferPrintf(pbuf, "%s/proc/net/tcp", procdir_root);
BufferPrintf(pbuf, "%s/proc/%d/net/tcp", procdir_root, promiser_pid);
data = GetProcFileInfo(ctx, BufferData(pbuf), NULL, NULL, &NetworkingPortsPostProcessInfo, NULL, ports_regex);
if (data != NULL)
{
JsonObjectAppendElement(json, "tcp", data);
}

BufferPrintf(pbuf, "%s/proc/net/tcp6", procdir_root);
BufferPrintf(pbuf, "%s/proc/%d/net/tcp6", procdir_root, promiser_pid);
data = GetProcFileInfo(ctx, BufferData(pbuf), NULL, NULL, &NetworkingPortsPostProcessInfo, NULL, ports_regex);
if (data != NULL)
{
JsonObjectAppendElement(json, "tcp6", data);
}

BufferPrintf(pbuf, "%s/proc/net/udp", procdir_root);
BufferPrintf(pbuf, "%s/proc/%d/net/udp", procdir_root, promiser_pid);
data = GetProcFileInfo(ctx, BufferData(pbuf), NULL, NULL, &NetworkingPortsPostProcessInfo, NULL, ports_regex);
if (data != NULL)
{
JsonObjectAppendElement(json, "udp", data);
}

BufferPrintf(pbuf, "%s/proc/net/udp6", procdir_root);
BufferPrintf(pbuf, "%s/proc/%d/net/udp6", procdir_root, promiser_pid);
data = GetProcFileInfo(ctx, BufferData(pbuf), NULL, NULL, &NetworkingPortsPostProcessInfo, NULL, ports_regex);
if (data != NULL)
{
Expand Down
Loading