Page MenuHomeClusterLabs Projects
Files F3152058

No OneTemporary
Actions

View Options

diff --git a/libknet/tests/Makefile.am b/libknet/tests/Makefile.am
index eae5c803..3e74ea8e 100644
--- a/libknet/tests/Makefile.am
+++ b/libknet/tests/Makefile.am
@@ -1,93 +1,92 @@
#
# Copyright (C) 2016-2019 Red Hat, Inc. All rights reserved.
#
# Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
#
# This software licensed under GPL-2.0+, LGPL-2.0+
#
MAINTAINERCLEANFILES = Makefile.in
include $(top_srcdir)/build-aux/check.mk
include $(top_srcdir)/libknet/tests/api-check.mk
EXTRA_DIST = \
api-test-coverage \
- api-check.mk \
- int_links_acl.txt
+ api-check.mk
AM_CPPFLAGS = -I$(top_srcdir)/libknet
AM_CFLAGS += $(PTHREAD_CFLAGS)
LIBS = $(top_builddir)/libknet/libknet.la \
$(PTHREAD_LIBS) $(dl_LIBS)
noinst_HEADERS = \
test-common.h
# the order of those tests is NOT random.
# some functions can only be tested properly after some dependents
# API have been validated upfront.
check_PROGRAMS = \
$(api_checks) \
$(int_checks) \
$(fun_checks)
int_checks = \
+ int_links_acl_ip_test \
int_timediff_test
fun_checks =
benchmarks = \
knet_bench_test
# int_links_acl_test can´t run yet standalone
noinst_PROGRAMS = \
api_knet_handle_new_limit_test \
pckt_test \
- int_links_acl_test \
$(benchmarks) \
$(check_PROGRAMS)
noinst_SCRIPTS = \
api-test-coverage
TESTS = $(check_PROGRAMS)
if INSTALL_TESTS
testsuitedir = $(TESTDIR)
testsuite_PROGRAMS = $(noinst_PROGRAMS)
endif
check-local: check-api-test-coverage
check-api-test-coverage:
chmod u+x $(top_srcdir)/libknet/tests/api-test-coverage
$(top_srcdir)/libknet/tests/api-test-coverage $(top_srcdir) $(top_builddir)
pckt_test_SOURCES = pckt_test.c
-int_links_acl_test_SOURCES = int_links_acl.c \
- ../common.c \
- ../compat.c \
- ../logging.c \
- ../netutils.c \
- ../threads_common.c \
- ../transports.c \
- ../transport_common.c \
- ../transport_loopback.c \
- ../transport_sctp.c \
- ../transport_udp.c \
- ../links_acl.c \
- ../links_acl_ip.c \
- ../links_acl_loopback.c
+int_links_acl_ip_test_SOURCES = int_links_acl_ip.c \
+ ../common.c \
+ ../compat.c \
+ ../logging.c \
+ ../netutils.c \
+ ../threads_common.c \
+ ../transports.c \
+ ../transport_common.c \
+ ../transport_loopback.c \
+ ../transport_sctp.c \
+ ../transport_udp.c \
+ ../links_acl.c \
+ ../links_acl_ip.c \
+ ../links_acl_loopback.c
int_timediff_test_SOURCES = int_timediff.c
knet_bench_test_SOURCES = knet_bench.c \
test-common.c \
../common.c \
../logging.c \
../compat.c \
../transport_common.c \
../threads_common.c
diff --git a/libknet/tests/int_links_acl.c b/libknet/tests/int_links_acl.c
deleted file mode 100644
index 15e8e076..00000000
--- a/libknet/tests/int_links_acl.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (C) 2016-2019 Red Hat, Inc. All rights reserved.
- *
- * Author: Christine Caulfield <ccaulfie@redhat.com>
- *
- * This software licensed under GPL-2.0+, LGPL-2.0+
- */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <netdb.h>
-
-#include "internals.h"
-#include "links_acl.h"
-#include "links_acl_ip.h"
-
-static struct acl_match_entry *match_entry_v4;
-static struct acl_match_entry *match_entry_v6;
-
-/* This is a test program .. remember! */
-#define BUFLEN 1024
-
-static int get_ipaddress(char *buf, struct sockaddr_storage *addr)
-{
- struct addrinfo *info;
- struct addrinfo hints;
- int res;
-
- memset(&hints, 0, sizeof(hints));
- hints.ai_family = AF_UNSPEC;
-
- res = getaddrinfo(buf, NULL, &hints, &info);
- if (!res) {
- memmove(addr, info->ai_addr, info->ai_addrlen);
- freeaddrinfo(info);
- }
- return res;
-}
-
-static int read_address(char *buf, struct sockaddr_storage *addr)
-{
- return get_ipaddress(buf, addr);
-}
-
-static int read_mask(char *buf, struct sockaddr_storage *addr, struct sockaddr_storage *addr2)
-{
- char tmpbuf[BUFLEN];
- char *slash;
- int ret;
-
- slash = strchr(buf, '/');
- if (!slash)
- return 1;
-
- strncpy(tmpbuf, buf, slash-buf);
- tmpbuf[slash-buf] = '\0';
-
- ret = get_ipaddress(tmpbuf, addr);
- if (ret)
- return ret;
-
- ret = get_ipaddress(slash+1, addr2);
- if (ret)
- return ret;
-
- return 0;
-}
-
-static int read_range(char *buf, struct sockaddr_storage *addr1, struct sockaddr_storage *addr2)
-{
- char tmpbuf[BUFLEN];
- char *hyphen;
- int ret;
-
- hyphen = strchr(buf, '-');
- if (!hyphen)
- return 1;
-
- strncpy(tmpbuf, buf, hyphen-buf);
- tmpbuf[hyphen-buf] = '\0';
-
- ret = get_ipaddress(tmpbuf, addr1);
- if (ret)
- return ret;
-
- ret = get_ipaddress(hyphen+1, addr2);
- if (ret)
- return ret;
-
- return 0;
-}
-
-
-static int load_file(void)
-{
- FILE *filterfile;
- char filebuf[BUFLEN];
- int line = 0;
- int ret;
- check_type_t type;
- check_acceptreject_t acceptreject;
- struct sockaddr_storage addr1;
- struct sockaddr_storage addr2;
-
- ipcheck_rmall(&match_entry_v4);
- ipcheck_rmall(&match_entry_v6);
-
- filterfile = fopen("int_links_acl.txt", "r");
- if (!filterfile) {
- fprintf(stderr, "Cannot open int_links_acl.txt\n");
- return 1;
- }
-
- while (fgets(filebuf, sizeof(filebuf), filterfile)) {
- filebuf[strlen(filebuf)-1] = '\0'; /* remove trailing LF */
- line++;
-
- /*
- * First char is A (accept) or R (Reject)
- */
- switch(filebuf[0] & 0x5F) {
- case 'A':
- acceptreject = CHECK_ACCEPT;
- break;
- case 'R':
- acceptreject = CHECK_REJECT;
- break;
- default:
- fprintf(stderr, "Unknown record type on line %d: %s\n", line, filebuf);
- goto next_record;
- }
-
- /*
- * Second char is the filter type:
- * A Address
- * M Mask
- * R Range
- */
- switch(filebuf[1] & 0x5F) {
- case 'A':
- type = CHECK_TYPE_ADDRESS;
- ret = read_address(filebuf+2, &addr1);
- break;
- case 'M':
- type = CHECK_TYPE_MASK;
- ret = read_mask(filebuf+2, &addr1, &addr2);
- break;
- case 'R':
- type = CHECK_TYPE_RANGE;
- ret = read_range(filebuf+2, &addr1, &addr2);
- break;
- default:
- fprintf(stderr, "Unknown filter type on line %d: %s\n", line, filebuf);
- goto next_record;
- break;
- }
- if (ret) {
- fprintf(stderr, "Failed to parse address on line %d: %s\n", line, filebuf);
- }
- else {
- if (addr1.ss_family == AF_INET) {
- ipcheck_addip(&match_entry_v4, -1, &addr1, &addr2, type, acceptreject);
- } else {
- ipcheck_addip(&match_entry_v6, -1, &addr1, &addr2, type, acceptreject);
- }
- }
- next_record: {} /* empty statement to mollify the compiler */
- }
- fclose(filterfile);
-
- return 0;
-}
-
-int main(int argc, char *argv[])
-{
- struct sockaddr_storage saddr;
- struct acl_match_entry *match_entry;
- int ret;
- int i;
-
- if (load_file())
- return 1;
-
- for (i=1; i<argc; i++) {
- ret = get_ipaddress(argv[i], &saddr);
- if (ret) {
- fprintf(stderr, "Cannot parse address %s\n", argv[i]);
- } else {
- if (saddr.ss_family == AF_INET) {
- match_entry = match_entry_v4;
- } else {
- match_entry = match_entry_v6;
- }
- if (ipcheck_validate(&match_entry, &saddr)) {
- printf("%s is VALID\n", argv[i]);
- } else {
- printf("%s is not allowed\n", argv[i]);
- }
- }
- }
-
- ipcheck_rmall(&match_entry_v4);
- ipcheck_rmall(&match_entry_v6);
- return 0;
-}
diff --git a/libknet/tests/int_links_acl.txt b/libknet/tests/int_links_acl.txt
deleted file mode 100644
index 5776d54f..00000000
--- a/libknet/tests/int_links_acl.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-AA192.168.1.1
-AA192.168.1.2
-RA192.168.0.3
-AR192.168.0.0-192.168.0.250
-AM192.168.2.0/255.255.255.0
-AM1740::0/FFF0::0
-RA1000::666
-AR1000::1-2000::7FF
diff --git a/libknet/tests/int_links_acl_ip.c b/libknet/tests/int_links_acl_ip.c
new file mode 100644
index 00000000..a7d2aed8
--- /dev/null
+++ b/libknet/tests/int_links_acl_ip.c
@@ -0,0 +1,399 @@
+/*
+ * Copyright (C) 2016-2018 Red Hat, Inc. All rights reserved.
+ *
+ * Author: Christine Caulfield <ccaulfie@redhat.com>
+ *
+ * This software licensed under GPL-2.0+, LGPL-2.0+
+ */
+
+#include "config.h"
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <netdb.h>
+#include <errno.h>
+
+#include "internals.h"
+#include "links_acl.h"
+#include "links_acl_ip.h"
+
+#include "test-common.h"
+
+static struct acl_match_entry *match_entry_v4;
+static struct acl_match_entry *match_entry_v6;
+
+/* This is a test program .. remember! */
+#define BUFLEN 1024
+
+static int get_ipaddress(const char *buf, struct sockaddr_storage *addr)
+{
+ struct addrinfo *info;
+ struct addrinfo hints;
+
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+
+ if (getaddrinfo(buf, NULL, &hints, &info)) {
+ return -1;
+ }
+
+ memmove(addr, info->ai_addr, info->ai_addrlen);
+ freeaddrinfo(info);
+ return 0;
+}
+
+static int read_2ip(const char *buf, const char *delim, struct sockaddr_storage *addr, struct sockaddr_storage *addr2)
+{
+ char tmpbuf[BUFLEN];
+ char *deli;
+
+ deli = strstr(buf, delim);
+ if (!deli) {
+ return -1;
+ }
+
+ strncpy(tmpbuf, buf, deli-buf);
+ tmpbuf[deli-buf] = '\0';
+
+ if (get_ipaddress(tmpbuf, addr)) {
+ return -1;
+ }
+
+ if (get_ipaddress(deli+1, addr2)) {
+ return -1;
+ }
+
+ return 0;
+}
+
+/*
+ * be aware that ordering is important
+ * so we can test all the rules with few
+ * ipcheck_validate calls
+ */
+
+const char *rules[100] = {
+ /*
+ * ipv4
+ */
+ "RA192.168.0.3", /* reject address */
+ "AA192.168.0.1", /* accept address */
+ "RR192.168.0.10-192.168.0.20", /* reject range */
+ "AR192.168.0.0-192.168.0.255", /* accept range */
+ "RM192.168.2.0/255.255.255.0", /* reject mask */
+ "AM192.168.2.0/255.255.254.0", /* accept mask */
+ /*
+ * ipv6
+ */
+ "RA3ffe::3",
+ "AA3ffe::1",
+ "RR3ffe::10-3ffe::20",
+ "AR3ffe::0-3ffe::ff",
+ "RM3ffe:1::0/ffff:ffff:ffff:ffff:ffff:ffff:ffff:0",
+ "AM3ffe:1::0/ffff:ffff:ffff:ffff::0"
+};
+
+static int _ipcheck_addip(void *fd_tracker_match_entry_head,
+ struct sockaddr_storage *ss1, struct sockaddr_storage *ss2,
+ check_type_t type, check_acceptreject_t acceptreject)
+{
+ return ipcheck_addip(fd_tracker_match_entry_head, -1, ss1, ss2, type, acceptreject);
+}
+
+static int default_rules(int load)
+{
+ int ret;
+ check_type_t type;
+ check_acceptreject_t acceptreject;
+ struct sockaddr_storage addr1;
+ struct sockaddr_storage addr2;
+ int i = 0;
+ int (*loadfn)(void *fd_tracker_match_entry_head, struct sockaddr_storage *ss1, struct sockaddr_storage *ss2, check_type_t type, check_acceptreject_t acceptreject);
+
+ if (load) {
+ loadfn = _ipcheck_addip;
+ } else {
+ loadfn = ipcheck_rmip;
+ }
+
+ while (rules[i] != NULL) {
+ printf("Parsing rule: %s\n", rules[i]);
+ memset(&addr1, 0, sizeof(struct sockaddr_storage));
+ memset(&addr2, 0, sizeof(struct sockaddr_storage));
+ /*
+ * First char is A (accept) or R (Reject)
+ */
+ switch(rules[i][0] & 0x5F) {
+ case 'A':
+ acceptreject = CHECK_ACCEPT;
+ break;
+ case 'R':
+ acceptreject = CHECK_REJECT;
+ break;
+ default:
+ fprintf(stderr, "Unknown record type on line %d: %s\n", i, rules[i]);
+ goto next_record;
+ }
+
+ /*
+ * Second char is the filter type:
+ * A Address
+ * M Mask
+ * R Range
+ */
+ switch(rules[i][1] & 0x5F) {
+ case 'A':
+ type = CHECK_TYPE_ADDRESS;
+ ret = get_ipaddress(rules[i]+2, &addr1);
+ break;
+ case 'M':
+ type = CHECK_TYPE_MASK;
+ ret = read_2ip(rules[i]+2, "/", &addr1, &addr2);
+ break;
+ case 'R':
+ type = CHECK_TYPE_RANGE;
+ ret = read_2ip(rules[i]+2, "-", &addr1, &addr2);
+ break;
+ default:
+ fprintf(stderr, "Unknown filter type on line %d: %s\n", i, rules[i]);
+ goto next_record;
+ break;
+ }
+
+ if (ret) {
+ fprintf(stderr, "Failed to parse address on line %d: %s\n", i, rules[i]);
+ return -1;
+ } else {
+ if (addr1.ss_family == AF_INET) {
+ if (loadfn(&match_entry_v4, &addr1, &addr2, type, acceptreject) < 0) {
+ fprintf(stderr, "Failed to add/rm address on line %d: %s (errno: %s)\n", i, rules[i], strerror(errno));
+ return -1;
+ }
+ } else {
+ if (loadfn(&match_entry_v6, &addr1, &addr2, type, acceptreject) < 0) {
+ fprintf(stderr, "Failed to add/rm address on line %d: %s (errno: %s)\n", i, rules[i], strerror(errno));
+ return -1;
+ }
+ }
+ }
+
+ next_record:
+ i++;
+ }
+
+ return 0;
+}
+
+const char *tests[100] = {
+ /*
+ * ipv4
+ */
+ "R192.168.0.3", /* reject address */
+ "A192.168.0.1", /* accept address */
+ "R192.168.0.11", /* reject range */
+ "A192.168.0.8", /* accept range */
+ "R192.168.2.1", /* reject mask */
+ "A192.168.3.1", /* accept mask */
+ /*
+ * ipv6
+ */
+ "R3ffe::3",
+ "A3ffe::1",
+ "R3ffe::11",
+ "A3ffe::8",
+ "R3ffe:1::1",
+ "A3ffe:1::1:1"
+};
+
+const char *after_insert_tests[100] = {
+ /*
+ * ipv4
+ */
+ "R192.168.0.3", /* reject address */
+ "A192.168.0.1", /* accept address */
+ "R192.168.0.11", /* reject range */
+ "A192.168.0.8", /* accept range */
+ "A192.168.2.1", /* reject mask */
+ "A192.168.3.1", /* accept mask */
+ /*
+ * ipv6
+ */
+ "R3ffe::3",
+ "A3ffe::1",
+ "R3ffe::11",
+ "A3ffe::8",
+ "A3ffe:1::1",
+ "A3ffe:1::1:1"
+};
+
+int test(void)
+{
+ int i = 0;
+ int expected;
+ struct sockaddr_storage saddr;
+ struct acl_match_entry *match_entry;
+
+ /*
+ * default tests
+ */
+ while (tests[i] != NULL) {
+ /*
+ * First char is A (accept) or R (Reject)
+ */
+ switch(tests[i][0] & 0x5F) {
+ case 'A':
+ expected = 1;
+ break;
+ case 'R':
+ expected = 0;
+ break;
+ default:
+ fprintf(stderr, "Unknown record type on line %d: %s\n", i, tests[i]);
+ return FAIL;
+ break;
+ }
+
+ if (get_ipaddress(tests[i]+1, &saddr)) {
+ fprintf(stderr, "Cannot parse address %s\n", tests[i]+1);
+ return FAIL;
+ }
+
+ if (saddr.ss_family == AF_INET) {
+ match_entry = match_entry_v4;
+ } else {
+ match_entry = match_entry_v6;
+ }
+
+ if (ipcheck_validate(&match_entry, &saddr) != expected) {
+ fprintf(stderr, "Failed to check access list for ip: %s\n", tests[i]);
+ return FAIL;
+ }
+ i++;
+ }
+
+ /*
+ * insert tests
+ */
+
+ if (get_ipaddress("192.168.2.1", &saddr)) {
+ fprintf(stderr, "Cannot parse address 192.168.2.1\n");
+ return FAIL;
+ }
+
+ if (ipcheck_addip(&match_entry_v4, 3, &saddr, &saddr, CHECK_TYPE_ADDRESS, CHECK_ACCEPT) < 0) {
+ fprintf(stderr, "Unable to insert address in position 3 192.168.2.1\n");
+ return FAIL;
+ }
+
+ if (get_ipaddress("3ffe:1::1", &saddr)) {
+ fprintf(stderr, "Cannot parse address 3ffe:1::1\n");
+ return FAIL;
+ }
+
+ if (ipcheck_addip(&match_entry_v6, 3, &saddr, &saddr, CHECK_TYPE_ADDRESS, CHECK_ACCEPT) < 0) {
+ fprintf(stderr, "Unable to insert address in position 3 3ffe:1::1\n");
+ return FAIL;
+ }
+
+ while (after_insert_tests[i] != NULL) {
+ /*
+ * First char is A (accept) or R (Reject)
+ */
+ switch(after_insert_tests[i][0] & 0x5F) {
+ case 'A':
+ expected = 1;
+ break;
+ case 'R':
+ expected = 0;
+ break;
+ default:
+ fprintf(stderr, "Unknown record type on line %d: %s\n", i, after_insert_tests[i]);
+ return FAIL;
+ break;
+ }
+
+ if (get_ipaddress(after_insert_tests[i]+1, &saddr)) {
+ fprintf(stderr, "Cannot parse address %s\n", after_insert_tests[i]+1);
+ return FAIL;
+ }
+
+ if (saddr.ss_family == AF_INET) {
+ match_entry = match_entry_v4;
+ } else {
+ match_entry = match_entry_v6;
+ }
+
+ if (ipcheck_validate(&match_entry, &saddr) != expected) {
+ fprintf(stderr, "Failed to check access list for ip: %s\n", after_insert_tests[i]);
+ return FAIL;
+ }
+ i++;
+ }
+ return PASS;
+}
+
+int main(int argc, char *argv[])
+{
+ struct sockaddr_storage saddr;
+ struct acl_match_entry *match_entry;
+ int ret = PASS;
+ int i;
+
+ if (default_rules(1) < 0) {
+ return -1;
+ }
+
+ if (argc > 1) {
+ /*
+ * run manual check against default access lists
+ */
+ for (i=1; i<argc; i++) {
+ if (get_ipaddress(argv[i], &saddr)) {
+ fprintf(stderr, "Cannot parse address %s\n", argv[i]);
+ ret = FAIL;
+ goto out;
+ } else {
+ if (saddr.ss_family == AF_INET) {
+ match_entry = match_entry_v4;
+ } else {
+ match_entry = match_entry_v6;
+ }
+ if (ipcheck_validate(&match_entry, &saddr)) {
+ printf("%s is VALID\n", argv[i]);
+ ret = PASS;
+ } else {
+ printf("%s is not allowed\n", argv[i]);
+ ret = FAIL;
+ }
+ }
+ }
+ } else {
+ /*
+ * run automatic tests
+ */
+ ret = test();
+ }
+
+ /*
+ * test memory leaks with ipcheck_rmip
+ */
+ if (default_rules(0) < 0) {
+ return FAIL;
+ }
+
+ /*
+ * test memory leaks with ipcheck_rmall
+ */
+ if (default_rules(1) < 0) {
+ return FAIL;
+ }
+out:
+ ipcheck_rmall(&match_entry_v4);
+ ipcheck_rmall(&match_entry_v6);
+
+ return ret;
+}

File Metadata

Mime Type
text/x-diff
Expires
Mon, Feb 24, 3:19 PM (1 h, 53 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1464289
Default Alt Text
(16 KB)

Event Timeline