Skip to content

Commit

Permalink
cap_net: allow to use the service without setting the limits
Browse files Browse the repository at this point in the history 
Add test to ensure that this is possible.
  • Loading branch information
@oshogbo
oshogbo committed Jan 3, 2021
1 parent 4084669 commit b7876ae
Show file tree
Hide file tree
Showing 2 changed files with 113 additions and 6 deletions.
32 changes: 26 additions & 6 deletions lib/libcasper/services/cap_net/cap_net.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,11 @@ net_gethostbyname(const nvlist_t *limits, const nvlist_t *nvlin,
return (ENOTCAPABLE);

dnscache = net_allowed_mode(limits, CAPNET_CONNECTDNS);
funclimit = dnvlist_get_nvlist(limits, LIMIT_NV_NAME2ADDR, NULL);
funclimit = NULL;
if (limits != NULL) {
funclimit = dnvlist_get_nvlist(limits, LIMIT_NV_NAME2ADDR,
NULL);
}

family = (int)nvlist_get_number(nvlin, "family");
if (!net_allowed_family(funclimit, family))
Expand Down Expand Up @@ -825,7 +829,11 @@ net_gethostbyaddr(const nvlist_t *limits, const nvlist_t *nvlin,
if (!net_allowed_mode(limits, CAPNET_DEPRECATED_ADDR2NAME))
return (ENOTCAPABLE);

funclimit = dnvlist_get_nvlist(limits, LIMIT_NV_ADDR2NAME, NULL);
funclimit = NULL;
if (limits != NULL) {
funclimit = dnvlist_get_nvlist(limits, LIMIT_NV_ADDR2NAME,
NULL);
}

family = (int)nvlist_get_number(nvlin, "family");
if (!net_allowed_family(funclimit, family))
Expand Down Expand Up @@ -855,7 +863,11 @@ net_getnameinfo(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)

if (!net_allowed_mode(limits, CAPNET_ADDR2NAME))
return (ENOTCAPABLE);
funclimit = dnvlist_get_nvlist(limits, LIMIT_NV_ADDR2NAME, NULL);
funclimit = NULL;
if (limits != NULL) {
funclimit = dnvlist_get_nvlist(limits, LIMIT_NV_ADDR2NAME,
NULL);
}

error = 0;
host = serv = NULL;
Expand Down Expand Up @@ -954,7 +966,11 @@ net_getaddrinfo(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
if (!net_allowed_mode(limits, CAPNET_NAME2ADDR))
return (ENOTCAPABLE);
dnscache = net_allowed_mode(limits, CAPNET_CONNECTDNS);
funclimit = dnvlist_get_nvlist(limits, LIMIT_NV_NAME2ADDR, NULL);
funclimit = NULL;
if (limits != NULL) {
funclimit = dnvlist_get_nvlist(limits, LIMIT_NV_NAME2ADDR,
NULL);
}

hostname = dnvlist_get_string(nvlin, "hostname", NULL);
servname = dnvlist_get_string(nvlin, "servname", NULL);
Expand Down Expand Up @@ -1014,7 +1030,9 @@ net_bind(const nvlist_t *limits, nvlist_t *nvlin, nvlist_t *nvlout)

if (!net_allowed_mode(limits, CAPNET_BIND))
return (ENOTCAPABLE);
funclimit = dnvlist_get_nvlist(limits, LIMIT_NV_BIND, NULL);
funclimit = NULL;
if (limits != NULL)
funclimit = dnvlist_get_nvlist(limits, LIMIT_NV_BIND, NULL);

saddr = nvlist_get_binary(nvlin, "saddr", &len);

Expand Down Expand Up @@ -1048,7 +1066,9 @@ net_connect(const nvlist_t *limits, nvlist_t *nvlin, nvlist_t *nvlout)
if (!conn && !conndns)
return (ENOTCAPABLE);

funclimit = dnvlist_get_nvlist(limits, LIMIT_NV_CONNECT, NULL);
funclimit = NULL;
if (limits != NULL)
funclimit = dnvlist_get_nvlist(limits, LIMIT_NV_CONNECT, NULL);

saddr = nvlist_get_binary(nvlin, "saddr", &len);
if (conn && !net_allowed_bsaddr(funclimit, saddr, len)) {
Expand Down
87 changes: 87 additions & 0 deletions lib/libcasper/services/cap_net/tests/net_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,86 @@ test_extend_mode(cap_channel_t *capnet, int current)
}
}

ATF_TC_WITHOUT_HEAD(capnet__getnameinfo);
ATF_TC_BODY(capnet__getnameinfo, tc)
{
cap_channel_t *capnet;

capnet = create_network_service();

ATF_REQUIRE(test_getnameinfo(capnet, AF_INET, TEST_IPV4) == 0);
ATF_REQUIRE(test_getnameinfo(capnet, AF_INET6, TEST_IPV6) == 0);

cap_close(capnet);
}

ATF_TC_WITHOUT_HEAD(capnet__connect);
ATF_TC_BODY(capnet__connect, tc)
{
cap_channel_t *capnet;

capnet = create_network_service();

ATF_REQUIRE(test_connect(capnet, TEST_IPV4, 80) == 0);

cap_close(capnet);
}

ATF_TC_WITHOUT_HEAD(capnet__bind);
ATF_TC_BODY(capnet__bind, tc)
{
cap_channel_t *capnet;

capnet = create_network_service();

ATF_REQUIRE(test_bind(capnet, TEST_BIND_IPV4) == 0);

cap_close(capnet);
}

ATF_TC_WITHOUT_HEAD(capnet__getaddrinfo);
ATF_TC_BODY(capnet__getaddrinfo, tc)
{
cap_channel_t *capnet;
struct addrinfo hints, *capres;

capnet = create_network_service();

memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_STREAM;

ATF_REQUIRE(cap_getaddrinfo(capnet, TEST_IPV4, "80", &hints, &capres) ==
0);

cap_close(capnet);
}

ATF_TC_WITHOUT_HEAD(capnet__gethostbyname);
ATF_TC_BODY(capnet__gethostbyname, tc)
{
cap_channel_t *capnet;

capnet = create_network_service();

ATF_REQUIRE(test_gethostbyname(capnet, AF_INET, TEST_DOMAIN_0) == 0);

cap_close(capnet);
}

ATF_TC_WITHOUT_HEAD(capnet__gethostbyaddr);
ATF_TC_BODY(capnet__gethostbyaddr, tc)
{
cap_channel_t *capnet;

capnet = create_network_service();

ATF_REQUIRE(test_gethostbyaddr(capnet, AF_INET, TEST_IPV4) == 0);
ATF_REQUIRE(test_gethostbyaddr(capnet, AF_INET6, TEST_IPV6) == 0);

cap_close(capnet);
}

ATF_TC_WITHOUT_HEAD(capnet__limits_addr2name_mode);
ATF_TC_BODY(capnet__limits_addr2name_mode, tc)
{
Expand Down Expand Up @@ -1129,6 +1209,13 @@ ATF_TC_BODY(capnet__limits_deprecated_connecttodns, tc)
ATF_TP_ADD_TCS(tp)
{

ATF_TP_ADD_TC(tp, capnet__connect);
ATF_TP_ADD_TC(tp, capnet__bind);
ATF_TP_ADD_TC(tp, capnet__getnameinfo);
ATF_TP_ADD_TC(tp, capnet__getaddrinfo);
ATF_TP_ADD_TC(tp, capnet__gethostbyname);
ATF_TP_ADD_TC(tp, capnet__gethostbyaddr);

ATF_TP_ADD_TC(tp, capnet__limits_addr2name_mode);
ATF_TP_ADD_TC(tp, capnet__limits_addr2name_family);
ATF_TP_ADD_TC(tp, capnet__limits_addr2name);
Expand Down

0 comments on commit b7876ae

Please sign in to comment.