Blame SOURCES/httpd-2.4.6-CVE-2018-1312.patch

008793
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
008793
index cbb4434..b50bcf9 100644
008793
--- a/modules/aaa/mod_auth_digest.c
008793
+++ b/modules/aaa/mod_auth_digest.c
008793
@@ -26,20 +26,13 @@
008793
  * reports to the Apache bug-database, or send them directly to me
008793
  * at ronald@innovation.ch.
008793
  *
008793
- * Requires either /dev/random (or equivalent) or the truerand library,
008793
- * available for instance from
008793
- * ftp://research.att.com/dist/mab/librand.shar
008793
- *
008793
  * Open Issues:
008793
  *   - qop=auth-int (when streams and trailer support available)
008793
  *   - nonce-format configurability
008793
  *   - Proxy-Authorization-Info header is set by this module, but is
008793
  *     currently ignored by mod_proxy (needs patch to mod_proxy)
008793
- *   - generating the secret takes a while (~ 8 seconds) if using the
008793
- *     truerand library
008793
  *   - The source of the secret should be run-time directive (with server
008793
- *     scope: RSRC_CONF). However, that could be tricky when trying to
008793
- *     choose truerand vs. file...
008793
+ *     scope: RSRC_CONF)
008793
  *   - shared-mem not completely tested yet. Seems to work ok for me,
008793
  *     but... (definitely won't work on Windoze)
008793
  *   - Sharing a realm among multiple servers has following problems:
008793
@@ -52,6 +45,8 @@
008793
  *       captures a packet sent to one server and sends it to another
008793
  *       one. Should we add "AuthDigestNcCheck Strict"?
008793
  *   - expired nonces give amaya fits.
008793
+ *   - MD5-sess and auth-int are not yet implemented. An incomplete
008793
+ *     implementation has been removed and can be retrieved from svn history.
008793
  */
008793
 
008793
 #include "apr_sha1.h"
008793
@@ -94,7 +89,6 @@ typedef struct digest_config_struct {
008793
     apr_array_header_t *qop_list;
008793
     apr_sha1_ctx_t  nonce_ctx;
008793
     apr_time_t    nonce_lifetime;
008793
-    const char  *nonce_format;
008793
     int          check_nc;
008793
     const char  *algorithm;
008793
     char        *uri_list;
008793
@@ -112,7 +106,8 @@ typedef struct digest_config_struct {
008793
 #define NONCE_HASH_LEN  (2*APR_SHA1_DIGESTSIZE)
008793
 #define NONCE_LEN       (int )(NONCE_TIME_LEN + NONCE_HASH_LEN)
008793
 
008793
-#define SECRET_LEN      20
008793
+#define SECRET_LEN          20
008793
+#define RETAINED_DATA_ID    "mod_auth_digest"
008793
 
008793
 
008793
 /* client list definitions */
008793
@@ -121,7 +116,6 @@ typedef struct hash_entry {
008793
     unsigned long      key;                     /* the key for this entry    */
008793
     struct hash_entry *next;                    /* next entry in the bucket  */
008793
     unsigned long      nonce_count;             /* for nonce-count checking  */
008793
-    char               ha1[2*APR_MD5_DIGESTSIZE+1]; /* for algorithm=MD5-sess    */
008793
     char               last_nonce[NONCE_LEN+1]; /* for one-time nonce's      */
008793
 } client_entry;
008793
 
008793
@@ -170,7 +164,7 @@ typedef union time_union {
008793
     unsigned char arr[sizeof(apr_time_t)];
008793
 } time_rec;
008793
 
008793
-static unsigned char secret[SECRET_LEN];
008793
+static unsigned char *secret;
008793
 
008793
 /* client-list, opaque, and one-time-nonce stuff */
008793
 
008793
@@ -228,35 +222,11 @@ static apr_status_t cleanup_tables(void *not_used)
008793
     return APR_SUCCESS;
008793
 }
008793
 
008793
-static apr_status_t initialize_secret(server_rec *s)
008793
-{
008793
-    apr_status_t status;
008793
-
008793
-    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, APLOGNO(01757)
008793
-                 "generating secret for digest authentication ...");
008793
-
008793
-#if APR_HAS_RANDOM
008793
-    status = apr_generate_random_bytes(secret, sizeof(secret));
008793
-#else
008793
-#error APR random number support is missing; you probably need to install the truerand library.
008793
-#endif
008793
-
008793
-    if (status != APR_SUCCESS) {
008793
-        ap_log_error(APLOG_MARK, APLOG_CRIT, status, s, APLOGNO(01758)
008793
-                     "error generating secret");
008793
-        return status;
008793
-    }
008793
-
008793
-    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01759) "done");
008793
-
008793
-    return APR_SUCCESS;
008793
-}
008793
-
008793
 static void log_error_and_cleanup(char *msg, apr_status_t sts, server_rec *s)
008793
 {
008793
     ap_log_error(APLOG_MARK, APLOG_ERR, sts, s, APLOGNO(01760)
008793
-                 "%s - all nonce-count checking, one-time nonces, and "
008793
-                 "MD5-sess algorithm disabled", msg);
008793
+                 "%s - all nonce-count checking and one-time nonces"
008793
+                 "disabled", msg);
008793
 
008793
     cleanup_tables(NULL);
008793
 }
008793
@@ -377,16 +347,32 @@ static int initialize_tables(server_rec *s, apr_pool_t *ctx)
008793
 static int pre_init(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp)
008793
 {
008793
     apr_status_t rv;
008793
+    void *retained;
008793
 
008793
     rv = ap_mutex_register(pconf, client_mutex_type, NULL, APR_LOCK_DEFAULT, 0);
008793
-    if (rv == APR_SUCCESS) {
008793
-        rv = ap_mutex_register(pconf, opaque_mutex_type, NULL, APR_LOCK_DEFAULT,
008793
-                               0);
008793
-    }
008793
-    if (rv != APR_SUCCESS) {
008793
-        return rv;
008793
-    }
008793
+    if (rv != APR_SUCCESS)
008793
+        return !OK;
008793
+    rv = ap_mutex_register(pconf, opaque_mutex_type, NULL, APR_LOCK_DEFAULT, 0);
008793
+    if (rv != APR_SUCCESS)
008793
+        return !OK;
008793
 
008793
+    retained = ap_retained_data_get(RETAINED_DATA_ID);
008793
+    if (retained == NULL) {
008793
+        retained = ap_retained_data_create(RETAINED_DATA_ID, SECRET_LEN);
008793
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, APLOGNO(01757)
008793
+                     "generating secret for digest authentication");
008793
+#if APR_HAS_RANDOM
008793
+        rv = apr_generate_random_bytes(retained, SECRET_LEN);
008793
+#else
008793
+#error APR random number support is missing
008793
+#endif
008793
+        if (rv != APR_SUCCESS) {
008793
+            ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, APLOGNO(01758)
008793
+                         "error generating secret");
008793
+            return !OK;
008793
+        }
008793
+    }
008793
+    secret = retained;
008793
     return OK;
008793
 }
008793
 
008793
@@ -399,10 +385,6 @@ static int initialize_module(apr_pool_t *p, apr_pool_t *plog,
008793
     if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG)
008793
         return OK;
008793
 
008793
-    if (initialize_secret(s) != APR_SUCCESS) {
008793
-        return !OK;
008793
-    }
008793
-
008793
 #if APR_HAS_SHARED_MEMORY
008793
     /* Note: this stuff is currently fixed for the lifetime of the server,
008793
      * i.e. even across restarts. This means that A) any shmem-size
008793
@@ -483,6 +465,16 @@ static void *create_digest_dir_config(apr_pool_t *p, char *dir)
008793
 static const char *set_realm(cmd_parms *cmd, void *config, const char *realm)
008793
 {
008793
     digest_config_rec *conf = (digest_config_rec *) config;
008793
+#ifdef AP_DEBUG
008793
+    int i;
008793
+
008793
+    /* check that we got random numbers */
008793
+    for (i = 0; i < SECRET_LEN; i++) {
008793
+        if (secret[i] != 0)
008793
+            break;
008793
+    }
008793
+    ap_assert(i < SECRET_LEN);
008793
+#endif
008793
 
008793
     /* The core already handles the realm, but it's just too convenient to
008793
      * grab it ourselves too and cache some setups. However, we need to
008793
@@ -496,7 +488,7 @@ static const char *set_realm(cmd_parms *cmd, void *config, const char *realm)
008793
      * and directives outside a virtual host section)
008793
      */
008793
     apr_sha1_init(&conf->nonce_ctx);
008793
-    apr_sha1_update_binary(&conf->nonce_ctx, secret, sizeof(secret));
008793
+    apr_sha1_update_binary(&conf->nonce_ctx, secret, SECRET_LEN);
008793
     apr_sha1_update_binary(&conf->nonce_ctx, (const unsigned char *) realm,
008793
                            strlen(realm));
008793
 
008793
@@ -590,8 +582,7 @@ static const char *set_nonce_lifetime(cmd_parms *cmd, void *config,
008793
 static const char *set_nonce_format(cmd_parms *cmd, void *config,
008793
                                     const char *fmt)
008793
 {
008793
-    ((digest_config_rec *) config)->nonce_format = fmt;
008793
-    return "AuthDigestNonceFormat is not implemented (yet)";
008793
+    return "AuthDigestNonceFormat is not implemented";
008793
 }
008793
 
008793
 static const char *set_nc_check(cmd_parms *cmd, void *config, int flag)
008793
@@ -612,7 +603,7 @@ static const char *set_algorithm(cmd_parms *cmd, void *config, const char *alg)
008793
 {
008793
     if (!strcasecmp(alg, "MD5-sess")) {
008793
         return "AuthDigestAlgorithm: ERROR: algorithm `MD5-sess' "
008793
-                "is not fully implemented";
008793
+                "is not implemented";
008793
     }
008793
     else if (strcasecmp(alg, "MD5")) {
008793
         return apr_pstrcat(cmd->pool, "Invalid algorithm in AuthDigestAlgorithm: ", alg, NULL);
008793
@@ -1138,7 +1129,7 @@ static const char *gen_nonce(apr_pool_t *p, apr_time_t now, const char *opaque,
008793
 static client_entry *gen_client(const request_rec *r)
008793
 {
008793
     unsigned long op;
008793
-    client_entry new_entry = { 0, NULL, 0, "", "" }, *entry;
008793
+    client_entry new_entry = { 0, NULL, 0, "" }, *entry;
008793
 
008793
     if (!opaque_cntr) {
008793
         return NULL;
008793
@@ -1158,92 +1149,6 @@ static client_entry *gen_client(const request_rec *r)
008793
 }
008793
 
008793
 
008793
-/*
008793
- * MD5-sess code.
008793
- *
008793
- * If you want to use algorithm=MD5-sess you must write get_userpw_hash()
008793
- * yourself (see below). The dummy provided here just uses the hash from
008793
- * the auth-file, i.e. it is only useful for testing client implementations
008793
- * of MD5-sess .
008793
- */
008793
-
008793
-/*
008793
- * get_userpw_hash() will be called each time a new session needs to be
008793
- * generated and is expected to return the equivalent of
008793
- *
008793
- * h_urp = ap_md5(r->pool,
008793
- *         apr_pstrcat(r->pool, username, ":", ap_auth_name(r), ":", passwd))
008793
- * ap_md5(r->pool,
008793
- *         (unsigned char *) apr_pstrcat(r->pool, h_urp, ":", resp->nonce, ":",
008793
- *                                      resp->cnonce, NULL));
008793
- *
008793
- * or put differently, it must return
008793
- *
008793
- *   MD5(MD5(username ":" realm ":" password) ":" nonce ":" cnonce)
008793
- *
008793
- * If something goes wrong, the failure must be logged and NULL returned.
008793
- *
008793
- * You must implement this yourself, which will probably consist of code
008793
- * contacting the password server with the necessary information (typically
008793
- * the username, realm, nonce, and cnonce) and receiving the hash from it.
008793
- *
008793
- * TBD: This function should probably be in a separate source file so that
008793
- * people need not modify mod_auth_digest.c each time they install a new
008793
- * version of apache.
008793
- */
008793
-static const char *get_userpw_hash(const request_rec *r,
008793
-                                   const digest_header_rec *resp,
008793
-                                   const digest_config_rec *conf)
008793
-{
008793
-    return ap_md5(r->pool,
008793
-             (unsigned char *) apr_pstrcat(r->pool, conf->ha1, ":", resp->nonce,
008793
-                                           ":", resp->cnonce, NULL));
008793
-}
008793
-
008793
-
008793
-/* Retrieve current session H(A1). If there is none and "generate" is
008793
- * true then a new session for MD5-sess is generated and stored in the
008793
- * client struct; if generate is false, or a new session could not be
008793
- * generated then NULL is returned (in case of failure to generate the
008793
- * failure reason will have been logged already).
008793
- */
008793
-static const char *get_session_HA1(const request_rec *r,
008793
-                                   digest_header_rec *resp,
008793
-                                   const digest_config_rec *conf,
008793
-                                   int generate)
008793
-{
008793
-    const char *ha1 = NULL;
008793
-
008793
-    /* return the current sessions if there is one */
008793
-    if (resp->opaque && resp->client && resp->client->ha1[0]) {
008793
-        return resp->client->ha1;
008793
-    }
008793
-    else if (!generate) {
008793
-        return NULL;
008793
-    }
008793
-
008793
-    /* generate a new session */
008793
-    if (!resp->client) {
008793
-        resp->client = gen_client(r);
008793
-    }
008793
-    if (resp->client) {
008793
-        ha1 = get_userpw_hash(r, resp, conf);
008793
-        if (ha1) {
008793
-            memcpy(resp->client->ha1, ha1, sizeof(resp->client->ha1));
008793
-        }
008793
-    }
008793
-
008793
-    return ha1;
008793
-}
008793
-
008793
-
008793
-static void clear_session(const digest_header_rec *resp)
008793
-{
008793
-    if (resp->client) {
008793
-        resp->client->ha1[0] = '\0';
008793
-    }
008793
-}
008793
-
008793
 /*
008793
  * Authorization challenge generation code (for WWW-Authenticate)
008793
  */
008793
@@ -1282,8 +1187,7 @@ static void note_digest_auth_failure(request_rec *r,
008793
 
008793
     if (resp->opaque == NULL) {
008793
         /* new client */
008793
-        if ((conf->check_nc || conf->nonce_lifetime == 0
008793
-             || !strcasecmp(conf->algorithm, "MD5-sess"))
008793
+        if ((conf->check_nc || conf->nonce_lifetime == 0)
008793
             && (resp->client = gen_client(r)) != NULL) {
008793
             opaque = ltox(r->pool, resp->client->key);
008793
         }
008793
@@ -1323,15 +1227,6 @@ static void note_digest_auth_failure(request_rec *r,
008793
         memcpy(resp->client->last_nonce, nonce, NONCE_LEN+1);
008793
     }
008793
 
008793
-    /* Setup MD5-sess stuff. Note that we just clear out the session
008793
-     * info here, since we can't generate a new session until the request
008793
-     * from the client comes in with the cnonce.
008793
-     */
008793
-
008793
-    if (!strcasecmp(conf->algorithm, "MD5-sess")) {
008793
-        clear_session(resp);
008793
-    }
008793
-
008793
     /* setup domain attribute. We want to send this attribute wherever
008793
      * possible so that the client won't send the Authorization header
008793
      * unnecessarily (it's usually > 200 bytes!).
008793
@@ -1597,24 +1492,9 @@ static const char *new_digest(const request_rec *r,
008793
 {
008793
     const char *ha1, *ha2, *a2;
008793
 
008793
-    if (resp->algorithm && !strcasecmp(resp->algorithm, "MD5-sess")) {
008793
-        ha1 = get_session_HA1(r, resp, conf, 1);
008793
-        if (!ha1) {
008793
-            return NULL;
008793
-        }
008793
-    }
008793
-    else {
008793
-        ha1 = conf->ha1;
008793
-    }
008793
+    ha1 = conf->ha1;
008793
 
008793
-    if (resp->message_qop && !strcasecmp(resp->message_qop, "auth-int")) {
008793
-        a2 = apr_pstrcat(r->pool, resp->method, ":", resp->uri, ":",
008793
-                         ap_md5(r->pool, (const unsigned char*) ""), NULL);
008793
-                         /* TBD */
008793
-    }
008793
-    else {
008793
-        a2 = apr_pstrcat(r->pool, resp->method, ":", resp->uri, NULL);
008793
-    }
008793
+    a2 = apr_pstrcat(r->pool, resp->method, ":", resp->uri, NULL);
008793
     ha2 = ap_md5(r->pool, (const unsigned char *)a2);
008793
 
008793
     return ap_md5(r->pool,
008793
@@ -1854,8 +1734,7 @@ static int authenticate_digest_user(request_rec *r)
008793
     }
008793
 
008793
     if (resp->algorithm != NULL
008793
-        && strcasecmp(resp->algorithm, "MD5")
008793
-        && strcasecmp(resp->algorithm, "MD5-sess")) {
008793
+        && strcasecmp(resp->algorithm, "MD5")) {
008793
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01789)
008793
                       "unknown algorithm `%s' received: %s",
008793
                       resp->algorithm, r->uri);
008793
@@ -2007,27 +1886,9 @@ static int add_auth_info(request_rec *r)
008793
 
008793
         /* calculate rspauth attribute
008793
          */
008793
-        if (resp->algorithm && !strcasecmp(resp->algorithm, "MD5-sess")) {
008793
-            ha1 = get_session_HA1(r, resp, conf, 0);
008793
-            if (!ha1) {
008793
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01795)
008793
-                              "internal error: couldn't find session "
008793
-                              "info for user %s", resp->username);
008793
-                return !OK;
008793
-            }
008793
-        }
008793
-        else {
008793
-            ha1 = conf->ha1;
008793
-        }
008793
+        ha1 = conf->ha1;
008793
 
008793
-        if (resp->message_qop && !strcasecmp(resp->message_qop, "auth-int")) {
008793
-            a2 = apr_pstrcat(r->pool, ":", resp->uri, ":",
008793
-                             ap_md5(r->pool,(const unsigned char *) ""), NULL);
008793
-                             /* TBD */
008793
-        }
008793
-        else {
008793
-            a2 = apr_pstrcat(r->pool, ":", resp->uri, NULL);
008793
-        }
008793
+        a2 = apr_pstrcat(r->pool, ":", resp->uri, NULL);
008793
         ha2 = ap_md5(r->pool, (const unsigned char *)a2);
008793
 
008793
         resp_dig = ap_md5(r->pool,