Changeset f94938c in mod_gnutls for src

Timestamp:

Jan 22, 2020, 12:39:42 PM (12 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

4fe52e6

Parents:

fcad37b

Message:

Nicer logging for post-handshake authentication

Location:

src

Files:

• gnutls_hooks.c (modified) (2 diffs)
• gnutls_io.c (modified) (2 diffs)

src/gnutls_hooks.c

@@ -1449 +1449 @@
         client_verify_mode = dc->client_verify_mode;
 
+    char *verify_mode;
     if (client_verify_mode == GNUTLS_CERT_IGNORE)
-    {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                      "%s: verify mode is \"ignore\"", __func__);
+        verify_mode = "ignore";
+    else if (client_verify_mode == GNUTLS_CERT_REQUEST)
+        verify_mode = "request";
+    else if (client_verify_mode == GNUTLS_CERT_REQUIRE)
+        verify_mode = "require";
+    else
+        verify_mode = "(undefined)";
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                  "%s: verify mode is \"%s\"", __func__, verify_mode);
+
+    if (client_verify_mode == GNUTLS_CERT_IGNORE)
+    {
         return DECLINED;
     }
@@ -1470 +1480 @@
     {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                      "%s: No certificate, attempting to reauthenticate "
-                      "peer (%d)",
+                      "%s: No certificate, attempting post-handshake "
+                      "authentication (%d)",
                       __func__, client_verify_mode);
 

src/gnutls_io.c

@@ -490 +490 @@
             }
             else
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
+                ap_log_rerror(APLOG_MARK, APLOG_INFO, status, r,
                               "%s: buffering request data failed!",
                               __func__);
@@ -502 +502 @@
     {
         ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
-                      "%s: Reauthentication failed: %s (%d)",
+                      "%s: post-handshake authentication failed: %s (%d)",
                       __func__, gnutls_strerror(rv), rv);
         return rv;