2.4.18dev: revise test/check and code coverage functions

revise autoconf/automake, split over subdirs now
add tests for memcache TTL in test_cfg
fix check OIDC_CONFIG_POS_TIMEOUT_UNSET for memcache TTL getter; #1345

Signed-off-by: Hans Zandbelt <[email protected]>

Author: zandbelt

.github/workflows/build.yml

@@ -11,11 +11,11 @@ jobs:
       run: |
         sudo apt-get update -y
         sudo apt-get install -y apache2-dev libcjose-dev libssl-dev check pkg-config
-        sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libpcre2-dev
+        sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libpcre2-dev libjq-dev check
     - name: Configure
       run: |
         ./autogen.sh
-        ./configure
+        ./configure --with-jq
     - name: Make
       run: make
     - name: Test

.github/workflows/coverity.yml

@@ -24,7 +24,7 @@ jobs:
         run: |
           sudo apt-get update -y
           sudo apt-get install -y apache2-dev libcjose-dev libssl-dev check pkg-config
-          sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libpcre2-dev
+          sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libpcre2-dev libjq-dev check
       - name: Download Coverity Build Tool
         env:
           TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
@@ -35,7 +35,7 @@ jobs:
       - name: Configure
         run: |
           ./autogen.sh
-          ./configure
+          ./configure --with-jq
       - name: Make with cov-build
         run: |
           pwd

.github/workflows/sonarqube.yml.save

@@ -19,13 +19,13 @@ jobs:
         run: |
           sudo apt-get update -y
           sudo apt-get install -y apache2-dev libcjose-dev libssl-dev check pkg-config
-          sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libpcre2-dev
+          sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libpcre2-dev libjq-dev check
       - name: Install sonar-scanner and build-wrapper
         uses: SonarSource/sonarcloud-github-c-cpp@v3
       - name: Run build-wrapper
         run: |
           ./autogen.sh
-          ./configure
+          ./configure --with-jq
           build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make clean all
       - name: Run sonar-scanner
         env:

.gitignore

@@ -2,7 +2,6 @@
 /.vscode/
 /.libs/
 /.settings/
-/m4/
 /.project
 /.cproject
 /.dockerignore
@@ -28,4 +27,3 @@
 /Makefile.in
 /missing
 /test-driver
-/test-suite.log

ChangeLog

@@ -1,3 +1,10 @@
+08/20/2025
+- revise test/check and code coverage functions
+- revise autoconf/automake, split over subdirs now
+- add tests for memcache TTL
+- fix check OIDC_CONFIG_POS_TIMEOUT_UNSET for memcache TTL getter; #1345
+- bump to 2.4.18dev
+
 08/18/2025
 - fix parsing the value set via OIDCMemCacheConnectionsTTL and interpret it in
   seconds correctly now (instead of microseconds); see #1345; thanks @rpluem
@@ -14,7 +21,7 @@
 - fix regression in 2.4.17 for processing unauthenticated requests that generate HTML
   content, e.g. `OIDCProviderAuthRequestMethod POST` and `OIDCPreservePost On`
   when protected with `Require claim` statements rather than just `Require valid-user`.
- 
+
 07/15/2025
 - support the use of Elliptic Curve keys for private_key_jwt authentication at
   the token- and introspection endpoints and make the signing algorithm configurable

Makefile.am

@@ -1,169 +1,17 @@
 ACLOCAL_AMFLAGS=-I m4
 
-noinst_LTLIBRARIES = libauth_openidc.la
-
-libauth_openidc_la_SOURCES = \
-	src/mod_auth_openidc.c \
-	src/state.c \
-	src/cfg/cfg.c \
-	src/cfg/cache.c \
-	src/cfg/provider.c \
-	src/cfg/oauth.c \
-	src/cfg/dir.c \
-	src/cfg/parse.c \
-	src/cfg/cmds.c \
-	src/cache/file.c \
-	src/cache/shm.c \
-	src/cache/common.c \
-	src/handle/authz.c \
-	src/handle/content.c \
-	src/handle/discovery.c \
-	src/handle/dpop.c \
-	src/handle/info.c \
-	src/handle/jwks.c \
-	src/handle/logout.c \
-	src/handle/refresh.c	\
-	src/handle/request_uri.c \
-	src/handle/request.c \
-	src/handle/response.c \
-	src/handle/revoke.c \
-	src/handle/session_management.c \
-	src/handle/userinfo.c \
-	src/proto/auth.c \
-	src/proto/discovery.c \
-	src/proto/dpop.c \
-	src/proto/id_token.c \
-	src/proto/jwks.c \
-	src/proto/jwt.c \
-	src/proto/pkce.c \
-	src/proto/profile.c \
-	src/proto/proto.c \
-	src/proto/request.c \
-	src/proto/response.c \
-	src/proto/state.c \
-	src/proto/token.c \
-	src/proto/userinfo.c \
-	src/util/appinfo.c \
-	src/util/base64.c \
-	src/util/expr.c \
-	src/util/file.c \
-	src/util/html.c \
-	src/util/jq.c \
-	src/util/json.c \
-	src/util/jwt.c \
-	src/util/key.c \
-	src/util/pcre_subst.c \
-	src/util/random.c \
-	src/util/url.c \
-	src/util/util.c \
-	src/metrics.c \
-	src/oauth.c \
-	src/http.c \
-	src/session.c \
-	src/metadata.c \
-	src/jose.c
-
-AM_CFLAGS = -DNAMEVER="@NAMEVER@" -I${top_srcdir}/src @APACHE_CFLAGS@ @OPENSSL_CFLAGS@ @CURL_CFLAGS@ @JANSSON_CFLAGS@ @CJOSE_CFLAGS@ @PCRE_CFLAGS@
-AM_CPPFLAGS = @APACHE_CPPFLAGS@
-AM_LDFLAGS = @APACHE_LDFLAGS@
-LIBADD = @APACHE_LIBS@ @OPENSSL_LIBS@ @CURL_LIBS@ @JANSSON_LIBS@ @CJOSE_LIBS@ @PCRE_LIBS@
-
-if HAVE_LIBHIREDIS
-libauth_openidc_la_SOURCES += \
-	src/cache/redis.c
-AM_CFLAGS += -DUSE_LIBHIREDIS @HIREDIS_CFLAGS@
-LIBADD += @HIREDIS_LIBS@
-endif
-
-if HAVE_MEMCACHE
-AM_CFLAGS += -DUSE_MEMCACHE
-libauth_openidc_la_SOURCES += \
-	src/cache/memcache.c
-endif
-
-if HAVE_LIBJQ
-AM_CFLAGS += -DUSE_LIBJQ @JQ_CFLAGS@
-LIBADD += @JQ_LIBS@
-endif
-
-if HAVE_LIBBROTLI
-AM_CFLAGS += -DUSE_LIBBROTLI @LIBBROTLIENC_CFLAGS@ @LIBBROTLIDEC_CFLAGS@
-LIBADD += @LIBBROTLIENC_LIBS@ @LIBBROTLIDEC_LIBS@
-endif
-
-if HAVE_LIBZ
-AM_CFLAGS += -DUSE_ZLIB @ZLIB_CFLAGS@
-LIBADD += @ZLIB_LIBS@
-endif
-
-noinst_HEADERS = \
-	src/cfg/cfg.h \
-	src/cfg/cfg_int.h \
-	src/cfg/cache.h \
-	src/cfg/provider.h \
-	src/cfg/oauth.h \
-	src/cfg/dir.h \
-	src/cfg/parse.h \
-	src/mod_auth_openidc.h \
-	src/state.h \
-	src/handle/handle.h \
-	src/proto/proto.h \
-	src/cache/cache.h \
-	src/util/util.h \
-	src/util/pcre_subst.h \
-	src/oauth.h \
-	src/metadata.h \
-	src/session.h \
-	src/jose.h \
-	src/http.h \
-	src/metrics.h \
-	src/const.h
-
-if HAVE_LIBHIREDIS
-noinst_HEADERS += \
-	src/cache/redis.h
-endif
+SUBDIRS = src test
 
 EXTRA_DIST = \
 	README.md \
 	ChangeLog \
 	INSTALL \
 	AUTHORS \
 	LICENSE.txt \
-	auth_openidc.conf \
-	test/ecpriv.key \
-	test/eccert.pem \
-	test/private.pem \
-	test/public.pem \
-	test/certificate.pem \
-	test/open-redirect-payload-list.txt
-
-noinst_DATA = mod_auth_openidc.la
-
-mod_auth_openidc.la: libauth_openidc.la
-	${APXS} -c -o $@ libauth_openidc.la ${AM_CFLAGS} ${LIBADD}
-
-install-exec-local:
-	${INSTALL} -d $(DESTDIR)@APACHE_MODULEDIR@
-	${INSTALL} -p -m 755 .libs/mod_auth_openidc.so $(DESTDIR)@APACHE_MODULEDIR@/mod_auth_openidc.so
-
-uninstall-local:
-	rm -f $(DESTDIR)@APACHE_MODULEDIR@/mod_auth_openidc.so mod_auth_openidc.la
-
-clean-local:
-	rm -f mod_auth_openidc.la
-
-LDADD = libauth_openidc.la ${LIBADD}
-
-noinst_PROGRAMS = test/test-cmd
-test_test_cmd_SOURCES = test/test-cmd.c test/stub.c
-test_test_cmd_CFLAGS = ${AM_CFLAGS} -fPIC
-
-TESTS = test/test
-
-check_PROGRAMS = test/test
-test_test_SOURCES = test/test.c test/stub.c
-test_test_CFLAGS = ${AM_CFLAGS} -fPIC
+	auth_openidc.conf
 
 clang-format:
-	clang-format -style=file -i $$(find . -name *.[ch] -maxdepth 3)
+	clang-format -style=file -i $$(find . -maxdepth 3 -name *.[ch])
+
+check-code-coverage: check
+	${MAKE} -C test $@

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([mod_auth_openidc],[2.4.17.3dev],[[email protected]])
+AC_INIT([mod_auth_openidc],[2.4.18dev],[[email protected]])
 
 AC_SUBST(NAMEVER, AC_PACKAGE_TARNAME()-AC_PACKAGE_VERSION())
 
@@ -12,6 +12,8 @@ AM_PROG_CC_C_O
 AM_PROG_AR
 LT_INIT([dlopen])
 
+AX_CODE_COVERAGE
+
 # Checks for apxs.
 AC_ARG_WITH([apxs],
 	[AS_HELP_STRING([--with-apxs=PATH/NAME],[path to the apxs binary for Apache [apxs]])],
@@ -186,6 +188,21 @@ AM_CONDITIONAL(HAVE_LIBJQ, [test x"$HAVE_LIBJQ" = "x1"])
 AC_SUBST(JQ_CFLAGS)
 AC_SUBST(JQ_LIBS)
 
+# check
+PKG_CHECK_MODULES([CHECK],
+	[check >= 0.9.4],
+	[have_check="yes"],
+		[AC_MSG_WARN([Check not found; cannot run unit tests!]);
+	[have_check="no"]
+])
+AM_CONDITIONAL(HAVE_CHECK, [test x"$have_check" = "xyes"])
+AC_SUBST(CHECK_CFLAGS)
+AC_SUBST(CHECK_LIBS)
+
 # Create Makefile from Makefile.in
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([
+	Makefile
+	src/Makefile
+	test/Makefile
+])
 AC_OUTPUT

m4/.gitignore

@@ -0,0 +1,5 @@
+/libtool.m4
+/ltoptions.m4
+/ltsugar.m4
+/ltversion.m4
+/lt~obsolete.m4