Skip to content

Update raw socket test #27

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
wants to merge 1 commit into
base: occlum-release-20250325.0
Choose a base branch
from
Open

Update raw socket test #27

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
26 changes: 0 additions & 26 deletions occlum/blocklist/packet_socket_raw_test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1 @@
AllInetTests/RawPacketTest.Receive/0
AllInetTests/RawPacketTest.Receive/1
AllInetTests/RawPacketTest.Send/0
AllInetTests/RawPacketTest.Send/
AllInetTests/RawPacketTest.SetSocketRecvBufBelowMin/0
AllInetTests/RawPacketTest.SetSocketRecvBufBelowMin/1
AllInetTests/RawPacketTest.SetSocketRecvBufAboveMax/0
AllInetTests/RawPacketTest.SetSocketRecvBufAboveMax/1
AllInetTests/RawPacketTest.SetSocketRecvBuf/0
AllInetTests/RawPacketTest.SetSocketRecvBuf/1
AllInetTests/RawPacketTest.SetSocketSendBufBelowMin/0
AllInetTests/RawPacketTest.SetSocketSendBufBelowMin/1
AllInetTests/RawPacketTest.SetSocketSendBufAboveMax/0
AllInetTests/RawPacketTest.SetSocketSendBufAboveMax/1
AllInetTests/RawPacketTest.SetSocketSendBuf/0
AllInetTests/RawPacketTest.SetSocketSendBuf/1
AllInetTests/RawPacketTest.GetSocketError/0
AllInetTests/RawPacketTest.GetSocketError/1
AllInetTests/RawPacketTest.GetSocketErrorBind/0
AllInetTests/RawPacketTest.GetSocketErrorBind/1
AllInetTests/RawPacketTest.SetSocketDetachFilterNoInstalledFilter/0
AllInetTests/RawPacketTest.SetSocketDetachFilterNoInstalledFilter/1
AllInetTests/RawPacketTest.GetSocketDetachFilter/0
AllInetTests/RawPacketTest.GetSocketDetachFilter/1
AllInetTests/RawPacketTest.SetAndGetSocketLinger/0
AllInetTests/RawPacketTest.SetAndGetSocketLinger/1
AllInetTests/RawPacketTest.Send/1
9 changes: 1 addition & 8 deletions occlum/blocklist/packet_socket_test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
BasicCookedPacketTest.WrongType
AllInetTests/CookedPacketTest.Receive/0
AllInetTests/CookedPacketTest.Receive/1
AllInetTests/CookedPacketTest.Send/0
AllInetTests/CookedPacketTest.Send/1
AllInetTests/CookedPacketTest.BindReceive/0
AllInetTests/CookedPacketTest.BindReceive/1
AllInetTests/CookedPacketTest.DoubleBindSucceeds/0
AllInetTests/CookedPacketTest.DoubleBindSucceeds/1
AllInetTests/CookedPacketTest.BindDrop/0
AllInetTests/CookedPacketTest.BindDrop/1
AllInetTests/CookedPacketTest.ReceiveOutbound/0
AllInetTests/CookedPacketTest.ReceiveOutbound/1
AllInetTests/CookedPacketTest.BindFail/0
AllInetTests/CookedPacketTest.BindFail/1
AllInetTests/CookedPacketTest.BindFail/1
16 changes: 1 addition & 15 deletions occlum/blocklist/raw_socket_hdrincl_test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1 @@
RawHDRINCL.MultipleCreation
RawHDRINCL.FailShutdownWithoutConnect
RawHDRINCL.FailListen
RawHDRINCL.FailAccept
RawHDRINCL.PollWritableImmediately
RawHDRINCL.NotReadable
RawHDRINCL.ConnectToLoopback
RawHDRINCL.SendWithoutConnectSucceeds
RawHDRINCL.NotReadableAfterWrite
RawHDRINCL.WriteTooSmall
RawHDRINCL.BindToLocalhost
RawHDRINCL.BindToInvalid
RawHDRINCL.SendAndReceive
RawHDRINCL.SendAndReceiveDifferentAddress
RawHDRINCL.SendAndReceiveIPHdrIncl
RawHDRINCL.FailAccept
120 changes: 1 addition & 119 deletions occlum/blocklist/raw_socket_test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,125 +1,7 @@
RawSocketTest.IPv6ProtoRaw
AllInetTests/RawSocketTest.MultipleCreation/0
AllInetTests/RawSocketTest.MultipleCreation/1
AllInetTests/RawSocketTest.MultipleCreation/2
AllInetTests/RawSocketTest.MultipleCreation/3
AllInetTests/RawSocketTest.FailShutdownWithoutConnect/0
AllInetTests/RawSocketTest.FailShutdownWithoutConnect/1
AllInetTests/RawSocketTest.FailShutdownWithoutConnect/2
AllInetTests/RawSocketTest.FailShutdownWithoutConnect/3
AllInetTests/RawSocketTest.ShutdownWriteNoop/0
AllInetTests/RawSocketTest.ShutdownWriteNoop/1
AllInetTests/RawSocketTest.ShutdownWriteNoop/2
AllInetTests/RawSocketTest.ShutdownWriteNoop/3
AllInetTests/RawSocketTest.ShutdownReadNoop/0
AllInetTests/RawSocketTest.ShutdownReadNoop/1
AllInetTests/RawSocketTest.ShutdownReadNoop/2
AllInetTests/RawSocketTest.ShutdownReadNoop/3
AllInetTests/RawSocketTest.FailListen/0
AllInetTests/RawSocketTest.FailListen/1
AllInetTests/RawSocketTest.FailListen/2
AllInetTests/RawSocketTest.FailListen/3
AllInetTests/RawSocketTest.FailAccept/0
AllInetTests/RawSocketTest.FailAccept/1
AllInetTests/RawSocketTest.FailAccept/2
AllInetTests/RawSocketTest.FailAccept/3
AllInetTests/RawSocketTest.FailGetPeerNameBeforeConnect/0
AllInetTests/RawSocketTest.FailGetPeerNameBeforeConnect/1
AllInetTests/RawSocketTest.FailGetPeerNameBeforeConnect/2
AllInetTests/RawSocketTest.FailGetPeerNameBeforeConnect/3
AllInetTests/RawSocketTest.GetPeerName/0
AllInetTests/RawSocketTest.GetPeerName/1
AllInetTests/RawSocketTest.GetPeerName/2
AllInetTests/RawSocketTest.GetPeerName/3
AllInetTests/RawSocketTest.PollWritableImmediately/0
AllInetTests/RawSocketTest.PollWritableImmediately/1
AllInetTests/RawSocketTest.PollWritableImmediately/2
AllInetTests/RawSocketTest.PollWritableImmediately/3
AllInetTests/RawSocketTest.PollNotReadableInitially/0
AllInetTests/RawSocketTest.PollNotReadableInitially/1
AllInetTests/RawSocketTest.PollNotReadableInitially/2
AllInetTests/RawSocketTest.PollNotReadableInitially/3
AllInetTests/RawSocketTest.PollTriggeredOnWrite/0
AllInetTests/RawSocketTest.PollTriggeredOnWrite/1
AllInetTests/RawSocketTest.PollTriggeredOnWrite/2
AllInetTests/RawSocketTest.PollTriggeredOnWrite/3
AllInetTests/RawSocketTest.ConnectToLoopback/0
AllInetTests/RawSocketTest.ConnectToLoopback/1
AllInetTests/RawSocketTest.ConnectToLoopback/2
AllInetTests/RawSocketTest.ConnectToLoopback/3
AllInetTests/RawSocketTest.SendWithoutConnectFails/0
AllInetTests/RawSocketTest.SendWithoutConnectFails/1
AllInetTests/RawSocketTest.SendWithoutConnectFails/2
AllInetTests/RawSocketTest.SendWithoutConnectFails/3
AllInetTests/RawSocketTest.BindToWildcard/0
AllInetTests/RawSocketTest.BindToWildcard/1
AllInetTests/RawSocketTest.BindToWildcard/2
AllInetTests/RawSocketTest.BindToWildcard/3
AllInetTests/RawSocketTest.BindToLocalhost/0
AllInetTests/RawSocketTest.BindToLocalhost/1
AllInetTests/RawSocketTest.BindToLocalhost/2
AllInetTests/RawSocketTest.BindToLocalhost/3
AllInetTests/RawSocketTest.BindToInvalid/0
AllInetTests/RawSocketTest.BindToInvalid/1
AllInetTests/RawSocketTest.BindToInvalid/2
AllInetTests/RawSocketTest.BindToInvalid/3
AllInetTests/RawSocketTest.SendAndReceive/0
AllInetTests/RawSocketTest.SendAndReceive/1
AllInetTests/RawSocketTest.SendAndReceive/2
AllInetTests/RawSocketTest.SendAndReceive/3
AllInetTests/RawSocketTest.MultipleSocketReceive/0
AllInetTests/RawSocketTest.MultipleSocketReceive/1
AllInetTests/RawSocketTest.MultipleSocketReceive/2
AllInetTests/RawSocketTest.MultipleSocketReceive/3
AllInetTests/RawSocketTest.SendAndReceiveViaConnect/0
AllInetTests/RawSocketTest.SendAndReceiveViaConnect/1
AllInetTests/RawSocketTest.SendAndReceiveViaConnect/2
AllInetTests/RawSocketTest.SendAndReceiveViaConnect/3
AllInetTests/RawSocketTest.BindSendAndReceive/0
AllInetTests/RawSocketTest.BindSendAndReceive/1
AllInetTests/RawSocketTest.BindSendAndReceive/2
AllInetTests/RawSocketTest.BindSendAndReceive/3
AllInetTests/RawSocketTest.BindConnectSendAndReceive/0
AllInetTests/RawSocketTest.BindConnectSendAndReceive/1
AllInetTests/RawSocketTest.BindConnectSendAndReceive/2
AllInetTests/RawSocketTest.BindConnectSendAndReceive/3
AllInetTests/RawSocketTest.SetSocketRecvBufBelowMin/0
AllInetTests/RawSocketTest.SetSocketRecvBufBelowMin/1
AllInetTests/RawSocketTest.SetSocketRecvBufBelowMin/2
AllInetTests/RawSocketTest.SetSocketRecvBufBelowMin/3
AllInetTests/RawSocketTest.SetSocketRecvBufAboveMax/0
AllInetTests/RawSocketTest.SetSocketRecvBufAboveMax/1
AllInetTests/RawSocketTest.SetSocketRecvBufAboveMax/2
AllInetTests/RawSocketTest.SetSocketRecvBufAboveMax/3
AllInetTests/RawSocketTest.SetSocketRecvBuf/0
AllInetTests/RawSocketTest.SetSocketRecvBuf/1
AllInetTests/RawSocketTest.SetSocketRecvBuf/2
AllInetTests/RawSocketTest.SetSocketRecvBuf/3
AllInetTests/RawSocketTest.SetSocketSendBufBelowMin/0
AllInetTests/RawSocketTest.SetSocketSendBufBelowMin/1
AllInetTests/RawSocketTest.SetSocketSendBufBelowMin/2
AllInetTests/RawSocketTest.SetSocketSendBufBelowMin/3
AllInetTests/RawSocketTest.SetSocketSendBufAboveMax/0
AllInetTests/RawSocketTest.SetSocketSendBufAboveMax/1
AllInetTests/RawSocketTest.SetSocketSendBufAboveMax/2
AllInetTests/RawSocketTest.SetSocketSendBufAboveMax/3
AllInetTests/RawSocketTest.SetSocketSendBuf/0
AllInetTests/RawSocketTest.SetSocketSendBuf/1
AllInetTests/RawSocketTest.SetSocketSendBuf/2
AllInetTests/RawSocketTest.SetSocketSendBuf/3
AllInetTests/RawSocketTest.RecvBufLimitsEmptyRecvBuffer/0
AllInetTests/RawSocketTest.RecvBufLimitsEmptyRecvBuffer/1
AllInetTests/RawSocketTest.RecvBufLimitsEmptyRecvBuffer/2
AllInetTests/RawSocketTest.RecvBufLimitsEmptyRecvBuffer/3
AllInetTests/RawSocketTest.RecvBufLimits/0
AllInetTests/RawSocketTest.RecvBufLimits/1
AllInetTests/RawSocketTest.RecvBufLimits/2
AllInetTests/RawSocketTest.RecvBufLimits/3
AllInetTests/RawSocketTest.SetSocketDetachFilterNoInstalledFilter/0
AllInetTests/RawSocketTest.SetSocketDetachFilterNoInstalledFilter/1
AllInetTests/RawSocketTest.SetSocketDetachFilterNoInstalledFilter/2
AllInetTests/RawSocketTest.SetSocketDetachFilterNoInstalledFilter/3
AllInetTests/RawSocketTest.GetSocketDetachFilter/0
AllInetTests/RawSocketTest.GetSocketDetachFilter/1
AllInetTests/RawSocketTest.GetSocketDetachFilter/2
AllInetTests/RawSocketTest.GetSocketDetachFilter/3
AllInetTests/RawSocketTest.RecvBufLimits/3
54 changes: 27 additions & 27 deletions test/syscalls/linux/packet_socket.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ void SendUDPMessage(int sock) {

// Send an IP packet and make sure ETH_P_<something else> doesn't pick it up.
TEST(BasicCookedPacketTest, WrongType) {
if (!ASSERT_NO_ERRNO_AND_VALUE(HaveCapability(CAP_NET_RAW))) {
ASSERT_THAT(socket(AF_PACKET, SOCK_DGRAM, ETH_P_PUP),
SyscallFailsWithErrno(EPERM));
GTEST_SKIP();
}
// if (!ASSERT_NO_ERRNO_AND_VALUE(HaveCapability(CAP_NET_RAW))) {
// ASSERT_THAT(socket(AF_PACKET, SOCK_DGRAM, ETH_P_PUP),
// SyscallFailsWithErrno(EPERM));
// GTEST_SKIP();
// }

FileDescriptor sock = ASSERT_NO_ERRNO_AND_VALUE(
Socket(AF_PACKET, SOCK_DGRAM, htons(ETH_P_PUP)));
Expand Down Expand Up @@ -125,35 +125,35 @@ class CookedPacketTest : public ::testing::TestWithParam<int> {
};

void CookedPacketTest::SetUp() {
if (!ASSERT_NO_ERRNO_AND_VALUE(HaveCapability(CAP_NET_RAW))) {
ASSERT_THAT(socket(AF_PACKET, SOCK_DGRAM, htons(GetParam())),
SyscallFailsWithErrno(EPERM));
GTEST_SKIP();
}

if (!IsRunningOnGvisor()) {
FileDescriptor acceptLocal = ASSERT_NO_ERRNO_AND_VALUE(
Open("/proc/sys/net/ipv4/conf/lo/accept_local", O_RDONLY));
FileDescriptor routeLocalnet = ASSERT_NO_ERRNO_AND_VALUE(
Open("/proc/sys/net/ipv4/conf/lo/route_localnet", O_RDONLY));
char enabled;
ASSERT_THAT(read(acceptLocal.get(), &enabled, 1),
SyscallSucceedsWithValue(1));
ASSERT_EQ(enabled, '1');
ASSERT_THAT(read(routeLocalnet.get(), &enabled, 1),
SyscallSucceedsWithValue(1));
ASSERT_EQ(enabled, '1');
}
// if (!ASSERT_NO_ERRNO_AND_VALUE(HaveCapability(CAP_NET_RAW))) {
// ASSERT_THAT(socket(AF_PACKET, SOCK_DGRAM, htons(GetParam())),
// SyscallFailsWithErrno(EPERM));
// GTEST_SKIP();
// }

// if (!IsRunningOnGvisor()) {
// FileDescriptor acceptLocal = ASSERT_NO_ERRNO_AND_VALUE(
// Open("/proc/sys/net/ipv4/conf/lo/accept_local", O_RDONLY));
// FileDescriptor routeLocalnet = ASSERT_NO_ERRNO_AND_VALUE(
// Open("/proc/sys/net/ipv4/conf/lo/route_localnet", O_RDONLY));
// char enabled;
// ASSERT_THAT(read(acceptLocal.get(), &enabled, 1),
// SyscallSucceedsWithValue(1));
// ASSERT_EQ(enabled, '1');
// ASSERT_THAT(read(routeLocalnet.get(), &enabled, 1),
// SyscallSucceedsWithValue(1));
// ASSERT_EQ(enabled, '1');
// }

ASSERT_THAT(socket_ = socket(AF_PACKET, SOCK_DGRAM, htons(GetParam())),
SyscallSucceeds());
}

void CookedPacketTest::TearDown() {
// TearDown will be run even if we skip the test.
if (ASSERT_NO_ERRNO_AND_VALUE(HaveCapability(CAP_NET_RAW))) {
EXPECT_THAT(close(socket_), SyscallSucceeds());
}
// if (ASSERT_NO_ERRNO_AND_VALUE(HaveCapability(CAP_NET_RAW))) {
// EXPECT_THAT(close(socket_), SyscallSucceeds());
// }
}

int CookedPacketTest::GetLoopbackIndex() {
Expand Down
Loading