Changes in / [e809a17a:7677448] in mod_gnutls

Files:

• .github/workflows/analysis.yaml (modified) (1 diff)
• .github/workflows/build.yaml (modified) (1 diff)
• .github/workflows/valgrind.yaml (modified) (1 diff)
• src/gnutls_hooks.c (modified) (3 diffs)
• src/gnutls_io.c (modified) (5 diffs)

.github/workflows/analysis.yaml

@@ -13 +13 @@
       - '!doc/**'
       - '!**.md'
+
+permissions:
+  contents: read
+  security-events: write
 
 jobs:

.github/workflows/build.yaml

@@ -8 +8 @@
       - 'debian/**'
       - 'pristine-tar'
+
+permissions:
+  contents: read
+
 jobs:
   build:

.github/workflows/valgrind.yaml

@@ -12 +12 @@
       - '!doc/**'
       - '!**.md'
+
+permissions:
+  contents: read
+
 jobs:
   debian-buster:

src/gnutls_hooks.c

@@ -1100 +1100 @@
     /* check if session needs closing */
     mgs_handle_t *ctxt = (mgs_handle_t *) data;
-    if (ctxt->session != NULL)
+    if (ctxt->session == NULL)
+        return APR_SUCCESS;
+
+    if (ctxt->c->aborted)
+    {
+        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctxt->c,
+                      "%s: TLS %sconnection aborted, cleaning up.",
+                      __func__, IS_PROXY_STR(ctxt));
+    }
+    else
     {
         ap_log_cerror(APLOG_MARK, APLOG_WARNING, APR_ECONNABORTED, ctxt->c,
@@ -1112 +1121 @@
         while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
         if (ret != GNUTLS_E_SUCCESS)
-            ap_log_cerror(APLOG_MARK, APLOG_INFO, APR_EGENERAL, ctxt->c,
+            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_EGENERAL, ctxt->c,
                           "%s: error while closing TLS %sconnection: %s (%d)",
                           __func__, IS_PROXY_STR(ctxt),
@@ -1120 +1129 @@
                           "%s: TLS %sconnection closed.",
                           __func__, IS_PROXY_STR(ctxt));
-        /* De-Initialize Session */
-        gnutls_deinit(ctxt->session);
-        ctxt->session = NULL;
-    }
+    }
+
+    /* De-Initialize Session */
+    gnutls_deinit(ctxt->session);
+    ctxt->session = NULL;
     return APR_SUCCESS;
 }

src/gnutls_io.c

@@ -254 +254 @@
             } else if (rc == GNUTLS_E_REHANDSHAKE) {
                 /* A client has asked for a new Hankshake. Currently, we don't do it */
-                ap_log_cerror(APLOG_MARK, APLOG_INFO,
+                ap_log_cerror(APLOG_MARK, APLOG_DEBUG,
                         ctxt->input_rc,
                         ctxt->c,
@@ -262 +262 @@
             } else if (rc == GNUTLS_E_WARNING_ALERT_RECEIVED) {
                 rc = gnutls_alert_get(ctxt->session);
-                ap_log_cerror(APLOG_MARK, APLOG_INFO,
+                ap_log_cerror(APLOG_MARK, APLOG_DEBUG,
                         ctxt->input_rc,
                         ctxt->c,
@@ -270 +270 @@
             } else if (rc == GNUTLS_E_FATAL_ALERT_RECEIVED) {
                 rc = gnutls_alert_get(ctxt->session);
-                ap_log_cerror(APLOG_MARK, APLOG_INFO,
+                ap_log_cerror(APLOG_MARK, APLOG_DEBUG,
                         ctxt->input_rc,
                         ctxt->c,
@@ -281 +281 @@
                 /* Some Other Error. Report it. Die. */
                 if (gnutls_error_is_fatal(rc)) {
-                    ap_log_cerror(APLOG_MARK,
-                            APLOG_INFO,
-                            ctxt->input_rc,
-                            ctxt->c,
-                            "GnuTLS: Error reading data. (%d) '%s'",
-                            rc,
-                            gnutls_strerror(rc));
+                    ap_log_cerror(
+                        APLOG_MARK, APLOG_DEBUG,
+                        ctxt->input_rc,
+                        ctxt->c,
+                        "GnuTLS: Error reading data. (%d) '%s'",
+                        rc, gnutls_strerror(rc));
                 } else if (*len > 0) {
                     ctxt->input_rc = APR_SUCCESS;
@@ -778 +777 @@
                 if (ret < 0) {
                     /* error sending output */
-                    ap_log_cerror(APLOG_MARK, APLOG_INFO, ctxt->output_rc,
+                    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, ctxt->output_rc,
                                   ctxt->c,
                                   "GnuTLS: Error writing data. (%d) '%s'",