Adding upstream version 2.0.0+debian.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
65eb8bc08a
commit
1cf0d30d41
GPG key ID:
FBB4F0E80A80222F
191 changed files with 48816 additions and 0 deletions
23
plugins/anonmask/Makefile.am
Normal file
23
plugins/anonmask/Makefile.am
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
|
||||
CLEANFILES = *.gcda *.gcno *.gcov
|
||||
|
||||
AM_CFLAGS = -I$(srcdir) \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/isc \
|
||||
$(SECCOMPFLAGS)
|
||||
|
||||
pkglib_LTLIBRARIES = anonmask.la
|
||||
anonmask_la_SOURCES = anonmask.c
|
||||
anonmask_la_LDFLAGS = -module -avoid-version
|
||||
|
||||
TESTS = test1.sh test2.sh test3.sh
|
||||
|
||||
EXTRA_DIST = $(TESTS) test1.gold test2.gold
|
||||
CLEANFILES += test1.out test2.out
|
||||
|
||||
if ENABLE_GCOV
|
||||
gcov-local:
|
||||
for src in $(anonmask_la_SOURCES); do \
|
||||
gcov -o .libs -l -r -s "$(srcdir)" "$$src"; \
|
||||
done
|
||||
endif
|
||||
244
plugins/anonmask/anonmask.c
Normal file
244
plugins/anonmask/anonmask.c
Normal file
|
|
@ -0,0 +1,244 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2021, OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* 3. Neither the name of the copyright holder nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include "dnscap_common.h"
|
||||
|
||||
static set_iaddr_t anonmask_set_iaddr = 0;
|
||||
|
||||
static logerr_t* logerr;
|
||||
static int only_clients = 0, only_servers = 0, mask_port = 53, mask_v4 = 24, mask_v6 = 48;
|
||||
static struct in_addr in4 = { INADDR_ANY };
|
||||
static struct in6_addr in6 = IN6ADDR_ANY_INIT;
|
||||
static uint32_t* in6p = (uint32_t*)&in6;
|
||||
|
||||
enum plugin_type anonmask_type()
|
||||
{
|
||||
return plugin_filter;
|
||||
}
|
||||
|
||||
void usage(const char* msg)
|
||||
{
|
||||
fprintf(stderr, "anonmask.so usage error: %s\n", msg);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
void anonmask_usage()
|
||||
{
|
||||
fprintf(stderr,
|
||||
"\nanonmask.so options:\n"
|
||||
"\t-? print these instructions and exit\n"
|
||||
"\t-c Only mask clients (port != 53)\n"
|
||||
"\t-s Only mask servers (port == 53)\n"
|
||||
"\t-p <port> Set port for -c/-s masking, default 53\n"
|
||||
"\t-4 <netmask> The /mask for IPv4 addresses, default /24\n"
|
||||
"\t-6 <netmask> The /mask for IPv6 addresses, default /48\n");
|
||||
}
|
||||
|
||||
void anonmask_extension(int ext, void* arg)
|
||||
{
|
||||
switch (ext) {
|
||||
case DNSCAP_EXT_SET_IADDR:
|
||||
anonmask_set_iaddr = (set_iaddr_t)arg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void anonmask_getopt(int* argc, char** argv[])
|
||||
{
|
||||
int c;
|
||||
unsigned long ul;
|
||||
char* p;
|
||||
|
||||
while ((c = getopt(*argc, *argv, "?csp:4:6:")) != EOF) {
|
||||
switch (c) {
|
||||
case 'c':
|
||||
only_clients = 1;
|
||||
break;
|
||||
case 's':
|
||||
only_servers = 1;
|
||||
break;
|
||||
case 'p':
|
||||
ul = strtoul(optarg, &p, 0);
|
||||
if (*p != '\0' || ul < 1U || ul > 65535U)
|
||||
usage("port must be an integer 1..65535");
|
||||
mask_port = (unsigned)ul;
|
||||
break;
|
||||
case '4':
|
||||
ul = strtoul(optarg, &p, 0);
|
||||
if (*p != '\0' || ul > 31U)
|
||||
usage("IPv4 mask must be an integer 0..31");
|
||||
mask_v4 = (unsigned)ul;
|
||||
break;
|
||||
case '6':
|
||||
ul = strtoul(optarg, &p, 0);
|
||||
if (*p != '\0' || ul > 127U)
|
||||
usage("IPv6 mask must be an integer 0..127");
|
||||
mask_v6 = (unsigned)ul;
|
||||
break;
|
||||
case '?':
|
||||
anonmask_usage();
|
||||
if (!optopt || optopt == '?') {
|
||||
exit(0);
|
||||
}
|
||||
// fallthrough
|
||||
default:
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
if (only_clients && only_servers) {
|
||||
usage("-c and -s options are mutually exclusive");
|
||||
}
|
||||
|
||||
if (mask_v4) {
|
||||
in4.s_addr = htonl(0xffffffff << (32 - mask_v4));
|
||||
}
|
||||
|
||||
if (mask_v6) {
|
||||
if (mask_v6 <= 32) {
|
||||
in6p[0] = htonl(0xffffffff << (32 - mask_v6));
|
||||
} else if (mask_v6 <= 64) {
|
||||
in6p[0] = 0xffffffff;
|
||||
in6p[1] = htonl(0xffffffff << (64 - mask_v6));
|
||||
} else if (mask_v6 <= 96) {
|
||||
in6p[0] = 0xffffffff;
|
||||
in6p[1] = 0xffffffff;
|
||||
in6p[2] = htonl(0xffffffff << (96 - mask_v6));
|
||||
} else {
|
||||
in6p[0] = 0xffffffff;
|
||||
in6p[1] = 0xffffffff;
|
||||
in6p[2] = 0xffffffff;
|
||||
in6p[3] = htonl(0xffffffff << (128 - mask_v6));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int anonmask_start(logerr_t* a_logerr)
|
||||
{
|
||||
logerr = a_logerr;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void anonmask_stop()
|
||||
{
|
||||
}
|
||||
|
||||
int anonmask_open(my_bpftimeval ts)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
int anonmask_close(my_bpftimeval ts)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
int anonmask_filter(const char* descr, iaddr* from, iaddr* to, uint8_t proto, unsigned flags,
|
||||
unsigned sport, unsigned dport, my_bpftimeval ts,
|
||||
const u_char* pkt_copy, const unsigned olen,
|
||||
const u_char* payload, const unsigned payloadlen)
|
||||
{
|
||||
uint32_t* p6;
|
||||
|
||||
for (;;) {
|
||||
if (only_clients && sport == mask_port) {
|
||||
from = 0;
|
||||
break;
|
||||
}
|
||||
if (only_servers && sport != mask_port) {
|
||||
from = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
switch (from->af) {
|
||||
case AF_INET:
|
||||
from->u.a4.s_addr &= in4.s_addr;
|
||||
break;
|
||||
case AF_INET6:
|
||||
p6 = (uint32_t*)&from->u.a6;
|
||||
p6[0] &= in6p[0];
|
||||
p6[1] &= in6p[1];
|
||||
p6[2] &= in6p[2];
|
||||
p6[3] &= in6p[3];
|
||||
break;
|
||||
default:
|
||||
from = 0;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
if (only_clients && dport == mask_port) {
|
||||
to = 0;
|
||||
break;
|
||||
}
|
||||
if (only_servers && dport != mask_port) {
|
||||
to = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
switch (to->af) {
|
||||
case AF_INET:
|
||||
to->u.a4.s_addr &= in4.s_addr;
|
||||
break;
|
||||
case AF_INET6:
|
||||
p6 = (uint32_t*)&to->u.a6;
|
||||
p6[0] &= in6p[0];
|
||||
p6[1] &= in6p[1];
|
||||
p6[2] &= in6p[2];
|
||||
p6[3] &= in6p[3];
|
||||
break;
|
||||
default:
|
||||
to = 0;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if (anonmask_set_iaddr && (from || to)) {
|
||||
anonmask_set_iaddr(from, to);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
2857
plugins/anonmask/test1.gold
Normal file
2857
plugins/anonmask/test1.gold
Normal file
File diff suppressed because it is too large
Load diff
24
plugins/anonmask/test1.sh
Executable file
24
plugins/anonmask/test1.sh
Executable file
|
|
@ -0,0 +1,24 @@
|
|||
#!/bin/sh -xe
|
||||
|
||||
plugin=`find . -name 'anonmask.so' | head -n 1`
|
||||
if [ -z "$plugin" ]; then
|
||||
echo "Unable to find the anonmask plugin"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
ln -fs "$srcdir/../../src/test/dns.pcap" dns.pcap-dist
|
||||
|
||||
../../src/dnscap -r dns.pcap-dist -g -P "$plugin" 2>test1.out
|
||||
../../src/dnscap -r dns.pcap-dist -g -P "$plugin" -4 16 2>>test1.out
|
||||
../../src/dnscap -r dns.pcap-dist -g -P "$plugin" -c 2>>test1.out
|
||||
../../src/dnscap -r dns.pcap-dist -g -P "$plugin" -s 2>>test1.out
|
||||
! ../../src/dnscap -r dns.pcap-dist -g -P "$plugin" -c -s 2>>test1.out
|
||||
|
||||
osrel=`uname -s`
|
||||
if [ "$osrel" = "OpenBSD" ]; then
|
||||
mv test1.out test1.out.old
|
||||
grep -v "^dnscap.*WARNING.*symbol.*relink" test1.out.old > test1.out
|
||||
rm test1.out.old
|
||||
fi
|
||||
|
||||
diff test1.out "$srcdir/test1.gold"
|
||||
77
plugins/anonmask/test2.gold
Normal file
77
plugins/anonmask/test2.gold
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
[87] 2018-11-27 15:52:00.414188 [#0 dns6.pcap-dist 4095] \
|
||||
[2a01:3f0::].51972 [2001:4860:4860::].53 \
|
||||
dns QUERY,NOERROR,51420,rd|ad \
|
||||
1 google.com.,IN,A 0 0 \
|
||||
1 .,4096,4096,0,edns0[len=0,UDP=4096,ver=0,rcode=0,DO=0,z=0]
|
||||
[103] 2018-11-27 15:52:00.428453 [#1 dns6.pcap-dist 4095] \
|
||||
[2001:4860:4860::].53 [2a01:3f0::].51972 \
|
||||
dns QUERY,NOERROR,51420,qr|rd|ra \
|
||||
1 google.com.,IN,A \
|
||||
1 google.com.,IN,A,299,172.217.20.46 0 \
|
||||
1 .,512,512,0,edns0[len=0,UDP=512,ver=0,rcode=0,DO=0,z=0]
|
||||
[87] 2018-11-27 15:52:00.414188 [#0 dns6.pcap-dist 4095] \
|
||||
[2a01:300::].51972 [2001:4800::].53 \
|
||||
dns QUERY,NOERROR,51420,rd|ad \
|
||||
1 google.com.,IN,A 0 0 \
|
||||
1 .,4096,4096,0,edns0[len=0,UDP=4096,ver=0,rcode=0,DO=0,z=0]
|
||||
[103] 2018-11-27 15:52:00.428453 [#1 dns6.pcap-dist 4095] \
|
||||
[2001:4800::].53 [2a01:300::].51972 \
|
||||
dns QUERY,NOERROR,51420,qr|rd|ra \
|
||||
1 google.com.,IN,A \
|
||||
1 google.com.,IN,A,299,172.217.20.46 0 \
|
||||
1 .,512,512,0,edns0[len=0,UDP=512,ver=0,rcode=0,DO=0,z=0]
|
||||
[87] 2018-11-27 15:52:00.414188 [#0 dns6.pcap-dist 4095] \
|
||||
[2a01:3f0::].51972 [2001:4860::].53 \
|
||||
dns QUERY,NOERROR,51420,rd|ad \
|
||||
1 google.com.,IN,A 0 0 \
|
||||
1 .,4096,4096,0,edns0[len=0,UDP=4096,ver=0,rcode=0,DO=0,z=0]
|
||||
[103] 2018-11-27 15:52:00.428453 [#1 dns6.pcap-dist 4095] \
|
||||
[2001:4860::].53 [2a01:3f0::].51972 \
|
||||
dns QUERY,NOERROR,51420,qr|rd|ra \
|
||||
1 google.com.,IN,A \
|
||||
1 google.com.,IN,A,299,172.217.20.46 0 \
|
||||
1 .,512,512,0,edns0[len=0,UDP=512,ver=0,rcode=0,DO=0,z=0]
|
||||
[87] 2018-11-27 15:52:00.414188 [#0 dns6.pcap-dist 4095] \
|
||||
[2a01:3f0:0:57::].51972 [2001:4860:4860::].53 \
|
||||
dns QUERY,NOERROR,51420,rd|ad \
|
||||
1 google.com.,IN,A 0 0 \
|
||||
1 .,4096,4096,0,edns0[len=0,UDP=4096,ver=0,rcode=0,DO=0,z=0]
|
||||
[103] 2018-11-27 15:52:00.428453 [#1 dns6.pcap-dist 4095] \
|
||||
[2001:4860:4860::].53 [2a01:3f0:0:57::].51972 \
|
||||
dns QUERY,NOERROR,51420,qr|rd|ra \
|
||||
1 google.com.,IN,A \
|
||||
1 google.com.,IN,A,299,172.217.20.46 0 \
|
||||
1 .,512,512,0,edns0[len=0,UDP=512,ver=0,rcode=0,DO=0,z=0]
|
||||
[87] 2018-11-27 15:52:00.414188 [#0 dns6.pcap-dist 4095] \
|
||||
[2a01:3f0:0:57::].51972 [2001:4860:4860::].53 \
|
||||
dns QUERY,NOERROR,51420,rd|ad \
|
||||
1 google.com.,IN,A 0 0 \
|
||||
1 .,4096,4096,0,edns0[len=0,UDP=4096,ver=0,rcode=0,DO=0,z=0]
|
||||
[103] 2018-11-27 15:52:00.428453 [#1 dns6.pcap-dist 4095] \
|
||||
[2001:4860:4860::].53 [2a01:3f0:0:57::].51972 \
|
||||
dns QUERY,NOERROR,51420,qr|rd|ra \
|
||||
1 google.com.,IN,A \
|
||||
1 google.com.,IN,A,299,172.217.20.46 0 \
|
||||
1 .,512,512,0,edns0[len=0,UDP=512,ver=0,rcode=0,DO=0,z=0]
|
||||
[87] 2018-11-27 15:52:00.414188 [#0 dns6.pcap-dist 4095] \
|
||||
[2a01:3f0::].51972 [2001:4860:4860::8888].53 \
|
||||
dns QUERY,NOERROR,51420,rd|ad \
|
||||
1 google.com.,IN,A 0 0 \
|
||||
1 .,4096,4096,0,edns0[len=0,UDP=4096,ver=0,rcode=0,DO=0,z=0]
|
||||
[103] 2018-11-27 15:52:00.428453 [#1 dns6.pcap-dist 4095] \
|
||||
[2001:4860:4860::8888].53 [2a01:3f0::].51972 \
|
||||
dns QUERY,NOERROR,51420,qr|rd|ra \
|
||||
1 google.com.,IN,A \
|
||||
1 google.com.,IN,A,299,172.217.20.46 0 \
|
||||
1 .,512,512,0,edns0[len=0,UDP=512,ver=0,rcode=0,DO=0,z=0]
|
||||
[87] 2018-11-27 15:52:00.414188 [#0 dns6.pcap-dist 4095] \
|
||||
[2a01:3f0:0:57::245].51972 [2001:4860:4860::].53 \
|
||||
dns QUERY,NOERROR,51420,rd|ad \
|
||||
1 google.com.,IN,A 0 0 \
|
||||
1 .,4096,4096,0,edns0[len=0,UDP=4096,ver=0,rcode=0,DO=0,z=0]
|
||||
[103] 2018-11-27 15:52:00.428453 [#1 dns6.pcap-dist 4095] \
|
||||
[2001:4860:4860::].53 [2a01:3f0:0:57::245].51972 \
|
||||
dns QUERY,NOERROR,51420,qr|rd|ra \
|
||||
1 google.com.,IN,A \
|
||||
1 google.com.,IN,A,299,172.217.20.46 0 \
|
||||
1 .,512,512,0,edns0[len=0,UDP=512,ver=0,rcode=0,DO=0,z=0]
|
||||
34
plugins/anonmask/test2.sh
Executable file
34
plugins/anonmask/test2.sh
Executable file
|
|
@ -0,0 +1,34 @@
|
|||
#!/bin/sh -xe
|
||||
|
||||
plugin=`find . -name 'anonmask.so' | head -n 1`
|
||||
if [ -z "$plugin" ]; then
|
||||
echo "Unable to find the anonmask plugin"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
ln -fs "$srcdir/../../src/test/dns6.pcap" dns6.pcap-dist
|
||||
|
||||
../../src/dnscap -r dns6.pcap-dist -g -P "$plugin" 2>test2.out
|
||||
../../src/dnscap -r dns6.pcap-dist -g -P "$plugin" -6 24 2>>test2.out
|
||||
../../src/dnscap -r dns6.pcap-dist -g -P "$plugin" -6 32 2>>test2.out
|
||||
../../src/dnscap -r dns6.pcap-dist -g -P "$plugin" -6 64 2>>test2.out
|
||||
../../src/dnscap -r dns6.pcap-dist -g -P "$plugin" -6 96 2>>test2.out
|
||||
../../src/dnscap -r dns6.pcap-dist -g -P "$plugin" -c 2>>test2.out
|
||||
../../src/dnscap -r dns6.pcap-dist -g -P "$plugin" -s 2>>test2.out
|
||||
|
||||
osrel=`uname -s`
|
||||
if [ "$osrel" = "OpenBSD" ]; then
|
||||
mv test2.out test2.out.old
|
||||
grep -v "^dnscap.*WARNING.*symbol.*relink" test2.out.old > test2.out
|
||||
rm test2.out.old
|
||||
fi
|
||||
|
||||
# TODO: Remove when #133 is fixed
|
||||
cat test2.out | \
|
||||
sed 's%,CLASS4096,OPT,%,4096,4096,%' | \
|
||||
sed 's%,CLASS512,OPT,%,512,512,%' | \
|
||||
sed 's%,41,41,0,edns0\[len=0,UDP=4096,%,4096,4096,0,edns0[len=0,UDP=4096,%' | \
|
||||
sed 's%,41,41,0,edns0\[len=0,UDP=512,%,512,512,0,edns0[len=0,UDP=512,%' >test2.new
|
||||
mv test2.new test2.out
|
||||
|
||||
diff test2.out "$srcdir/test2.gold"
|
||||
16
plugins/anonmask/test3.sh
Executable file
16
plugins/anonmask/test3.sh
Executable file
|
|
@ -0,0 +1,16 @@
|
|||
#!/bin/sh -xe
|
||||
|
||||
plugin=`find . -name 'anonmask.so' | head -n 1`
|
||||
if [ -z "$plugin" ]; then
|
||||
echo "Unable to find the anonmask plugin"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
ln -fs "$srcdir/../../src/test/dns.pcap" dns.pcap-dist
|
||||
|
||||
../../src/dnscap -r dns.pcap-dist -g -P "$plugin" -?
|
||||
! ../../src/dnscap -r dns.pcap-dist -g -P "$plugin" -X
|
||||
! ../../src/dnscap -r dns.pcap-dist -g -P "$plugin" -4 99
|
||||
! ../../src/dnscap -r dns.pcap-dist -g -P "$plugin" -6 999
|
||||
! ../../src/dnscap -r dns.pcap-dist -g -P "$plugin" -p 0
|
||||
../../src/dnscap -r dns.pcap-dist -g -P "$plugin" -p 1
|
||||
Loading…
Add table
Add a link
Reference in a new issue