Changeset 994200a in mod_gnutls

Timestamp:

Sep 25, 2018, 2:32:50 AM (5 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, main, master, proxy-ticket

Children:

efc43b4

Parents:

3358887

Message:

Set up shmcb OCSP cache by default

The shmcb socache doesn't require configuration, so it's suitable as a
default. Note that servers with many vhosts may need to configure a
cache larger than the default 32K to hold all responses.

Files:

• src/gnutls_cache.c (modified) (2 diffs)
• test/tests/27_OCSP_server/apache.conf (modified) (1 diff)

src/gnutls_cache.c

@@ -42 +42 @@
 /** Session cache name */
 #define MGS_SESSION_CACHE_NAME "gnutls_session"
+
+/** Default type for OCSP cache */
+#define DEFAULT_OCSP_CACHE_TYPE "shmcb"
+/** Default config string for OCSP cache */
+#define DEFAULT_OCSP_CACHE_CONF ""
 
 /** Maximum length of the hex string representation of a GnuTLS
@@ -434 +439 @@
 
 
-int mgs_cache_post_config(apr_pool_t *pconf,
-                          apr_pool_t *ptemp __attribute__((unused)),
+int mgs_cache_post_config(apr_pool_t *pconf, apr_pool_t *ptemp,
                           server_rec *s, mgs_srvconf_rec *sc)
 {
     apr_status_t rv = APR_SUCCESS;
+
+    /* If the OCSP cache is unconfigured initialize it with
+     * defaults. */
+    if (sc->ocsp_cache == NULL)
+    {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, s,
+                     "%s: OCSP cache unconfigured, using '%s:%s'.", __func__,
+                     DEFAULT_OCSP_CACHE_TYPE, DEFAULT_OCSP_CACHE_CONF);
+        const char *err = mgs_cache_inst_config(&sc->ocsp_cache, s,
+                                                DEFAULT_OCSP_CACHE_TYPE,
+                                                DEFAULT_OCSP_CACHE_CONF,
+                                                pconf, ptemp);
+        if (err != NULL)
+            ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
+                         "%s: Configuring default OCSP cache '%s:%s' failed, "
+                         "make sure that mod_socache_%s is loaded.", __func__,
+                         DEFAULT_OCSP_CACHE_TYPE, DEFAULT_OCSP_CACHE_CONF,
+                         DEFAULT_OCSP_CACHE_TYPE);
+    }
 
     /* Initialize the OCSP cache first so it's not skipped if the

test/tests/27_OCSP_server/apache.conf

@@ -1 +1 @@
 Include ${srcdir}/base_apache.conf
 GnuTLSCache ${DEFAULT_CACHE}
-GnuTLSOCSPCache shmcb
+
+# Leave GnuTLSOCSPCache unconfigured so the default shmcb cache is
+# used
+#GnuTLSOCSPCache shmcb
 
 <VirtualHost _default_:${TEST_PORT}>