code: refactor util.c into util/ directory

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

Author: zandbelt

ChangeLog

@@ -1,3 +1,6 @@
+05/17/2025
+- code: refactor util.c into util/ directory
+
 05/06/2025
 - allow adding a prefix to the cache (section) key through environment variable OIDC_CACHE_PREFIX
 - bump to 2.4.17.1dev

Makefile.am

@@ -43,14 +43,21 @@ libauth_openidc_la_SOURCES = \
 	src/proto/state.c \
 	src/proto/token.c \
 	src/proto/userinfo.c \
+	src/util/base64.c \
+	src/util/expr.c \
+	src/util/html.c \
+	src/util/jq.c \
+	src/util/json.c \
+	src/util/jwt.c \
+	src/util/pcre_subst.c \
+	src/util/random.c \
+	src/util/util.c \
 	src/metrics.c \
 	src/oauth.c \
-	src/util.c \
 	src/http.c \
 	src/session.c \
 	src/metadata.c \
-	src/jose.c \
-	src/pcre_subst.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@
@@ -98,15 +105,15 @@ noinst_HEADERS = \
 	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/util.h \
 	src/metrics.h \
-	src/const.h \
-	src/pcre_subst.h
+	src/const.h
 
 if HAVE_LIBHIREDIS
 noinst_HEADERS += \

src/cache/common.c

@@ -52,7 +52,7 @@
 #include "cfg/cfg_int.h"
 #include "jose.h"
 #include "metrics.h"
-#include "util.h"
+#include "util/util.h"
 
 #ifdef AP_NEED_SET_MUTEX_PERMS
 #include "unixd.h"

src/cache/file.c

@@ -45,7 +45,7 @@
 
 #include "cfg/cache.h"
 #include "cfg/cfg_int.h"
-#include "util.h"
+#include "util/util.h"
 
 /*
  * header structure that holds the metadata info for a cache file entry
@@ -367,7 +367,7 @@ static apr_byte_t oidc_cache_file_set(request_rec *r, const char *section, const
 	char s_err[128];
 	char *rnd = NULL;
 
-	oidc_util_generate_random_string(r, &rnd, 12);
+	oidc_util_random_str_gen(r, &rnd, 12);
 
 	/* get the fully qualified path to the cache file based on the key name */
 	const char *target = oidc_cache_file_path(r, section, key);

src/cfg/cfg.c

@@ -50,7 +50,7 @@
 #include "metrics.h"
 #include "proto/proto.h"
 #include "session.h"
-#include "util.h"
+#include "util/util.h"
 
 const char *oidc_cfg_string_list_add(apr_pool_t *pool, apr_array_header_t **list, const char *arg) {
 	if (*list == NULL)

src/cfg/dir.c

@@ -43,7 +43,7 @@
 #include "cfg/dir.h"
 #include "cfg/cfg_int.h"
 #include "cfg/parse.h"
-#include "util.h"
+#include "util/util.h"
 
 /*
  * directory related configuration

src/cfg/parse.c

@@ -44,7 +44,7 @@
 #include "cfg/dir.h"
 #include "const.h"
 #include "proto/proto.h"
-#include "util.h"
+#include "util/util.h"
 #include <apr_base64.h>
 #include <apr_file_io.h>
 #include <apr_strings.h>

src/handle/authz.c

@@ -45,9 +45,9 @@
 #include "http_protocol.h"
 #include "metrics.h"
 #include "mod_auth_openidc.h"
-#include "pcre_subst.h"
+#include "util/pcre_subst.h"
 #include "proto/proto.h"
-#include "util.h"
+#include "util/util.h"
 
 static apr_byte_t oidc_authz_match_json_string(request_rec *r, const char *spec, json_t *val, const char *key) {
 	return (_oidc_strcmp(json_string_value(val), spec) == 0);
@@ -360,7 +360,7 @@ static apr_byte_t oidc_authz_match_claims_expr(request_rec *r, const char *const
 
 	oidc_debug(r, "enter: '%s'", attr_spec);
 
-	str = oidc_util_jq_filter(r, oidc_util_encode_json(r->pool, claims, JSON_PRESERVE_ORDER | JSON_COMPACT),
+	str = oidc_util_jq_filter(r, oidc_util_json_encode(r->pool, claims, JSON_PRESERVE_ORDER | JSON_COMPACT),
 				  attr_spec);
 	rv = (_oidc_strcmp(str, "true") == 0);
 
@@ -389,11 +389,11 @@ static void oidc_authz_get_claims_idtoken_scope(request_rec *r, json_t **claims,
 
 	const char *s_claims = oidc_request_state_get(r, OIDC_REQUEST_STATE_KEY_CLAIMS);
 	if (s_claims != NULL)
-		oidc_util_decode_json_object(r, s_claims, claims);
+		oidc_util_json_decode_object(r, s_claims, claims);
 
 	const char *s_id_token = oidc_request_state_get(r, OIDC_REQUEST_STATE_KEY_IDTOKEN);
 	if (s_id_token != NULL)
-		oidc_util_decode_json_object(r, s_id_token, id_token);
+		oidc_util_json_decode_object(r, s_id_token, id_token);
 
 	*scope = oidc_request_state_get(r, OIDC_REQUEST_STATE_KEY_SCOPE);
 }

src/handle/content.c

@@ -43,7 +43,7 @@
 #include "handle/handle.h"
 #include "metrics.h"
 #include "mod_auth_openidc.h"
-#include "util.h"
+#include "util/util.h"
 
 /*
  * handle content generating requests

src/handle/discovery.c

@@ -45,7 +45,7 @@
 #include "metadata.h"
 #include "mod_auth_openidc.h"
 #include "proto/proto.h"
-#include "util.h"
+#include "util/util.h"
 
 /* parameter name of the callback URL in the discovery response */
 #define OIDC_DISC_CB_PARAM "oidc_callback"