Changeset e7cf823 in mod_gnutls for src/gnutls_hooks.c

Timestamp:

Apr 10, 2018, 12:18:26 PM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, debian/stretch-backports, master, proxy-ticket, upstream

Children:

2f10643

Parents:

4cdd4fd

Message:

Add process_connection hook, adjust hook order for mod_http2 compatibility

The TLS handshake must have happened before the mod_http2
process_connection hook runs, which means we have to trigger it
explicitly before any reads happen. Some other hooks must have a
certain order relative to mod_http2 as well.

File:

• src/gnutls_hooks.c (modified) (1 diff)

src/gnutls_hooks.c

@@ -1076 +1076 @@
 }
 
+
+
+/**
+ * process_connection hook: Do a zero byte read to trigger the
+ * handshake. Doesn't change anything for traditional protocols that
+ * just do reads, but HTTP/2 needs the TLS handshake and ALPN to
+ * happen before its process_connection hook runs.
+ */
+int mgs_hook_process_connection(conn_rec* c)
+{
+    mgs_handle_t *ctxt = (mgs_handle_t *)
+        ap_get_module_config(c->conn_config, &gnutls_module);
+
+    if ((ctxt != NULL) && (ctxt->enabled == GNUTLS_ENABLED_TRUE))
+    {
+        /* This connection is supposed to use TLS. Give the filters a
+         * kick with a zero byte read to trigger the handshake. */
+        apr_bucket_brigade* temp =
+            apr_brigade_create(c->pool, c->bucket_alloc);
+        ap_get_brigade(c->input_filters, temp,
+                       AP_MODE_INIT, APR_BLOCK_READ, 0);
+        apr_brigade_destroy(temp);
+    }
+    return DECLINED;
+}
+
+
+
 int mgs_hook_fixups(request_rec * r) {
     unsigned char sbuf[GNUTLS_MAX_SESSION_ID];