8000 nstun: validate UDP reply peers by samuelgirmametaferia · Pull Request #316 · google/nsjail · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ endif

BIN = nsjail
LIBS = kafel/libkafel.a
TEST_BINS = tests/nstun_buffer_budget_test tests/nstun_policy_test tests/nstun_ip_test
TEST_BINS = tests/nstun_buffer_budget_test tests/nstun_policy_test tests/nstun_ip_test tests/nstun_udp_peer_test

# If PASTA_BIN_PATH is not provided in env, dynamically search for it if EMBED_PASTA is requested
# or fallback to it naturally.
Expand Down Expand Up @@ -164,6 +164,7 @@ test: $(BIN) $(TEST_BINS) test-cmdline
$(call run_test, ./tests/nstun_buffer_budget_test, 0)
$(call run_test, ./tests/nstun_policy_test, 0)
$(call run_test, ./tests/nstun_ip_test, 0)
$(call run_test, ./tests/nstun_udp_peer_test, 0)
# --- Basic sanity tests ---
$(call run_test, ./nsjail -q -Mo --chroot / --user 99999 --group 99999 -- /bin/true, 0)
$(call run_test, ./nsjail -q -Mo --chroot / --user 99999 --group 99999 -- /bin/false, 1)
Expand Down Expand Up @@ -271,6 +272,9 @@ tests/nstun_policy_test: tests/nstun_policy_test.cc nstun/policy.cc logs.cc util
tests/nstun_ip_test: tests/nstun_ip_test.cc nstun/net_defs.h
$(CXX) $(filter-out -c,$(CXXFLAGS)) tests/nstun_ip_test.cc -o $@

tests/nstun_udp_peer_test: tests/nstun_udp_peer_test.cc nstun/udp_peer.h nstun/core.h
$(CXX) $(filter-out -c,$(CXXFLAGS)) tests/nstun_udp_peer_test.cc -o $@

# Dependencies (Generated by makedepend)
# DO NOT DELETE THIS LINE -- make depend depends on it.

Expand Down
6 changes: 6 additions & 0 deletions nstun/udp.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "macros.h"
#include "policy.h"
#include "tun.h"
#include "udp_peer.h"

namespace nstun {

Expand Down Expand Up @@ -609,6 +610,11 @@ static void handle_host_udp(Context* ctx, UdpFlow* flow) {
size_t data_len = msgs[i].msg_len;
struct sockaddr_storage* src_addr_storage = &src_addrs[i];

if (!udp_peer_matches_flow(*flow, *src_addr_storage)) {
LOG_W("Dropping UDP datagram from unexpected peer");
continue;
}

if (flow->use_socks5) {
if (data_len < sizeof(socks5_udp_hdr))
continue; /* Too short for any SOCKS5 UDP */
Expand Down
57 changes: 57 additions & 0 deletions nstun/udp_peer.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#ifndef NSTUN_UDP_PEER_H_
#define NSTUN_UDP_PEER_H_

#include <arpa/inet.h>
#include <string.h>
#include <sys/socket.h>

#include "core.h"

namespace nstun {

template <typename FlowT>
inline bool udp_peer_matches_flow(const FlowT& flow, const struct sockaddr_storage& peer) {
if (flow.use_socks5) {
if (peer.ss_family != AF_INET) return false;
const auto* peer4 = reinterpret_cast<const struct sockaddr_in*>(&peer);
return peer4->sin_addr.s_addr == flow.bnd_ip && peer4->sin_port == flow.bnd_port;
}

if (flow.is_ipv6) {
if (peer.ss_family != AF_INET6) return false;
const auto* peer6 = reinterpret_cast<const struct sockaddr_in6*>(&peer);
const uint8_t* expected_ip = flow.key6.daddr6;
uint16_t expected_port = flow.key6.dport;
if (flow.is_redirected) {
bool has_redirect_ip = false;
for (size_t i = 0; i < IPV6_ADDR_LEN; i++) {
if (flow.redirect_ip6[i] != 0) {
has_redirect_ip = true;
break;
}
}
/* Current REDIRECT forwarding changes the peer only when both
* target components are present. */
if (has_redirect_ip && flow.redirect_port != 0) {
expected_ip = flow.redirect_ip6;
expected_port = htons(flow.redirect_port);
}
}
return memcmp(&peer6->sin6_addr, expected_ip, IPV6_ADDR_LEN) == 0 &&
peer6->sin6_port == expected_port;
}

if (peer.ss_family != AF_INET) return false;
const auto* peer4 = reinterpret_cast<const struct sockaddr_in*>(&peer);
uint32_t expected_ip = flow.key4.daddr4;
uint16_t expected_port = flow.key4.dport;
if (flow.is_redirected && flow.redirect_ip4 != 0 && flow.redirect_port != 0) {
expected_ip = flow.redirect_ip4;
expected_port = htons(flow.redirect_port);
}
return peer4->sin_addr.s_addr == expected_ip && peer4->sin_port == expected_port;
}

} /* namespace nstun */

#endif /* NSTUN_UDP_PEER_H_ */
86 changes: 86 additions & 0 deletions tests/nstun_udp_peer_test.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
#include <assert.h>

#include <arpa/inet.h>
#include <string.h>

#include "nstun/udp_peer.h"

struct FakeUdpFlow {
bool is_ipv6 = false;
bool is_redirected = false;
bool use_socks5 = false;
union {
nstun::FlowKey4 key4;
nstun::FlowKey6 key6;
};
uint32_t redirect_ip4 = 0;
uint8_t redirect_ip6[nstun::IPV6_ADDR_LEN] = {};
uint16_t redirect_port = 0;
uint32_t bnd_ip = 0;
uint16_t bnd_port = 0;

FakeUdpFlow() : key4{} {}
};

static uint32_t parse_ip4(const char* str) {
uint32_t addr;
assert(inet_pton(AF_INET, str, &addr) == 1);
return addr;
}

static sockaddr_storage peer4(const char* ip, uint16_t port) {
sockaddr_storage storage = {};
auto* addr = reinterpret_cast<sockaddr_in*>(&storage);
addr->sin_family = AF_INET;
addr->sin_addr.s_addr = parse_ip4(ip);
addr->sin_port = htons(port);
return storage;
}

static sockaddr_storage peer6(const char* ip, uint16_t port) {
sockaddr_storage storage = {};
auto* addr = reinterpret_cast<sockaddr_in6*>(&storage);
addr->sin6_family = AF_INET6;
assert(inet_pton(AF_INET6, ip, &addr->sin6_addr) == 1);
addr->sin6_port = htons(port);
return storage;
}

int main() {
FakeUdpFlow flow4;
flow4.key4.daddr4 = parse_ip4("203.0.113.10");
flow4.key4.dport = htons(53);
assert(nstun::udp_peer_matches_flow(flow4, peer4("203.0.113.10", 53)));
assert(!nstun::udp_peer_matches_flow(flow4, peer4("203.0.113.11", 53)));
assert(!nstun::udp_peer_matches_flow(flow4, peer4("203.0.113.10", 54)));

flow4.is_redirected = true;
flow4.redirect_ip4 = parse_ip4("192.0.2.20");
flow4.redirect_port = 5353;
assert(nstun::udp_peer_matches_flow(flow4, peer4("192.0.2.20", 5353)));
assert(!nstun::udp_peer_matches_flow(flow4, peer4("203.0.113.10", 53)));

FakeUdpFlow flow6;
flow6.is_ipv6 = true;
memset(&flow6.key6, 0, sizeof(flow6.key6));
assert(inet_pton(AF_INET6, "2001:db8::10", flow6.key6.daddr6) == 1);
flow6.key6.dport = htons(443);
assert(nstun::udp_peer_matches_flow(flow6, peer6("2001:db8::10", 443)));
assert(!nstun::udp_peer_matches_flow(flow6, peer6("2001:db8::11", 443)));

flow6.is_redirected = true;
assert(inet_pton(AF_INET6, "2001:db8::20", flow6.redirect_ip6) == 1);
flow6.redirect_port = 8443;
assert(nstun::udp_peer_matches_flow(flow6, peer6("2001:db8::20", 8443)));
assert(!nstun::udp_peer_matches_flow(flow6, peer6("2001:db8::10", 443)));

FakeUdpFlow socks;
socks.use_socks5 = true;
socks.bnd_ip = parse_ip4("198.51.100.9");
socks.bnd_port = htons(1080);
assert(nstun::udp_peer_matches_flow(socks, peer4("198.51.100.9", 1080)));
assert(!nstun::udp_peer_matches_flow(socks, peer4("198.51.100.10", 1080)));
assert(!nstun::udp_peer_matches_flow(socks, peer6("2001:db8::9", 1080)));

return 0;
}
0