Changeset 64856fd in mod_gnutls for src/gnutls_hooks.c

Timestamp:

May 31, 2016, 6:00:31 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

fad7695

Parents:

2a1ffd6

Message:

Get rid of exit(-1) calls in mgs_hook_post_config()

This allows the server to fail properly. Also rename the config pool
to match http_config.h for readability.

File:

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

src/gnutls_hooks.c

@@ -303 +303 @@
 }
 
-int mgs_hook_post_config(apr_pool_t * p, apr_pool_t * plog __attribute__((unused)), apr_pool_t * ptemp __attribute__((unused)), server_rec * base_server) {
-
+/*
+ * Must return OK or DECLINED on success, something else on
+ * error. These codes are defined in Apache httpd.h along with the
+ * HTTP status codes, so I'm going to use HTTP error codes both for
+ * fun (and to avoid conflicts).
+ */
+int mgs_hook_post_config(apr_pool_t *pconf,
+                         apr_pool_t *plog __attribute__((unused)),
+                         apr_pool_t *ptemp __attribute__((unused)),
+                         server_rec *base_server)
+{
     int rv;
     server_rec *s;
@@ -324 +333 @@
 
 
-    rv = mgs_cache_post_config(p, s, sc_base);
+    rv = mgs_cache_post_config(pconf, s, sc_base);
     if (rv != 0) {
         ap_log_error(APLOG_MARK, APLOG_STARTUP, rv, s,
                 "GnuTLS: Post Config for GnuTLSCache Failed."
                 " Shutting Down.");
-        exit(-1);
+        return HTTP_INSUFFICIENT_STORAGE;
     }
 
@@ -366 +375 @@
         sc->cache_timeout = sc_base->cache_timeout;
 
-        rv = mgs_load_files(p, s);
+        rv = mgs_load_files(pconf, s);
         if (rv != 0) {
             ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
                 "GnuTLS: Loading required files failed."
                 " Shutting Down.");
-            exit(-1);
+            return HTTP_NOT_FOUND;
         }
 
@@ -391 +400 @@
                     "GnuTLS: Host '%s:%d' is missing the GnuTLSPriorities directive!",
                     s->server_hostname, s->port);
-            exit(-1);
+            return HTTP_NOT_ACCEPTABLE;
         }
 
@@ -423 +432 @@
                                                 "GnuTLS: Host '%s:%d' is missing a Certificate File!",
                                                 s->server_hostname, s->port);
-            exit(-1);
+            return HTTP_UNAUTHORIZED;
         }
         if (sc->enabled == GNUTLS_ENABLED_TRUE &&
@@ -431 +440 @@
                                                 "GnuTLS: Host '%s:%d' is missing a Private Key File!",
                                                 s->server_hostname, s->port);
-            exit(-1);
+            return HTTP_UNAUTHORIZED;
         }
 
@@ -437 +446 @@
             rv = -1;
             if (sc->certs_x509_chain_num > 0) {
-                rv = read_crt_cn(s, p, sc->certs_x509_crt_chain[0], &sc->cert_cn);
+                rv = read_crt_cn(s, pconf, sc->certs_x509_crt_chain[0], &sc->cert_cn);
             }
             if (rv < 0 && sc->cert_pgp != NULL) {
-                rv = read_pgpcrt_cn(s, p, sc->cert_crt_pgp[0], &sc->cert_cn);
+                rv = read_pgpcrt_cn(s, pconf, sc->cert_crt_pgp[0], &sc->cert_cn);
                         }
 
@@ -460 +469 @@
                          "'%s:%d' failed, exiting!",
                          __func__, s->server_hostname, s->port);
-            exit(-1);
-        }
-    }
-
-
-    ap_add_version_component(p, "mod_gnutls/" MOD_GNUTLS_VERSION);
+            return HTTP_PROXY_AUTHENTICATION_REQUIRED;
+        }
+    }
+
+
+    ap_add_version_component(pconf, "mod_gnutls/" MOD_GNUTLS_VERSION);
 
     {
         const char* libvers = gnutls_check_version(NULL);
         char* gnutls_version = NULL;
-        if(libvers && (gnutls_version = apr_psprintf(p, "GnuTLS/%s", libvers))) {
-            ap_add_version_component(p, gnutls_version);
+        if(libvers && (gnutls_version = apr_psprintf(pconf, "GnuTLS/%s", libvers))) {
+            ap_add_version_component(pconf, gnutls_version);
         } else {
             // In case we could not create the above string go for the static version instead
-            ap_add_version_component(p, "GnuTLS/" GNUTLS_VERSION "-static");
+            ap_add_version_component(pconf, "GnuTLS/" GNUTLS_VERSION "-static");
         }
     }