CVS commit: src

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sun Aug 29 09:54:18 UTC 2021

Modified Files:
        src/distrib/sets/lists/debug: mi
        src/distrib/sets/lists/tests: mi
        src/etc/mtree: NetBSD.dist.tests
        src/tests/usr.sbin: Makefile
        src/usr.sbin/inetd: Makefile inetd.8 inetd.c
Added Files:
        src/tests/usr.sbin/inetd: Makefile inetd_ratelimit.conf t_inetd.c
            test_server.c
        src/usr.sbin/inetd: inetd.h parse_v2.c

Log Message:
Inetd enhancements by James Browning, Gabe Coffland, Alex Gavin, Solomon Ritzow
Described in:
    https://www.mail-archive.com/tech-userlevel%netbsd.org@localhost/msg03114.html
And developed in:
    https://github.com/ritzow/src/pull/1

>From their notes:

All new functionality should be explained by the updated manpage.

The manpage has been refactored a bit: A new section "Directives"
has been added and the information about default hostnames and
IPsec directives has been moved there, and the new file include
directive information is also there.

getconfigent has the most major changes. A newline is no longer
read immediately, but is called only by a "goto more" (inside an
if(false) block). This allows multiple definitions or directives
to exist on a single line for anything that doesn't terminate using
a newline. This means a key-values service definition can be followed
by another key-values service definition, a positional definition,
or an ipsec, hostname, or .include directive on the same line.

memset is no longer used explicitly to clear the servtab structure,
a function init_servtab() is used instead, which uses a C struct
initializer.

The servtab se_group field is its own allocation now, and not just
a pointer into the user:group string.

Refactored some stuff out of getconfigent to separate functions
for use by parse_v2.c. These functions in inetd.c are named with
the form parse_*()

parse_v2.c only has code for parsing a key-values service definition
into a provided servtab. It should not have anything that affects
global state other than line and line_number.

Some function prototypes, structures, and #defines have been moved
from inetd.c to inetd.h.

The function config_root replaces config as the function called on
a config file load/reload. The code removed from the end of
config(void) is now called in config_root, so it is not run on each
recursive config call.

setconfig(void) was removed and its code added into config_root
because that is the only place it is called, and redundant checks
for non-null globals were removed because they are always freed by
endconfig. The fseek code was also removed because the config files
are always closed by endconfig.

Rate limiting code was updated to add a per-service per-IP rate
limiting form. Some of that code was refactored out of other places
into functions with names in the form rl_*()

We have not added any of the license or version information to the
new files parse_v2.c, parse_v2.h, and inetd.h and we have not
updated the license or version info for inetd.c.

Security related:

The behavior when reading invalid IPsec strings has changed. Inetd
no longer exits, it quits reading the current config file instead.
Could this impact program security?

We have not checked for memory leaks. Solomon tried to use dmalloc
without success. getconfigent seemed to have a memory leak at each
"goto more". It seems like inetd has never free'd allocated strings
when throwing away erroneous service definitions during parsing
(i.e. when "goto more" is called when parsing fields). OpenBSD's
version calls freeconfig on "goto more"
(https://github.com/openbsd/src/blob/c5eae130d6c937080c3d30d124e8c8b86db7d625/usr.sbin/inetd/inetd.c#L1049)
but NetBSD only calls it when service definitions are no longer
needed. This has been fixed. freeconfig is called immediately before
any "goto more". There shouldn't be any time when a servtab is in
an invalid state where freeconfig would break.


To generate a diff of this commit:
cvs rdiff -u -r1.359 -r1.360 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1118 -r1.1119 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.187 -r1.188 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.sbin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.sbin/inetd/Makefile \
    src/tests/usr.sbin/inetd/inetd_ratelimit.conf \
    src/tests/usr.sbin/inetd/t_inetd.c src/tests/usr.sbin/inetd/test_server.c
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/inetd/Makefile
cvs rdiff -u -r1.61 -r1.62 src/usr.sbin/inetd/inetd.8
cvs rdiff -u -r1.126 -r1.127 src/usr.sbin/inetd/inetd.c
cvs rdiff -u -r0 -r1.1 src/usr.sbin/inetd/inetd.h \
    src/usr.sbin/inetd/parse_v2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.