Changeset a85de63 in mod_gnutls

Timestamp:

Apr 19, 2018, 3:09:04 PM (5 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

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

Children:

103cafa

Parents:

c34a68b

Message:

Make cache_fetch_func work without a connection context

This is necessary to do cache fetches without a client connection,
e.g. while doing asynchronous OCSP updates.

Location:

src

Files:

• gnutls_cache.c (modified) (4 diffs)
• gnutls_cache.h (modified) (2 diffs)
• gnutls_ocsp.c (modified) (4 diffs)

src/gnutls_cache.c

@@ -3 +3 @@
  *  Copyright 2008 Nikos Mavrogiannopoulos
  *  Copyright 2011 Dash Shendy
- *  Copyright 2015-2016 Fiona Klute
+ *  Copyright 2015-2018 Fiona Klute
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -326 +326 @@
 }
 
-static gnutls_datum_t mc_cache_fetch_generic(mgs_handle_t *ctxt,
-                                             gnutls_datum_t key)
+static gnutls_datum_t mc_cache_fetch_generic(server_rec *server,
+                                             gnutls_datum_t key,
+                                             apr_pool_t *pool)
 {
     gnutls_datum_t data = {NULL, 0};
-    const char *hex = apr_pescape_hex(ctxt->c->pool, key.data, key.size, 1);
+    const char *hex = apr_pescape_hex(pool, key.data, key.size, 1);
     if (hex == NULL)
         return data;
 
-    const char *strkey = apr_psprintf(ctxt->c->pool, MC_TAG "%s", hex);
-    return mc_cache_fetch(ctxt->c->base_server, strkey, ctxt->c->pool);
+    const char *strkey = apr_psprintf(pool, MC_TAG "%s", hex);
+    return mc_cache_fetch(server, strkey, pool);
 }
 
@@ -454 +455 @@
 }
 
-static gnutls_datum_t dbm_cache_fetch(mgs_handle_t *ctxt, gnutls_datum_t key)
-{
-    server_rec *server = ctxt->c->base_server;
-    apr_pool_t *pool = ctxt->c->pool;
+
+
+static gnutls_datum_t dbm_cache_fetch(server_rec *server, gnutls_datum_t key,
+                                      apr_pool_t *pool)
+{
     mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
         ap_get_module_config(server->module_config, &gnutls_module);
@@ -537 +539 @@
         return data;
 
-    return dbm_cache_fetch(ctxt, dbmkey);
+    return dbm_cache_fetch(ctxt->c->base_server, dbmkey, ctxt->c->pool);
 }
 

src/gnutls_cache.h

@@ -2 +2 @@
  *  Copyright 2004-2005 Paul Querna
  *  Copyright 2014 Nikos Mavrogiannopoulos
- *  Copyright 2015-2016 Fiona Klute
+ *  Copyright 2015-2018 Fiona Klute
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -97 +97 @@
  * session caching API, and must be released using `gnutls_free()`.
  *
- * @param ctxt mod_gnutls session context for the request
+ * @param server server context for the request
+ *
  * @param key key for the cache entry to be fetched
+ *
+ * @param pool pool to allocate the response and other temporary
+ * memory from
  *
  * @return the requested cache entry, or `{NULL, 0}`
  */
-typedef gnutls_datum_t (*cache_fetch_func)(mgs_handle_t *ctxt,
-                                           gnutls_datum_t key);
+typedef gnutls_datum_t (*cache_fetch_func)(server_rec *server,
+                                           gnutls_datum_t key,
+                                           apr_pool_t *pool);
 /**
  * Internal cache configuration structure

src/gnutls_ocsp.c

@@ -1 +1 @@
 /*
- *  Copyright 2016 Fiona Klute
+ *  Copyright 2016-2018 Fiona Klute
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -772 +772 @@
     }
 
-    *ocsp_response = sc->cache->fetch(ctxt,
-                                      sc->ocsp->fingerprint);
+    *ocsp_response = ctxt->sc->cache->fetch(ctxt->c->base_server,
+                                            ctxt->sc->ocsp->fingerprint,
+                                            ctxt->c->pool);
     if (ocsp_response->size == 0)
     {
@@ -808 +809 @@
          * moment there's no good way to integrate that with the
          * Apache Mutex directive. */
-        *ocsp_response = sc->cache->fetch(ctxt,
-                                          sc->ocsp->fingerprint);
+        *ocsp_response = ctxt->sc->cache->fetch(ctxt->c->base_server,
+                                                ctxt->sc->ocsp->fingerprint,
+                                                ctxt->c->pool);
         if (ocsp_response->size > 0)
         {
@@ -837 +839 @@
 
     /* retry reading from cache */
-    *ocsp_response = sc->cache->fetch(ctxt,
-                                      sc->ocsp->fingerprint);
+    *ocsp_response = ctxt->sc->cache->fetch(ctxt->c->base_server,
+                                            ctxt->sc->ocsp->fingerprint,
+                                            ctxt->c->pool);
     if (ocsp_response->size == 0)
     {