Changeset 0470e44 in mod_gnutls for src

Timestamp:

Apr 22, 2018, 4:35:32 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, master, proxy-ticket

Children:

de1ceab

Parents:

7921dc7

Message:

Support common socache "type:config" style for GnuTLSCache directive

Location:

src

Files:

• gnutls_config.c (modified) (1 diff)
• gnutls_config.h (modified) (2 diffs)
• mod_gnutls.c (modified) (1 diff)

src/gnutls_config.c

@@ -580 +580 @@
 #endif
 
-const char *mgs_set_cache(cmd_parms * parms, void *dummy __attribute__((unused)),
-        const char *type, const char *arg) {
+const char *mgs_set_cache(cmd_parms * parms,
+                          void *dummy __attribute__((unused)),
+                          const char *type, const char *arg)
+{
     const char *err;
     mgs_srvconf_rec *sc =
-        ap_get_module_config(parms->server->module_config,
-                             &gnutls_module);
-    if ((err = ap_check_cmd_context(parms, GLOBAL_ONLY))) {
-        return err;
-    }
-
-    if (strcasecmp("none", type) == 0) {
-        sc->cache_type = mgs_cache_none;
-        sc->cache_config = NULL;
-        return NULL;
-    } else if (strcasecmp("dbm", type) == 0) {
-        sc->cache_type = mgs_cache_dbm;
+        ap_get_module_config(parms->server->module_config,
+                             &gnutls_module);
+    if ((err = ap_check_cmd_context(parms, GLOBAL_ONLY)))
+        return err;
+
+    /* none: disable cache */
+    if (strcasecmp("none", type) == 0)
+    {
+        sc->cache_type = mgs_cache_none;
+        sc->cache_config = NULL;
+        return NULL;
+    }
+
+    /* Try to split socache "type:config" style configuration */
+    const char* sep = ap_strchr_c(type, ':');
+    if (sep)
+    {
+        type = apr_pstrmemdup(parms->temp_pool, type, sep - type);
+        if (arg != NULL)
+        {
+            /* No mixing of socache style and legacy config! */
+            return "GnuTLSCache appears to have a mod_socache style "
+                "type:config value, but there is a second parameter!";
+        }
+        arg = ++sep;
+    }
+
+    if (strcasecmp("dbm", type) == 0) {
+        sc->cache_type = mgs_cache_dbm;
     } else if (strcasecmp("gdbm", type) == 0) {
-        sc->cache_type = mgs_cache_gdbm;
+        sc->cache_type = mgs_cache_gdbm;
     }
 #if HAVE_APR_MEMCACHE
     else if (strcasecmp("memcache", type) == 0) {
-        sc->cache_type = mgs_cache_memcache;
+        sc->cache_type = mgs_cache_memcache;
     }
 #endif
     else {
-        return "Invalid Type for GnuTLSCache!";
+        return "Invalid Type for GnuTLSCache!";
     }
 
     if (arg == NULL)
-        return "Invalid argument 2 for GnuTLSCache!";
+        return "Invalid argument 2 for GnuTLSCache!";
 
     if (sc->cache_type == mgs_cache_dbm
-        || sc->cache_type == mgs_cache_gdbm) {
-        sc->cache_config = ap_server_root_relative(parms->pool, arg);
+        || sc->cache_type == mgs_cache_gdbm) {
+        sc->cache_config = ap_server_root_relative(parms->pool, arg);
     } else {
-        sc->cache_config = apr_pstrdup(parms->pool, arg);
+        sc->cache_config = apr_pstrdup(parms->pool, arg);
     }
 

src/gnutls_config.h

@@ -1 +1 @@
 /*
- *  Copyright 2016 Fiona Klute
+ *  Copyright 2016-2018 Fiona Klute
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -27 +27 @@
  * mod_gnutls.h.in over here */
 
+const char *mgs_set_cache(cmd_parms * parms, void *dummy,
+                          const char *type, const char* arg);
+
 #endif /* __MOD_GNUTLS_CONFIG_H__ */

src/mod_gnutls.c

@@ -19 +19 @@
 
 #include "mod_gnutls.h"
+#include "gnutls_config.h"
 #include "gnutls_ocsp.h"
 #include "gnutls_util.h"