Changeset 9db4dcd in mod_gnutls for src/gnutls_hooks.c

Timestamp:

Jan 21, 2020, 3:24:32 PM (11 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

fcad37b

Parents:

4a22ee6

Message:

Handle GNUTLS_E_GOT_APPLICATION_DATA on gnutls_reauth()

Pending application data is cached in the connection input buffer, so
repeated attempts won't cause more memory allocations. If the buffer
is too small HTTP_REQUEST_ENTITY_TOO_LARGE is sent to the client.

The reauthentication test now contains a POST request so this code
path may (!) be taken during the test suite run.

File:

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

src/gnutls_hooks.c

@@ -1491 +1491 @@
         gnutls_certificate_server_set_request(ctxt->session,
                                               client_verify_mode);
-        if (mgs_reauth(ctxt) != GNUTLS_E_SUCCESS) {
-            return HTTP_FORBIDDEN;
-        }
-    }
-
-    int rv = mgs_cert_verify(r, ctxt);
+        int rv = mgs_reauth(ctxt, r);
+        if (rv != GNUTLS_E_SUCCESS) {
+            if (rv == GNUTLS_E_GOT_APPLICATION_DATA)
+                return HTTP_REQUEST_ENTITY_TOO_LARGE;
+            else
+                return HTTP_FORBIDDEN;
+        }
+    }
+
+    int ret = mgs_cert_verify(r, ctxt);
     /* In "request" mode we always allow the request, otherwise the
      * verify result decides. */
     if (client_verify_mode == GNUTLS_CERT_REQUEST)
         return DECLINED;
-    return rv;
+    return ret;
 }