Skip to content

GitLab

Knot DNS
Knot DNS
Commit 4db58b26 authored by Daniel Salzman's avatar Daniel Salzman
Browse files
Options

libs: build cleanup, remove pykeymgr

parent edf16dee
Hide whitespace changes
Inline Side-by-side
Showing with 830 additions and 1562 deletions
.gitignore
View file @ 4db58b26
......@@ -7,25 +7,13 @@
*.lo
*.rej
*.pyc
*.pc
.libs/
.deps/
.dirstamp
/tmp
/Knot.creator.user*
/Doxyfile
/Makefile
/Makefile.in
/src/Makefile
/src/Makefile.in
/src/libzscanner/Makefile
/src/libzscanner/Makefile.in
/python/Makefile
/python/Makefile.in
/samples/Makefile
/samples/Makefile.in
/samples/knot.sample.conf
/doc/Makefile
/doc/Makefile.in
/aclocal.m4
/ar-lib
/autoscan.log
......@@ -46,18 +34,19 @@
/src/config.h
/src/config.h.in
/src/stamp-*
/doc/html/
/INSTALL
/m4/libtool.m4
/m4/ltoptions.m4
/m4/ltsugar.m4
/m4/ltversion.m4
/m4/lt~obsolete.m4
/src/knotd.pc
/src/libknot/libknot.pc
/src/libknot/version.h
/src/knot/modules/static_modules.h
/test-driver
Makefile
Makefile.in
version.h
/samples/knot.sample.conf
/src/knot/modules/static_modules.h
# dnstap
/src/contrib/dnstap/Makefile
......@@ -66,9 +55,7 @@
/src/contrib/dnstap/dnstap.pb-c.h
# zscanner
/src/libzscanner/libzscanner.pc
/src/libzscanner/scanner.c
/src/libzscanner/version.h
# Binaries
/src/kdig
......@@ -80,7 +67,6 @@
/src/knsec3hash
/src/knsupdate
/src/kzonecheck
/src/utils/pykeymgr/pykeymgr
# Generated tarballs
/knot-*.tar.xz
......
configure.ac
View file @ 4db58b26
......@@ -60,9 +60,9 @@ LT_INIT
PKG_PROG_PKG_CONFIG
m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], ['${libdir}/pkgconfig'])])
AC_CONFIG_FILES([src/knotd.pc
src/libknot/libknot.pc
src/libdnssec/libdnssec.pc
src/libzscanner/libzscanner.pc
src/libknot.pc
src/libdnssec.pc
src/libzscanner.pc
])
# Build Knot DNS daemon
......@@ -587,13 +587,9 @@ AC_CONFIG_FILES([Makefile
samples/Makefile
python/Makefile
src/Makefile
src/contrib/dnstap/Makefile
src/knot/modules/static_modules.h
src/libdnssec/Makefile
src/libzscanner/Makefile
])
AC_CONFIG_FILES([src/utils/pykeymgr/pykeymgr], [chmod +x src/utils/pykeymgr/pykeymgr])
AC_CONFIG_FILES([doc/modules.rst],
[cp doc/modules.rst ${srcdir}/doc/modules.rst 2>/dev/null;
ln -s -f $(readlink -f ${srcdir})/src/knot/modules ${srcdir}/doc 2>/dev/null])
......
doc/.gitignore
View file @ 4db58b26
......@@ -8,7 +8,6 @@
/man/knotc.8
/man/knotd.8
/man/keymgr.8
/man/pykeymgr.8
/man/kdig.1
/man/khost.1
/man/kjournalprint.1
......
doc/Makefile.am
View file @ 4db58b26
......@@ -3,7 +3,6 @@ MANPAGES_IN = \
man/knotc.8in \
man/knotd.8in \
man/keymgr.8in \
man/pykeymgr.8in \
man/kdig.1in \
man/khost.1in \
man/kjournalprint.1in \
......@@ -15,7 +14,6 @@ MANPAGES_RST = \
man_knotc.rst \
man_knotd.rst \
man_keymgr.rst \
man_pykeymgr.rst \
man_kdig.rst \
man_khost.rst \
man_kjournalprint.rst \
......@@ -93,7 +91,6 @@ if HAVE_UTILS
if HAVE_DAEMON
man_MANS += \
man/keymgr.8 \
man/pykeymgr.8 \
man/kjournalprint.1 \
man/kzonecheck.1
endif # HAVE_DAEMON
......@@ -109,7 +106,6 @@ man/knot.conf.5: man/knot.conf.5in
man/knotc.8: man/knotc.8in
man/knotd.8: man/knotd.8in
man/keymgr.8: man/keymgr.8in
man/pykeymgr.8: man/pykeymgr.8in
man/kdig.1: man/kdig.1in
man/khost.1: man/khost.1in
man/kjournalprint.1: man/kjournalprint.1in
......
doc/conf.py
View file @ 4db58b26
......@@ -222,7 +222,6 @@ man_pages = [
('man_knotc', 'knotc', 'Knot DNS control utility', author, 8),
('man_knotd', 'knotd', 'Knot DNS server daemon', author, 8),
('man_keymgr', 'keymgr', 'Knot DNS key management utility', author, 8),
('man_pykeymgr', 'pykeymgr', 'Knot DNS key management utility', author, 8),
('man_kdig', 'kdig', 'Advanced DNS lookup utility', author, 1),
('man_khost', 'khost', 'Simple DNS lookup utility', author, 1),
('man_kjournalprint', 'kjournalprint', 'Knot DNS journal print utility', author, 1),
......
doc/man/pykeymgr.8in deleted 100644 → 0
View file @ edf16dee
.\" Man page generated from reStructuredText.
.
.TH "PYKEYMGR" "8" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.SH NAME
pykeymgr \- Knot DNS key management utility
.
.nr rst2man-indent-level 0
.
.de1 rstReportMargin
\\$1 \\n[an-margin]
level \\n[rst2man-indent-level]
level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
-
\\n[rst2man-indent0]
\\n[rst2man-indent1]
\\n[rst2man-indent2]
..
.de1 INDENT
.\" .rstReportMargin pre:
. RS \\$1
. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
. nr rst2man-indent-level +1
.\" .rstReportMargin post:
..
.de UNINDENT
. RE
.\" indent \\n[an-margin]
.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
.nr rst2man-indent-level -1
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
.SH SYNOPSIS
.sp
\fBpykeymgr\fP [\fIglobal\-options\fP] [\fIcommand\fP\&...] [\fIarguments\fP\&...]
.SH DESCRIPTION
.sp
The \fBpykeymgr\fP utility serves for key management in Knot DNS server.
.sp
Functions for DNSSEC keys and KASP (Key And Signature Policy)
management are provided.
.sp
The DNSSEC and KASP configuration is stored in a so called KASP database.
The database is backed by LMDB.
.sp
The utility requires installed python LMDB module, installed e.g. by:
.INDENT 0.0
.INDENT 3.5
.sp
.nf
.ft C
$ pip install lmdb
.ft P
.fi
.UNINDENT
.UNINDENT
.SS Global options
.INDENT 0.0
.TP
\fB\-f\fP, \fB\-\-force\fP
Skip some of consistency checks and continue with performed action with a warning.
.TP
\fB\-h\fP, \fB\-\-help\fP
Print the program help.
.UNINDENT
.SS Main commands
.INDENT 0.0
.TP
\fB\-i\fP, \fB\-\-import\fP \fIKASP_db_dir\fP
Import the legacy JSON\-format KASP database into the current LMDB\-backed one.
(You can import multiple databases at once by repeating this option.)
.UNINDENT
.SS Parameters
.INDENT 0.0
.TP
\fIKASP_db_dir\fP
A path to the KASP db. It is the directory where \fIdata.mdb\fP and \fIlock.mdb\fP
files are usually stored as well as legacy JSON configuration and \fIkeys\fP
subdirectory containing PEM files.
.UNINDENT
.SH EXAMPLES
.INDENT 0.0
.IP 1. 3
Import legacy JSON\-based KASP db from Knot 2.4.x after upgrade:
.INDENT 3.0
.INDENT 3.5
.sp
.nf
.ft C
$ pykemgr \-i ${knot_data_dir}/keys
.ft P
.fi
.UNINDENT
.UNINDENT
.UNINDENT
.SH SEE ALSO
.sp
\fI\%RFC 6781\fP \- DNSSEC Operational Practices.
.sp
\fBknot.conf(5)\fP,
\fBknotc(8)\fP,
\fBknotd(8)\fP\&.
.SH AUTHOR
CZ.NIC Labs <http://www.knot-dns.cz>
.SH COPYRIGHT
Copyright 2010–2018, CZ.NIC, z.s.p.o.
.\" Generated by docutils manpage writer.
.
doc/man_pykeymgr.rst deleted 100644 → 0
View file @ edf16dee
.. highlight:: console
pykeymgr – Key management utility
=================================
Synopsis
--------
:program:`pykeymgr` [*global-options*] [*command*...] [*arguments*...]
Description
-----------
The :program:`pykeymgr` utility serves for key management in Knot DNS server.
Functions for DNSSEC keys and KASP (Key And Signature Policy)
management are provided.
The DNSSEC and KASP configuration is stored in a so called KASP database.
The database is backed by LMDB.
The utility requires installed python LMDB module, installed e.g. by::
$ pip install lmdb
Global options
..............
**-f**, **--force**
Skip some of consistency checks and continue with performed action with a warning.
**-h**, **--help**
Print the program help.
Main commands
.............
**-i**, **--import** *KASP_db_dir*
Import the legacy JSON-format KASP database into the current LMDB-backed one.
(You can import multiple databases at once by repeating this option.)
Parameters
..........
*KASP_db_dir*
A path to the KASP db. It is the directory where `data.mdb` and `lock.mdb`
files are usually stored as well as legacy JSON configuration and `keys`
subdirectory containing PEM files.
Examples
--------
1. Import legacy JSON-based KASP db from Knot 2.4.x after upgrade::
$ pykemgr -i ${knot_data_dir}/keys
See Also
--------
:rfc:`6781` - DNSSEC Operational Practices.
:manpage:`knot.conf(5)`,
:manpage:`knotc(8)`,
:manpage:`knotd(8)`.
doc/migration.rst
View file @ 4db58b26
......@@ -39,7 +39,9 @@ KASP DB migration
Knot DNS version 2.4.x and earlier uses JSON files to store DNSSEC keys metadata,
one for each zone. 2.5.x versions store those in binary format in a LMDB, all zones
together. The migration is possible with ``pykeymgr`` script::
together. The migration is possible with the
`pykeymgr <https://gitlab.labs.nic.cz/knot/knot-dns/blob/2.6/src/utils/pykeymgr/pykeymgr.in>`_
script::
$ pykeymgr -i path/to/keydir
......
doc/utilities.rst
View file @ 4db58b26
......@@ -12,7 +12,6 @@ the server. This section collects manual pages for all provided binaries:
man_kdig
man_keymgr
man_pykeymgr
man_khost
man_kjournalprint
man_knotc
......
src/Makefile.am
View file @ 4db58b26
ACLOCAL_AMFLAGS = -I $(top_srcdir)/m4
SUBDIRS = libzscanner libdnssec contrib/dnstap .
lib_LTLIBRARIES = \
libknot.la
noinst_LTLIBRARIES = \
libcontrib.la
AM_CPPFLAGS = \
-include $(top_builddir)/src/config.h \
-DCONFIG_DIR='"${config_dir}"' \
......@@ -14,501 +6,16 @@ AM_CPPFLAGS = \
-DMODULE_DIR='"${module_dir}"' \
-DMODULE_INSTDIR='"${module_instdir}"'
######################
# Knot DNS Libraries #
######################
EXTRA_DIST = \
contrib/licenses/0BSD \
contrib/licenses/BSD-3-Clause \
contrib/licenses/LGPL-2.0 \
contrib/licenses/OLDAP-2.8 \
contrib/lmdb/LICENSE \
contrib/openbsd/LICENSE \
contrib/ucw/LICENSE \
utils/pykeymgr/pykeymgr.in
# static: libcontrib sources
libcontrib_la_SOURCES = \
contrib/asan.h \
contrib/base32hex.c \
contrib/base32hex.h \
contrib/base64.c \
contrib/base64.h \
contrib/ctype.h \
contrib/dynarray.h \
contrib/files.c \
contrib/files.h \
contrib/getline.c \
contrib/getline.h \
contrib/macros.h \
contrib/mempattern.c \
contrib/mempattern.h \
contrib/net.c \
contrib/net.h \
contrib/qp-trie/trie.c \
contrib/qp-trie/trie.h \
contrib/sockaddr.c \
contrib/sockaddr.h \
contrib/string.c \
contrib/string.h \
contrib/strtonum.h \
contrib/time.c \
contrib/time.h \
contrib/tolower.h \
contrib/trim.h \
contrib/wire_ctx.h \
contrib/openbsd/siphash.c \
contrib/openbsd/siphash.h \
contrib/openbsd/strlcat.c \
contrib/openbsd/strlcat.h \
contrib/openbsd/strlcpy.c \
contrib/openbsd/strlcpy.h \
contrib/ucw/array-sort.h \
contrib/ucw/binsearch.h \
contrib/ucw/heap.c \
contrib/ucw/heap.h \
contrib/ucw/lists.c \
contrib/ucw/lists.h \
contrib/ucw/mempool.c \
contrib/ucw/mempool.h
if !HAVE_LMDB
libcontrib_la_SOURCES += \
contrib/lmdb/lmdb.h \
contrib/lmdb/mdb.c \
contrib/lmdb/midl.c \
contrib/lmdb/midl.h
endif !HAVE_LMDB
libcontrib_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY)
libcontrib_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAG_EXCLUDE_LIBS)
# libknot headers
libknot_ladir = $(includedir)
nobase_libknot_la_HEADERS = \
libknot/attribute.h \
libknot/codes.h \
libknot/consts.h \
libknot/control/control.h \
libknot/cookies.h \
libknot/descriptor.h \
libknot/dname.h \
libknot/endian.h \
libknot/errcode.h \
libknot/error.h \
libknot/libknot.h \
libknot/lookup.h \
libknot/mm_ctx.h \
libknot/db/db.h \
libknot/db/db_lmdb.h \
libknot/db/db_trie.h \
libknot/packet/compr.h \
libknot/packet/pkt.h \
libknot/packet/rrset-wire.h \
libknot/packet/wire.h \
libknot/rdata.h \
libknot/rdataset.h \
libknot/rrset-dump.h \
libknot/rrset.h \
libknot/rrtype/dnskey.h \
libknot/rrtype/ds.h \
libknot/rrtype/naptr.h \
libknot/rrtype/nsec.h \
libknot/rrtype/nsec3.h \
libknot/rrtype/nsec3param.h \
libknot/rrtype/opt.h \
libknot/rrtype/rdname.h \
libknot/rrtype/rrsig.h \
libknot/rrtype/soa.h \
libknot/rrtype/tsig.h \
libknot/tsig-op.h \
libknot/tsig.h \
libknot/wire.h \
libknot/yparser/yparser.h \
libknot/yparser/ypformat.h \
libknot/yparser/ypschema.h \
libknot/yparser/yptrafo.h \
libknot/version.h
# dynamic: libknot sources
libknot_la_SOURCES = \
libknot/codes.c \
libknot/control/control.c \
libknot/cookies.c \
libknot/descriptor.c \
libknot/dname.c \
libknot/error.c \
libknot/db/db_lmdb.c \
libknot/db/db_trie.c \
libknot/packet/pkt.c \
libknot/packet/rrset-wire.c \
libknot/rdataset.c \
libknot/rrset-dump.c \
libknot/rrset.c \
libknot/rrtype/naptr.c \
libknot/rrtype/opt.c \
libknot/rrtype/tsig.c \
libknot/tsig-op.c \
libknot/tsig.c \
libknot/yparser/yparser.c \
libknot/yparser/ypbody.c \
libknot/yparser/ypformat.c \
libknot/yparser/ypschema.c \
libknot/yparser/yptrafo.c \
$(nobase_libknot_la_HEADERS)
libknot_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(lmdb_CFLAGS)
libknot_la_LDFLAGS = $(AM_LDFLAGS) $(libknot_VERSION_INFO) $(lmdb_LIBS) \
$(LDFLAG_EXCLUDE_LIBS)
libknot_la_LIBADD = libdnssec/libdnssec.la libcontrib.la
# pkg-config
pkgconfig_DATA = knotd.pc libknot/libknot.pc
# static: utilities shared
libknotus_la_SOURCES = \
utils/common/cert.c \
utils/common/cert.h \
utils/common/exec.c \
utils/common/exec.h \
utils/common/hex.c \
utils/common/hex.h \
utils/common/lookup.c \
utils/common/lookup.h \
utils/common/msg.c \
utils/common/msg.h \
utils/common/netio.c \
utils/common/netio.h \
utils/common/params.c \
utils/common/params.h \
utils/common/resolv.c \
utils/common/resolv.h \
utils/common/sign.c \
utils/common/sign.h \
utils/common/tls.c \
utils/common/tls.h \
utils/common/token.c \
utils/common/token.h
libknotus_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(libidn2_LIBS) \
$(libidn_CFLAGS) $(libedit_CFLAGS) $(gnutls_CFLAGS)
libknotus_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAG_EXCLUDE_LIBS)
libknotus_la_LIBADD = libcontrib.la libknot.la $(libidn2_LIBS) $(libidn_LIBS) \
$(libedit_LIBS) $(gnutls_LIBS)
libknotd_la_SOURCES = \
knot/conf/base.c \
knot/conf/base.h \
knot/conf/conf.c \
knot/conf/conf.h \
knot/conf/confdb.c \
knot/conf/confdb.h \
knot/conf/confio.c \
knot/conf/confio.h \
knot/conf/migration.c \
knot/conf/migration.h \
knot/conf/module.h \
knot/conf/module.c \
knot/conf/schema.c \
knot/conf/schema.h \
knot/conf/tools.c \
knot/conf/tools.h \
knot/ctl/commands.c \
knot/ctl/commands.h \
knot/ctl/process.c \
knot/ctl/process.h \
knot/dnssec/context.c \
knot/dnssec/context.h \
knot/dnssec/ds_query.c \
knot/dnssec/ds_query.h \
knot/dnssec/kasp/kasp_db.c \
knot/dnssec/kasp/kasp_db.h \
knot/dnssec/kasp/kasp_zone.c \
knot/dnssec/kasp/kasp_zone.h \
knot/dnssec/kasp/keystate.c \
knot/dnssec/kasp/keystate.h \
knot/dnssec/kasp/keystore.c \
knot/dnssec/kasp/keystore.h \
knot/dnssec/kasp/policy.h \
knot/dnssec/key-events.c \
knot/dnssec/key-events.h \
knot/dnssec/nsec-chain.c \
knot/dnssec/nsec-chain.h \
knot/dnssec/nsec3-chain.c \
knot/dnssec/nsec3-chain.h \
knot/dnssec/policy.c \
knot/dnssec/policy.h \
knot/dnssec/rrset-sign.c \
knot/dnssec/rrset-sign.h \
knot/dnssec/zone-events.c \
knot/dnssec/zone-events.h \
knot/dnssec/zone-keys.c \
knot/dnssec/zone-keys.h \
knot/dnssec/zone-nsec.c \
knot/dnssec/zone-nsec.h \
knot/dnssec/zone-sign.c \
knot/dnssec/zone-sign.h \
knot/events/events.c \
knot/events/events.h \
knot/events/handlers.h \
knot/events/handlers/dnssec.c \
knot/events/handlers/expire.c \
knot/events/handlers/flush.c \
knot/events/handlers/freeze_thaw.c \
knot/events/handlers/load.c \
knot/events/handlers/notify.c \
knot/events/handlers/nsec3resalt.c \
knot/events/handlers/refresh.c \
knot/events/handlers/update.c \
knot/events/handlers/parent_ds_query.c \
knot/events/log.c \
knot/events/log.h \
knot/events/replan.c \
knot/events/replan.h \
knot/nameserver/axfr.c \
knot/nameserver/axfr.h \
knot/nameserver/chaos.c \
knot/nameserver/chaos.h \
knot/nameserver/internet.c \
knot/nameserver/internet.h \
knot/nameserver/ixfr.c \
knot/nameserver/ixfr.h \
knot/nameserver/log.h \
knot/nameserver/notify.c \
knot/nameserver/notify.h \
knot/nameserver/nsec_proofs.c \
knot/nameserver/nsec_proofs.h \
knot/nameserver/process_query.c \
knot/nameserver/process_query.h \
knot/nameserver/query_module.c \
knot/nameserver/query_module.h \
knot/nameserver/tsig_ctx.c \
knot/nameserver/tsig_ctx.h \
knot/nameserver/update.c \
knot/nameserver/update.h \
knot/nameserver/xfr.c \
knot/nameserver/xfr.h \
knot/query/capture.c \
knot/query/capture.h \
knot/query/layer.h \
knot/query/query.c \
knot/query/query.h \
knot/query/requestor.c \
knot/query/requestor.h \
knot/common/evsched.c \
knot/common/evsched.h \
knot/common/fdset.c \
knot/common/fdset.h \
knot/common/log.c \
knot/common/log.h \
knot/common/process.c \
knot/common/process.h \
knot/common/ref.c \
knot/common/ref.h \
knot/common/stats.c \
knot/common/stats.h \
knot/server/dthreads.c \
knot/server/dthreads.h \
knot/journal/journal.c \
knot/journal/journal.h \
knot/journal/serialization.c \
knot/journal/serialization.h \
knot/server/server.c \
knot/server/server.h \
knot/server/tcp-handler.c \