Changeset b4739cd in mod_gnutls

Timestamp:

Dec 3, 2013, 4:28:42 PM (8 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

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

Children:

9717fe4

Parents:

37b52ea

Message:

display some information in mod_status

File:

• src/gnutls_hooks.c (modified) (4 diffs)

src/gnutls_hooks.c

@@ -21 +21 @@
 #include "http_vhost.h"
 #include "ap_mpm.h"
+#include "mod_status.h"
 
 #ifdef ENABLE_MSVA
@@ -41 +42 @@
 static void mgs_add_common_pgpcert_vars(request_rec * r, gnutls_openpgp_crt_t cert, int side, int export_full_cert);
 static const char* mgs_x509_construct_uid(request_rec * pool, gnutls_x509_crt_t cert);
+static int mgs_status_hook(request_rec *r, int flags);
 
 /* Pool Cleanup Function */
@@ -109 +111 @@
                 return DONE;
     }
+
+    AP_OPTIONAL_HOOK(status_hook, mgs_status_hook, NULL, NULL, APR_HOOK_MIDDLE);
 
         /* Register a pool clean-up function */
@@ -1508 +1512 @@
     return ret;
 }
+
+static int mgs_status_hook(request_rec *r, int flags)
+{
+    mgs_srvconf_rec *sc;
+
+    if (r == NULL)
+        return OK;
+
+    sc = (mgs_srvconf_rec *) ap_get_module_config(r->server->module_config, &gnutls_module);
+
+    _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__);
+
+    ap_rputs("<hr>\n", r);
+    ap_rputs("<h2>GnuTLS Information:</h2>\n<dl>\n", r);
+
+    ap_rprintf(r, "<dt>GnuTLS version:</dt><dd>%s</dd>\n", gnutls_check_version(NULL));
+    ap_rputs("<dt>Built against:</dt><dd>" GNUTLS_VERSION "</dd>\n", r);
+    ap_rprintf(r, "<dt>using TLS:</dt><dd>%s</dd>\n", (sc->enabled == GNUTLS_ENABLED_FALSE ? "no" : "yes"));
+    if (sc->enabled != GNUTLS_ENABLED_FALSE) {
+        mgs_handle_t* ctxt;
+        char* z = NULL;
+        ctxt = ap_get_module_config(r->connection->conn_config, &gnutls_module);
+        if (ctxt && ctxt->session != NULL) {
+            z = gnutls_session_get_desc(ctxt->session);
+            if (z) {
+                ap_rprintf(r, "<dt>This TLS Session:</dt><dd>%s</dd>\n", z);
+                gnutls_free(z);
+            }
+        }
+    }
+
+    ap_rputs("</dl>\n", r);
+    return OK;
+}
+