Commit 273b7aac authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Add lots of unique tags to error log messages 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
parent 7e295aee

docs/log-message-tags/next-number

+1 −1
Changes for docs/log-message-tags/next-number: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
1
 
2183

modules/aaa/mod_access_compat.c

+1 −1
Changes for modules/aaa/mod_access_compat.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int check_dir_access(request_rec *r) 
    }



    if (ret == HTTP_FORBIDDEN) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01797)

                      "client denied by server configuration: %s%s",

                      r->filename ? "" : "uri ",

                      r->filename ? r->filename : r->uri);

modules/aaa/mod_allowmethods.c

+1 −1
Changes for modules/aaa/mod_allowmethods.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int am_check_access(request_rec *r) 
    return DECLINED;

  }



  ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

  ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01623)

                  "client method denied by server configuration: '%s' to %s%s",

                  r->method,

                  r->filename ? "" : "uri ",

modules/aaa/mod_auth_basic.c

+5 −5
Changes for modules/aaa/mod_auth_basic.c: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int get_basic_auth(request_rec *r, const char **user, 


    if (strcasecmp(ap_getword(r->pool, &auth_line, ' '), "Basic")) {

        /* Client tried to authenticate using wrong auth scheme */

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01614)

                      "client used wrong authentication scheme: %s", r->uri);

        note_basic_auth_failure(r);

        return HTTP_UNAUTHORIZED;
@@ -201,7 +201,7 @@ static int authenticate_basic_user(request_rec *r) 
    /* We need an authentication realm. */

    if (!ap_auth_name(r)) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR,

                      0, r, "need AuthName: %s", r->uri);

                      0, r, APLOGNO(01615) "need AuthName: %s", r->uri);

        return HTTP_INTERNAL_SERVER_ERROR;

    }
@@ -225,7 +225,7 @@ static int authenticate_basic_user(request_rec *r) 
                                          AUTHN_PROVIDER_VERSION);



            if (!provider || !provider->check_password) {

                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01616)

                              "No Authn provider configured");

                auth_result = AUTH_GENERAL_ERROR;

                break;
@@ -265,14 +265,14 @@ static int authenticate_basic_user(request_rec *r) 


        switch (auth_result) {

        case AUTH_DENIED:

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01617)

                      "user %s: authentication failure for \"%s\": "

                      "Password Mismatch",

                      sent_user, r->uri);

            return_code = HTTP_UNAUTHORIZED;

            break;

        case AUTH_USER_NOT_FOUND:

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01618)

                      "user %s not found: %s", sent_user, r->uri);

            return_code = HTTP_UNAUTHORIZED;

            break;

modules/aaa/mod_auth_digest.c

+40 −40
Changes for modules/aaa/mod_auth_digest.c: 40 added lines, 40 removed lines.
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ module AP_MODULE_DECLARE_DATA auth_digest_module; 


static apr_status_t cleanup_tables(void *not_used)

{

    ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, APLOGNO(01756)

                  "cleaning up shared memory");



    if (client_rmm) {
@@ -230,7 +230,7 @@ static apr_status_t initialize_secret(server_rec *s) 
{

    apr_status_t status;



    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,

    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, APLOGNO(01757)

                 "generating secret for digest authentication ...");



#if APR_HAS_RANDOM
@@ -241,20 +241,20 @@ static apr_status_t initialize_secret(server_rec *s) 


    if (status != APR_SUCCESS) {

        char buf[120];

        ap_log_error(APLOG_MARK, APLOG_CRIT, status, s,

        ap_log_error(APLOG_MARK, APLOG_CRIT, status, s, APLOGNO(01758)

                     "error generating secret: %s",

                     apr_strerror(status, buf, sizeof(buf)));

        return status;

    }



    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "done");

    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01759) "done");



    return APR_SUCCESS;

}



static void log_error_and_cleanup(char *msg, apr_status_t sts, server_rec *s)

{

    ap_log_error(APLOG_MARK, APLOG_ERR, sts, s,

    ap_log_error(APLOG_MARK, APLOG_ERR, sts, s, APLOGNO(01760)

                 "%s - all nonce-count checking, one-time nonces, and "

                 "MD5-sess algorithm disabled", msg);
@@ -273,7 +273,7 @@ static int initialize_tables(server_rec *s, apr_pool_t *ctx) 


    sts = apr_temp_dir_get(&tempdir, ctx);

    if (APR_SUCCESS != sts) {

        ap_log_error(APLOG_MARK, APLOG_ERR, sts, s,

        ap_log_error(APLOG_MARK, APLOG_ERR, sts, s, APLOGNO(01761)

                     "Failed to find temporary directory");

        log_error_and_cleanup("failed to find temp dir", sts, s);

        return HTTP_INTERNAL_SERVER_ERROR;
@@ -292,7 +292,7 @@ static int initialize_tables(server_rec *s, apr_pool_t *ctx) 
    sts = apr_shm_create(&client_shm, shmem_size,

                        client_shm_filename, ctx);

    if (APR_SUCCESS != sts) {

        ap_log_error(APLOG_MARK, APLOG_ERR, sts, s,

        ap_log_error(APLOG_MARK, APLOG_ERR, sts, s, APLOGNO(01762)

                     "Failed to create shared memory segment on file %s",

                     client_shm_filename);

        log_error_and_cleanup("failed to initialize shm", sts, s);
@@ -671,7 +671,7 @@ static const char *set_shmem_size(cmd_parms *cmd, void *config, 
    if (num_buckets == 0) {

        num_buckets = 1;

    }

    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,

    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server, APLOGNO(01763)

                 "Set shmem-size: %" APR_SIZE_T_FMT ", num-buckets: %ld",

                 shmem_size, num_buckets);
@@ -785,11 +785,11 @@ static client_entry *get_client(unsigned long key, const request_rec *r) 
    apr_global_mutex_unlock(client_lock);



    if (entry) {

        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01764)

                      "get_client(): client %lu found", key);

    }

    else {

        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01765)

                      "get_client(): client %lu not found", key);

    }
@@ -860,7 +860,7 @@ static client_entry *add_client(unsigned long key, client_entry *info, 
    entry = apr_rmm_addr_get(client_rmm, apr_rmm_malloc(client_rmm, sizeof(client_entry)));

    if (!entry) {

        long num_removed = gc();

        ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,

        ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, APLOGNO(01766)

                     "gc'd %ld client entries. Total new clients: "

                     "%ld; Total removed clients: %ld; Total renewed clients: "

                     "%ld", num_removed,
@@ -868,7 +868,7 @@ static client_entry *add_client(unsigned long key, client_entry *info, 
                     client_list->num_removed, client_list->num_renewed);

        entry = apr_rmm_addr_get(client_rmm, apr_rmm_malloc(client_rmm, sizeof(client_entry)));

        if (!entry) {

            ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,

            ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(01767)

                         "unable to allocate new auth_digest client");

            apr_global_mutex_unlock(client_lock);

            return NULL;       /* give up */
@@ -886,7 +886,7 @@ static client_entry *add_client(unsigned long key, client_entry *info, 


    apr_global_mutex_unlock(client_lock);



    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,

    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01768)

                 "allocated new client %lu", key);



    return entry;
@@ -1144,7 +1144,7 @@ static client_entry *gen_client(const request_rec *r) 
    apr_global_mutex_unlock(opaque_lock);



    if (!(entry = add_client(op, &new_entry, r->server))) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01769)

                      "failed to allocate client entry - ignoring client");

        return NULL;

    }
@@ -1416,7 +1416,7 @@ static authn_status get_hash(request_rec *r, const char *user, 
                                          AUTHN_PROVIDER_VERSION);



            if (!provider || !provider->get_realm_hash) {

                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01770)

                              "No Authn provider configured");

                auth_result = AUTH_GENERAL_ERROR;

                break;
@@ -1464,7 +1464,7 @@ static int check_nc(const request_rec *r, const digest_header_rec *resp, 


    if (conf->check_nc && !client_shm) {

        /* Shouldn't happen, but just in case... */

        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01771)

                      "cannot check nonce count without shared memory");

        return OK;

    }
@@ -1478,7 +1478,7 @@ static int check_nc(const request_rec *r, const digest_header_rec *resp, 
        &&!strcasecmp(conf->qop_list[0], "none")) {

        /* qop is none, client must not send a nonce count */

        if (snc != NULL) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01772)

                          "invalid nc %s received - no nonce count allowed when qop=none",

                          snc);

            return !OK;
@@ -1489,7 +1489,7 @@ static int check_nc(const request_rec *r, const digest_header_rec *resp, 


    nc = strtol(snc, &endptr, 16);

    if (endptr < (snc+strlen(snc)) && !apr_isspace(*endptr)) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01773)

                      "invalid nc %s received - not a number", snc);

        return !OK;

    }
@@ -1499,7 +1499,7 @@ static int check_nc(const request_rec *r, const digest_header_rec *resp, 
    }



    if (nc != resp->client->nonce_count) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01774)

                      "Warning, possible replay attack: nonce-count "

                      "check failed: %lu != %lu", nc,

                      resp->client->nonce_count);
@@ -1517,7 +1517,7 @@ static int check_nonce(request_rec *r, digest_header_rec *resp, 
    char tmp, hash[NONCE_HASH_LEN+1];



    if (strlen(resp->nonce) != NONCE_LEN) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01775)

                      "invalid nonce %s received - length is not %d",

                      resp->nonce, NONCE_LEN);

        note_digest_auth_failure(r, conf, resp, 1);
@@ -1532,7 +1532,7 @@ static int check_nonce(request_rec *r, digest_header_rec *resp, 
    resp->nonce_time = nonce_time.time;



    if (strcmp(hash, resp->nonce+NONCE_TIME_LEN)) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01776)

                      "invalid nonce %s received - hash is not %s",

                      resp->nonce, hash);

        note_digest_auth_failure(r, conf, resp, 1);
@@ -1541,7 +1541,7 @@ static int check_nonce(request_rec *r, digest_header_rec *resp, 


    dt = r->request_time - nonce_time.time;

    if (conf->nonce_lifetime > 0 && dt < 0) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01777)

                      "invalid nonce %s received - user attempted "

                      "time travel", resp->nonce);

        note_digest_auth_failure(r, conf, resp, 1);
@@ -1550,7 +1550,7 @@ static int check_nonce(request_rec *r, digest_header_rec *resp, 


    if (conf->nonce_lifetime > 0) {

        if (dt > conf->nonce_lifetime) {

            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0,r,

            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0,r, APLOGNO(01778)

                          "user %s: nonce expired (%.2f seconds old "

                          "- max lifetime %.2f) - sending new nonce",

                          r->user, (double)apr_time_sec(dt),
@@ -1561,7 +1561,7 @@ static int check_nonce(request_rec *r, digest_header_rec *resp, 
    }

    else if (conf->nonce_lifetime == 0 && resp->client) {

        if (memcmp(resp->client->last_nonce, resp->nonce, NONCE_LEN)) {

            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01779)

                          "user %s: one-time-nonce mismatch - sending "

                          "new nonce", r->user);

            note_digest_auth_failure(r, conf, resp, 1);
@@ -1697,7 +1697,7 @@ static int authenticate_digest_user(request_rec *r) 
    }



    if (!ap_auth_name(r)) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01780)

                      "need AuthName: %s", r->uri);

        return HTTP_INTERNAL_SERVER_ERROR;

    }
@@ -1727,12 +1727,12 @@ static int authenticate_digest_user(request_rec *r) 


    if (resp->auth_hdr_sts != VALID) {

        if (resp->auth_hdr_sts == NOT_DIGEST) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01781)

                          "client used wrong authentication scheme `%s': %s",

                          resp->scheme, r->uri);

        }

        else if (resp->auth_hdr_sts == INVALID) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01782)

                          "missing user, realm, nonce, uri, digest, "

                          "cnonce, or nonce_count in authorization header: %s",

                          r->uri);
@@ -1755,7 +1755,7 @@ static int authenticate_digest_user(request_rec *r) 


        copy_uri_components(&r_uri, resp->psd_request_uri, r);

        if (apr_uri_parse(r->pool, resp->uri, &d_uri) != APR_SUCCESS) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01783)

                          "invalid uri <%s> in Authorization header",

                          resp->uri);

            return HTTP_BAD_REQUEST;
@@ -1790,7 +1790,7 @@ static int authenticate_digest_user(request_rec *r) 
            if (apr_table_get(r->subprocess_env,

                              "AuthDigestEnableQueryStringHack")) {



                ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,

                ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01784)

                              "applying AuthDigestEnableQueryStringHack "

                              "to uri <%s>", resp->raw_request_uri);
@@ -1800,7 +1800,7 @@ static int authenticate_digest_user(request_rec *r) 


        if (r->method_number == M_CONNECT) {

            if (!r_uri.hostinfo || strcmp(resp->uri, r_uri.hostinfo)) {

                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01785)

                              "uri mismatch - <%s> does not match "

                              "request-uri <%s>", resp->uri, r_uri.hostinfo);

                return HTTP_BAD_REQUEST;
@@ -1828,7 +1828,7 @@ static int authenticate_digest_user(request_rec *r) 
                && (!d_uri.query || !r_uri.query

                    || strcmp(d_uri.query, r_uri.query)))

            ) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01786)

                          "uri mismatch - <%s> does not match "

                          "request-uri <%s>", resp->uri, resp->raw_request_uri);

            return HTTP_BAD_REQUEST;
@@ -1836,7 +1836,7 @@ static int authenticate_digest_user(request_rec *r) 
    }



    if (resp->opaque && resp->opaque_num == 0) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01787)

                      "received invalid opaque - got `%s'",

                      resp->opaque);

        note_digest_auth_failure(r, conf, resp, 0);
@@ -1844,7 +1844,7 @@ static int authenticate_digest_user(request_rec *r) 
    }



    if (strcmp(resp->realm, conf->realm)) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01788)

                      "realm mismatch - got `%s' but expected `%s'",

                      resp->realm, conf->realm);

        note_digest_auth_failure(r, conf, resp, 0);
@@ -1854,7 +1854,7 @@ static int authenticate_digest_user(request_rec *r) 
    if (resp->algorithm != NULL

        && strcasecmp(resp->algorithm, "MD5")

        && strcasecmp(resp->algorithm, "MD5-sess")) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01789)

                      "unknown algorithm `%s' received: %s",

                      resp->algorithm, r->uri);

        note_digest_auth_failure(r, conf, resp, 0);
@@ -1864,7 +1864,7 @@ static int authenticate_digest_user(request_rec *r) 
    return_code = get_hash(r, r->user, conf);



    if (return_code == AUTH_USER_NOT_FOUND) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01790)

                      "user `%s' in realm `%s' not found: %s",

                      r->user, conf->realm, r->uri);

        note_digest_auth_failure(r, conf, resp, 0);
@@ -1875,7 +1875,7 @@ static int authenticate_digest_user(request_rec *r) 
    }

    else if (return_code == AUTH_DENIED) {

        /* authentication denied in the provider before attempting a match */

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01791)

                      "user `%s' in realm `%s' denied by provider: %s",

                      r->user, conf->realm, r->uri);

        note_digest_auth_failure(r, conf, resp, 0);
@@ -1892,7 +1892,7 @@ static int authenticate_digest_user(request_rec *r) 
    if (resp->message_qop == NULL) {

        /* old (rfc-2069) style digest */

        if (strcmp(resp->digest, old_digest(r, resp, conf->ha1))) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01792)

                          "user %s: password mismatch: %s", r->user,

                          r->uri);

            note_digest_auth_failure(r, conf, resp, 0);
@@ -1912,7 +1912,7 @@ static int authenticate_digest_user(request_rec *r) 
        if (!match

            && !(conf->qop_list[0] == NULL

                 && !strcasecmp(resp->message_qop, "auth"))) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01793)

                          "invalid qop `%s' received: %s",

                          resp->message_qop, r->uri);

            note_digest_auth_failure(r, conf, resp, 0);
@@ -1925,7 +1925,7 @@ static int authenticate_digest_user(request_rec *r) 
            return HTTP_INTERNAL_SERVER_ERROR;

        }

        if (strcmp(resp->digest, exp_digest)) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01794)

                          "user %s: password mismatch: %s", r->user,

                          r->uri);

            note_digest_auth_failure(r, conf, resp, 0);
@@ -2005,7 +2005,7 @@ static int add_auth_info(request_rec *r) 
        if (resp->algorithm && !strcasecmp(resp->algorithm, "MD5-sess")) {

            ha1 = get_session_HA1(r, resp, conf, 0);

            if (!ha1) {

                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01795)

                              "internal error: couldn't find session "

                              "info for user %s", resp->username);

                return !OK;