Changeset 333bbc7 in mod_gnutls for src/gnutls_config.c

Timestamp:

Oct 27, 2016, 5:50:18 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

0a02378

Parents:

c6dda6d

Message:

Configurable OCSP socket timeout

Stalled OCSP requests must time out after a while to prevent stalling
the server too much. However, if the timeout is too short requests may
fail with a slow OCSP responder or high latency network
connection. Using the new GnuTLSOCSPFailureTimeout parameter users can
adjust the timeout if necessary.

All macros defining default values for OCSP related times are now
collected in gnutls_ocsp.h.

File:

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

src/gnutls_config.c

@@ -20 +20 @@
 
 #include "mod_gnutls.h"
+#include "gnutls_ocsp.h"
 #include "apr_lib.h"
 #include <gnutls/abstract.h>
 
 #define INIT_CA_SIZE 128
-/* Default OCSP response grace time in seconds */
-#define MGS_GRACE_TIME 60
-/* Default OCSP failure timeout in seconds */
-#define MGS_FAILURE_TIMEOUT 300
 
 #ifdef APLOG_USE_MODULE
@@ -875 +872 @@
                                 "GnuTLSOCSPFailureTimeout"))
         sc->ocsp_failure_timeout = apr_time_from_sec(argint);
+    else if (!apr_strnatcasecmp(parms->directive->directive,
+                                "GnuTLSOCSPSocketTimeout"))
+        sc->ocsp_socket_timeout = apr_time_from_sec(argint);
     else
         /* Can't happen unless there's a serious bug in mod_gnutls or Apache */
@@ -1128 +1128 @@
     sc->ocsp_mutex = NULL;
     sc->ocsp_grace_time = apr_time_from_sec(MGS_GRACE_TIME);
-    sc->ocsp_failure_timeout = apr_time_from_sec(MGS_FAILURE_TIMEOUT);
+    sc->ocsp_failure_timeout = apr_time_from_sec(MGS_OCSP_FAILURE_TIMEOUT);
+    sc->ocsp_socket_timeout = apr_time_from_sec(MGS_OCSP_SOCKET_TIMEOUT);
 
 /* this relies on GnuTLS never changing the gnutls_certificate_request_t enum to define -1 */
@@ -1190 +1191 @@
     gnutls_srvconf_merge(ocsp_grace_time, apr_time_from_sec(MGS_GRACE_TIME));
     gnutls_srvconf_merge(ocsp_failure_timeout,
-                         apr_time_from_sec(MGS_FAILURE_TIMEOUT));
+                         apr_time_from_sec(MGS_OCSP_FAILURE_TIMEOUT));
+    gnutls_srvconf_merge(ocsp_socket_timeout,
+                         apr_time_from_sec(MGS_OCSP_SOCKET_TIMEOUT));
 
     gnutls_srvconf_assign(ca_list);