diff --git a/apache2/apache2_config.c b/apache2/apache2_config.c index 5b0eeee8..88401165 100644 --- a/apache2/apache2_config.c +++ b/apache2/apache2_config.c @@ -1114,7 +1114,7 @@ static const char *cmd_rule_remove_by_msg(cmd_parms *cmd, void *_dcfg, const cha msre_ruleset_rule_remove_with_exception(dcfg->ruleset, re); #ifdef DEBUG_CONF - fprintf(stderr, "Added exception %x (%i %s) to dcfg %x.\n", re, re->type, re->param, dcfg); + fprintf(stderr, "Added exception %x (%d %s) to dcfg %x.\n", re, re->type, re->param, dcfg); #endif return NULL; diff --git a/apache2/apache2_io.c b/apache2/apache2_io.c index 4d098277..0e21d3f1 100644 --- a/apache2/apache2_io.c +++ b/apache2/apache2_io.c @@ -50,7 +50,7 @@ apr_status_t input_filter(ap_filter_t *f, apr_bucket_brigade *bb_out, } if (msr->txcfg->debuglog_level >= 4) { - msr_log(msr, 4, "Input filter: Forwarding input: mode=%i, block=%i, nbytes=%" APR_OFF_T_FMT + msr_log(msr, 4, "Input filter: Forwarding input: mode=%d, block=%d, nbytes=%" APR_OFF_T_FMT " (f %x, r %x).", mode, block, nbytes, f, f->r); } @@ -199,12 +199,12 @@ apr_status_t read_request_body(modsec_rec *msr, char **error_msg) { rc = apr_bucket_read(bucket, &buf, &buflen, APR_BLOCK_READ); if (rc != APR_SUCCESS) { - *error_msg = apr_psprintf(msr->mp, "Failed reading input / bucket (%i): %s", rc, get_apr_error(msr->mp, rc)); + *error_msg = apr_psprintf(msr->mp, "Failed reading input / bucket (%d): %s", rc, get_apr_error(msr->mp, rc)); return -1; } if (msr->txcfg->debuglog_level >= 9) { - msr_log(msr, 9, "Input filter: Bucket type %s contains %i bytes.", + msr_log(msr, 9, "Input filter: Bucket type %s contains %d bytes.", bucket->type->name, buflen); } @@ -390,7 +390,7 @@ static apr_status_t send_of_brigade(modsec_rec *msr, ap_filter_t *f) { } if (msr->txcfg->debuglog_level >= log_level) { - msr_log(msr, log_level, "Output filter: Error while forwarding response data (%i): %s", + msr_log(msr, log_level, "Output filter: Error while forwarding response data (%d): %s", rc, get_apr_error(msr->mp, rc)); } @@ -440,7 +440,7 @@ static int flatten_response_body(modsec_rec *msr) { rc = apr_brigade_flatten(msr->of_brigade, msr->resbody_data, &msr->resbody_length); if (rc != APR_SUCCESS) { - msr_log(msr, 1, "Output filter: Failed to flatten brigade (%i): %s", rc, + msr_log(msr, 1, "Output filter: Failed to flatten brigade (%d): %s", rc, get_apr_error(msr->mp, rc)); return -1; } @@ -583,7 +583,7 @@ apr_status_t output_filter(ap_filter_t *f, apr_bucket_brigade *bb_in) { msr->of_status = OF_STATUS_COMPLETE; msr->resbody_status = RESBODY_STATUS_ERROR; - msr_log(msr, 1, "Output filter: Failed to read bucket (rc %i): %s", + msr_log(msr, 1, "Output filter: Failed to read bucket (rc %d): %s", rc, get_apr_error(r->pool, rc)); ap_remove_output_filter(f); @@ -591,7 +591,7 @@ apr_status_t output_filter(ap_filter_t *f, apr_bucket_brigade *bb_in) { } if (msr->txcfg->debuglog_level >= 9) { - msr_log(msr, 9, "Output filter: Bucket type %s contains %i bytes.", + msr_log(msr, 9, "Output filter: Bucket type %s contains %" APR_SIZE_T_FMT " bytes.", bucket->type->name, buflen); } diff --git a/apache2/apache2_util.c b/apache2/apache2_util.c index 0b4e9aca..f890683f 100644 --- a/apache2/apache2_util.c +++ b/apache2/apache2_util.c @@ -86,7 +86,7 @@ int apache2_exec(modsec_rec *msr, const char *command, const char **argv, char * procnew = apr_pcalloc(r->pool, sizeof(*procnew)); if (procnew == NULL) { - msr_log(msr, 1, "Exec: Unable to allocate %i bytes.", sizeof(*procnew)); + msr_log(msr, 1, "Exec: Unable to allocate %d bytes.", sizeof(*procnew)); return -1; } @@ -171,17 +171,17 @@ void record_time_checkpoint(modsec_rec *msr, int checkpoint_no) { msr->time_checkpoint_3 = now; break; default : - msr_log(msr, 1, "Internal Error: Unknown checkpoint: %i", checkpoint_no); + msr_log(msr, 1, "Internal Error: Unknown checkpoint: %d", checkpoint_no); return; break; } /* Apache-specific stuff. */ apr_snprintf(note, 99, "%" APR_TIME_T_FMT, (now - msr->request_time)); - apr_snprintf(note_name, 99, "mod_security-time%i", checkpoint_no); + apr_snprintf(note_name, 99, "mod_security-time%d", checkpoint_no); apr_table_set(msr->r->notes, note_name, note); - msr_log(msr, 4, "Time #%i: %s", checkpoint_no, note); + msr_log(msr, 4, "Time #%d: %s", checkpoint_no, note); } /** @@ -240,7 +240,7 @@ void internal_log(request_rec *r, directory_config *dcfg, modsec_rec *msr, /* Construct the message. */ apr_vsnprintf(str1, sizeof(str1), text, ap); - apr_snprintf(str2, sizeof(str2), "[%s] [%s/sid#%lx][rid#%lx][%s][%i] %s\n", + apr_snprintf(str2, sizeof(str2), "[%s] [%s/sid#%lx][rid#%lx][%s][%d] %s\n", current_logtime(msr->mp), ap_get_server_name(r), (unsigned long)(r->server), (unsigned long)r, ((r->uri == NULL) ? "" : log_escape_nq(msr->mp, r->uri)), level, str1); @@ -314,15 +314,15 @@ char *format_error_log_message(apr_pool_t *mp, error_message *em) { } if (em->line > 0) { - s_line = apr_psprintf(mp, "[line %i] ", em->line); + s_line = apr_psprintf(mp, "[line %d] ", em->line); if (s_line == NULL) return NULL; } - s_level = apr_psprintf(mp, "[level %i] ", em->level); + s_level = apr_psprintf(mp, "[level %d] ", em->level); if (s_level == NULL) return NULL; if (em->status != 0) { - s_status = apr_psprintf(mp, "[status %i] ", em->status); + s_status = apr_psprintf(mp, "[status %d] ", em->status); if (s_status == NULL) return NULL; } diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c index d1d69284..4f6eeea9 100644 --- a/apache2/mod_security2.c +++ b/apache2/mod_security2.c @@ -72,7 +72,7 @@ int perform_interception(modsec_rec *msr) { } if (msr->phase > 4) { - msr_log(msr, 1, "Internal Error: Asked to intercept request in phase %i.", msr->phase); + msr_log(msr, 1, "Internal Error: Asked to intercept request in phase %d.", msr->phase); msr->was_intercepted = 0; return DECLINED; } @@ -80,7 +80,7 @@ int perform_interception(modsec_rec *msr) { /* OK, we're good to go. */ actionset = msr->intercept_actionset; - phase_text = apr_psprintf(msr->mp, " (phase %i)", msr->phase); + phase_text = apr_psprintf(msr->mp, " (phase %d)", msr->phase); /* By default we log at level 1 but we switch to 4 * if a nolog action was used or this is not the initial request @@ -91,7 +91,7 @@ int perform_interception(modsec_rec *msr) { /* Pause the request first (if configured and the initial request). */ if (actionset->intercept_pause) { msr_log(msr, (log_level > 3 ? log_level : log_level + 1), "Pausing transaction for " - "%i msec.", actionset->intercept_pause); + "%d msec.", actionset->intercept_pause); /* apr_sleep accepts microseconds */ apr_sleep((apr_interval_time_t)(actionset->intercept_pause * 1000)); } @@ -101,13 +101,13 @@ int perform_interception(modsec_rec *msr) { case ACTION_DENY : if (actionset->intercept_status != 0) { status = actionset->intercept_status; - message = apr_psprintf(msr->mp, "Access denied with code %i%s.", + message = apr_psprintf(msr->mp, "Access denied with code %d%s.", status, phase_text); } else { log_level = 1; status = HTTP_INTERNAL_SERVER_ERROR; message = apr_psprintf(msr->mp, "Access denied with code 500%s " - "(Internal Error: Invalid status code requested %i).", + "(Internal Error: Invalid status code requested %d).", phase_text, actionset->intercept_status); } break; @@ -189,7 +189,7 @@ int perform_interception(modsec_rec *msr) { status = HTTP_MOVED_TEMPORARILY; } message = apr_psprintf(msr->mp, "Access denied with redirection to %s using " - "status %i%s.", + "status %d%s.", log_escape_nq(msr->mp, actionset->intercept_uri), status, phase_text); break; @@ -204,7 +204,7 @@ int perform_interception(modsec_rec *msr) { log_level = 1; status = HTTP_INTERNAL_SERVER_ERROR; message = apr_psprintf(msr->mp, "Access denied with code 500%s " - "(Internal Error: invalid interception action %i).", + "(Internal Error: invalid interception action %d).", phase_text, actionset->intercept_action); break; } @@ -780,7 +780,7 @@ static void sec_guardian_logger(request_rec *r, request_rec *origr, modsec_rec * * The fields SESSION_ID, MODSEC_MESSAGE, and MODSEC_RATING are not used at the moment. */ - str2 = apr_psprintf(msr->mp, "%" APR_TIME_T_FMT " %" APR_TIME_T_FMT " \"%s\" %i", + str2 = apr_psprintf(msr->mp, "%" APR_TIME_T_FMT " %" APR_TIME_T_FMT " \"%s\" %d", duration, apr_time_sec(duration), log_escape(msr->mp, modsec_message), modsec_rating); if (str2 == NULL) return; @@ -801,7 +801,7 @@ static void sec_guardian_logger(request_rec *r, request_rec *origr, modsec_rec * limit = limit - strlen(str2) - 5; if (limit <= 0) { - msr_log(msr, 1, "Audit Log: Atomic PIPE write buffer too small: %i", PIPE_BUF); + msr_log(msr, 1, "Audit Log: Atomic PIPE write buffer too small: %d", PIPE_BUF); return; } diff --git a/apache2/modsecurity.c b/apache2/modsecurity.c index c6722398..bd927be9 100644 --- a/apache2/modsecurity.c +++ b/apache2/modsecurity.c @@ -323,13 +323,13 @@ static int is_response_status_relevant(modsec_rec *msr, int status) { return 0; } - apr_snprintf(buf, sizeof(buf), "%i", status); + apr_snprintf(buf, sizeof(buf), "%d", status); rc = msc_regexec(msr->txcfg->auditlog_relevant_regex, buf, strlen(buf), &my_error_msg); if (rc >= 0) return 1; if (rc == PCRE_ERROR_NOMATCH) return 0; - msr_log(msr, 1, "Regex processing failed (rc %i): %s", rc, my_error_msg); + msr_log(msr, 1, "Regex processing failed (rc %d): %s", rc, my_error_msg); return 0; } @@ -473,7 +473,7 @@ apr_status_t modsecurity_process_phase(modsec_rec *msr, int phase) { return modsecurity_process_phase_logging(msr); break; default : - msr_log(msr, 1, "Invalid processing phase: %i", msr->phase); + msr_log(msr, 1, "Invalid processing phase: %d", msr->phase); return -1; break; } diff --git a/apache2/msc_logging.c b/apache2/msc_logging.c index bcf1f1de..2b4ac634 100644 --- a/apache2/msc_logging.c +++ b/apache2/msc_logging.c @@ -78,7 +78,7 @@ char *construct_log_vcombinedus(modsec_rec *msr) { /* sessionid */ sessionid = (msr->sessionid == NULL ? "-" : msr->sessionid); - return apr_psprintf(msr->mp, "%s %s %s %s [%s] \"%s\" %i %" APR_OFF_T_FMT " \"%s\" \"%s\" %s \"%s\"", + return apr_psprintf(msr->mp, "%s %s %s %s [%s] \"%s\" %d %" APR_OFF_T_FMT " \"%s\" \"%s\" %s \"%s\"", log_escape_nq(msr->mp, msr->hostname), msr->remote_addr, log_escape_nq(msr->mp, remote_user), log_escape_nq(msr->mp, local_user), current_logtime(msr->mp), ((msr->request_line == NULL) ? "" : log_escape(msr->mp, msr->request_line)), @@ -149,7 +149,7 @@ char *construct_log_vcombinedus_limited(modsec_rec *msr, int _limit, int *was_li limit -= strlen(sessionid); /* session id */ if (limit <= 0) { - msr_log(msr, 1, "GuardianLog: Atomic pipe write size too small: %i", PIPE_BUF); + msr_log(msr, 1, "GuardianLog: Atomic pipe write size too small: %d", PIPE_BUF); return NULL; } @@ -189,21 +189,21 @@ char *construct_log_vcombinedus_limited(modsec_rec *msr, int _limit, int *was_li limit -= strlen(user_agent); if (limit <= 0) { - msr_log(msr, 1, "GuardianLog: Atomic pipe write size too small: %i.", PIPE_BUF); + msr_log(msr, 1, "GuardianLog: Atomic pipe write size too small: %d.", PIPE_BUF); return NULL; } /* use what's left for the request line */ if ((int)strlen(the_request) > limit) { the_request[limit] = '\0'; - msr_log(msr, 9, "GuardianLog: Reduced the_request to %i bytes.", limit); + msr_log(msr, 9, "GuardianLog: Reduced the_request to %d bytes.", limit); } } else { /* Yay! We have enough space! */ *was_limited = 0; } - return apr_psprintf(msr->mp, "%s %s %s %s [%s] \"%s\" %i %s \"%s\" \"%s\" %s \"%s\"", + return apr_psprintf(msr->mp, "%s %s %s %s [%s] \"%s\" %d %s \"%s\" \"%s\" %s \"%s\"", hostname, msr->remote_addr, remote_user, local_user, current_logtime(msr->mp), the_request, msr->response_status, bytes_sent, referer, user_agent, @@ -284,7 +284,7 @@ static void sanitise_request_line(modsec_rec *msr) { j = arg->value_origin_offset; while((*p != '\0')&&(j--)) p++; if (*p == '\0') { - msr_log(msr, 1, "Unable to sanitise variable \"%s\" at offset %i of QUERY_STRING" + msr_log(msr, 1, "Unable to sanitise variable \"%s\" at offset %d of QUERY_STRING" "because the request line is too short.", log_escape_ex(msr->mp, arg->name, arg->name_len), arg->value_origin_offset); @@ -297,7 +297,7 @@ static void sanitise_request_line(modsec_rec *msr) { *p++ = '*'; } if (*p == '\0') { - msr_log(msr, 1, "Unable to sanitise variable \"%s\" at offset %i (size %i) " + msr_log(msr, 1, "Unable to sanitise variable \"%s\" at offset %d (size %d) " "of QUERY_STRING because the request line is too short.", log_escape_ex(msr->mp, arg->name, arg->name_len), arg->value_origin_offset, arg->value_origin_len); @@ -418,7 +418,7 @@ void sec_audit_logger(modsec_rec *msr) { /* Format: time transaction_id remote_addr remote_port local_addr local_port */ - text = apr_psprintf(msr->mp, "[%s] %s %s %i %s %i", + text = apr_psprintf(msr->mp, "[%s] %s %s %d %s %d", current_logtime(msr->mp), msr->txid, msr->remote_addr, msr->remote_port, msr->local_addr, msr->local_port); sec_auditlog_write(msr, text, strlen(text)); @@ -635,7 +635,7 @@ void sec_audit_logger(modsec_rec *msr) { text = apr_psprintf(msr->mp, "%s %s\n", msr->response_protocol, msr->status_line); } else { - text = apr_psprintf(msr->mp, "%s %i\n", msr->response_protocol, + text = apr_psprintf(msr->mp, "%s %d\n", msr->response_protocol, msr->response_status); } sec_auditlog_write(msr, text, strlen(text)); @@ -691,7 +691,7 @@ void sec_audit_logger(modsec_rec *msr) { /* Action */ if (msr->was_intercepted) { - text = apr_psprintf(msr->mp, "Action: Intercepted (phase %i)\n", msr->intercept_phase); + text = apr_psprintf(msr->mp, "Action: Intercepted (phase %d)\n", msr->intercept_phase); sec_auditlog_write(msr, text, strlen(text)); } @@ -853,7 +853,7 @@ void sec_audit_logger(modsec_rec *msr) { /* Calculate hash of the entry. */ apr_md5_final(md5hash, &msr->new_auditlog_md5ctx); - str2 = apr_psprintf(msr->mp, "%s %i %i md5:%s", msr->new_auditlog_filename, 0, + str2 = apr_psprintf(msr->mp, "%s %d %d md5:%s", msr->new_auditlog_filename, 0, msr->new_auditlog_size, bytes2hex(msr->mp, md5hash, 16)); if (str2 == NULL) return; @@ -873,7 +873,7 @@ void sec_audit_logger(modsec_rec *msr) { limit = limit - strlen(str2) - 5; if (limit <= 0) { - msr_log(msr, 1, "Audit Log: Atomic PIPE write buffer too small: %i", PIPE_BUF); + msr_log(msr, 1, "Audit Log: Atomic PIPE write buffer too small: %d", PIPE_BUF); return; } diff --git a/apache2/msc_multipart.c b/apache2/msc_multipart.c index 199e33f0..dccc4325 100644 --- a/apache2/msc_multipart.c +++ b/apache2/msc_multipart.c @@ -219,7 +219,7 @@ static int multipart_process_part_header(modsec_rec *msr, char **error_msg) { rc = multipart_parse_content_disposition(msr, header_value); if (rc < 0) { - *error_msg = apr_psprintf(msr->mp, "Multipart: Invalid Content-Disposition header (%i): %s.", + *error_msg = apr_psprintf(msr->mp, "Multipart: Invalid Content-Disposition header (%d): %s.", rc, log_escape_nq(msr->mp, header_value)); return -1; } @@ -451,7 +451,7 @@ static int multipart_process_part_data(modsec_rec *msr, char **error_msg) { } } else { - *error_msg = apr_psprintf(msr->mp, "Multipart: unknown part type %i", msr->mpd->mpp->type); + *error_msg = apr_psprintf(msr->mp, "Multipart: unknown part type %d", msr->mpd->mpp->type); return -1; } @@ -830,7 +830,7 @@ int multipart_process_chunk(modsec_rec *msr, const char *buf, msr->mpd->flag_data_before = 1; if (msr->txcfg->debuglog_level >= 4) { - msr_log(msr, 4, "Multipart: Ignoring data after last boundary (received %i bytes)", size); + msr_log(msr, 4, "Multipart: Ignoring data after last boundary (received %d bytes)", size); } return 1; @@ -992,7 +992,7 @@ int multipart_process_chunk(modsec_rec *msr, const char *buf, */ msr->mpd->flag_error = 1; *error_msg = apr_psprintf(msr->mp, - "Multipart: Part header line over %i bytes long", + "Multipart: Part header line over %d bytes long", MULTIPART_BUF_SIZE); return -1; } @@ -1028,7 +1028,7 @@ int multipart_process_chunk(modsec_rec *msr, const char *buf, msr->mpd->flag_data_after = 1; if (msr->txcfg->debuglog_level >= 4) { - msr_log(msr, 4, "Multipart: Ignoring data after last boundary (%i bytes left)", inleft); + msr_log(msr, 4, "Multipart: Ignoring data after last boundary (%d bytes left)", inleft); } return 1; @@ -1047,7 +1047,7 @@ apr_status_t multipart_cleanup(modsec_rec *msr) { if (msr->mpd == NULL) return -1; if (msr->txcfg->debuglog_level >= 4) { - msr_log(msr, 4, "Multipart: Cleanup started (remove files %i).", msr->upload_remove_files); + msr_log(msr, 4, "Multipart: Cleanup started (remove files %d).", msr->upload_remove_files); } if (msr->upload_remove_files == 0) { diff --git a/apache2/msc_xml.c b/apache2/msc_xml.c index df1e62d5..4e31544d 100644 --- a/apache2/msc_xml.c +++ b/apache2/msc_xml.c @@ -33,7 +33,7 @@ static void xml_receive_sax_error(void *data, const char *msg, ...) { if (msr == NULL) return; - apr_snprintf(message, sizeof(message), "%s (line %i pos %i)", + apr_snprintf(message, sizeof(message), "%s (line %d pos %d)", log_escape_nq(msr->mp, msr->xml->parsing_ctx->lastError.message), msr->xml->parsing_ctx->lastError.line, msr->xml->parsing_ctx->lastError.int2); @@ -109,7 +109,7 @@ int xml_complete(modsec_rec *msr, char **error_msg) { /* Clean up everything else. */ xmlFreeParserCtxt(msr->xml->parsing_ctx); msr->xml->parsing_ctx = NULL; - msr_log(msr, 4, "XML: Parsing complete (well_formed %i).", msr->xml->well_formed); + msr_log(msr, 4, "XML: Parsing complete (well_formed %d).", msr->xml->well_formed); if (msr->xml->well_formed != 1) { *error_msg = apr_psprintf(msr->mp, "XML: Failed parsing document."); diff --git a/apache2/pdf_protect.c b/apache2/pdf_protect.c index cc64f23c..4ba611dd 100644 --- a/apache2/pdf_protect.c +++ b/apache2/pdf_protect.c @@ -74,7 +74,7 @@ static char *create_token(modsec_rec *msr) { } current_time = apr_time_sec(apr_time_now()); - time_string = apr_psprintf(msr->mp, "%i", current_time + timeout); + time_string = apr_psprintf(msr->mp, "%d", current_time + timeout); if (time_string == NULL) return NULL; hash = create_hash(msr, time_string); @@ -420,7 +420,7 @@ int pdfp_check(modsec_rec *msr) { if ((msr->r->method_number != M_GET)&&(cfg->pdfp_only_get != 0)) { if (msr->txcfg->debuglog_level >= 4) { msr_log(msr, 4, "PdfProtect: Not intercepting a GET/HEAD request " - "(method=%s/%i).", log_escape_nq(msr->mp, msr->r->method), msr->r->method_number); + "(method=%s/%d).", log_escape_nq(msr->mp, msr->r->method), msr->r->method_number); } return 0; diff --git a/apache2/persist_dbm.c b/apache2/persist_dbm.c index f5c31cef..7cacfe67 100644 --- a/apache2/persist_dbm.c +++ b/apache2/persist_dbm.c @@ -163,10 +163,10 @@ apr_table_t *collection_retrieve(modsec_rec *msr, const char *col_name, /* NOTE: No rate if there has been no time elapsed */ td = (apr_time_sec(apr_time_now()) - create_time); if (td == 0) { - var->value = apr_psprintf(msr->mp, "%i", 0); + var->value = apr_psprintf(msr->mp, "%d", 0); } else { - var->value = apr_psprintf(msr->mp, "%i", + var->value = apr_psprintf(msr->mp, "%d", (int)((60 * counter)/td)); } var->value_len = strlen(var->value); @@ -279,7 +279,7 @@ int collection_store(modsec_rec *msr, apr_table_t *col) { int timeout = atoi(var->value); var = (msc_string *)apr_table_get(col, "__expire_KEY"); if (var != NULL) { - var->value = apr_psprintf(msr->mp, "%i", (int)(apr_time_sec(apr_time_now()) + timeout)); + var->value = apr_psprintf(msr->mp, "%d", (int)(apr_time_sec(apr_time_now()) + timeout)); var->value_len = strlen(var->value); } } @@ -294,7 +294,7 @@ int collection_store(modsec_rec *msr, apr_table_t *col) { var->name_len = strlen(var->name); apr_table_setn(col, var->name, (void *)var); } - var->value = apr_psprintf(msr->mp, "%i", (int)(apr_time_sec(apr_time_now()))); + var->value = apr_psprintf(msr->mp, "%d", (int)(apr_time_sec(apr_time_now()))); var->value_len = strlen(var->value); } @@ -310,7 +310,7 @@ int collection_store(modsec_rec *msr, apr_table_t *col) { } else { counter = atoi(var->value); } - var->value = apr_psprintf(msr->mp, "%i", counter + 1); + var->value = apr_psprintf(msr->mp, "%d", counter + 1); var->value_len = strlen(var->value); } @@ -459,7 +459,7 @@ int collections_remove_stale(modsec_rec *msr, const char *col_name) { } apr_sdbm_unlock(dbm); - msr_log(msr, 9, "Found %i record(s) in file \"%s\".", keys_arr->nelts, + msr_log(msr, 9, "Found %d record(s) in file \"%s\".", keys_arr->nelts, log_escape(msr->mp, dbm_filename)); /* Now retrieve the entires one by one. */ @@ -493,7 +493,7 @@ int collections_remove_stale(modsec_rec *msr, const char *col_name) { } else { unsigned int expiry_time = atoi(var->value); - msr_log(msr, 9, "Record (name \"%s\", key \"%s\") set to expire in %i seconds.", + msr_log(msr, 9, "Record (name \"%s\", key \"%s\") set to expire in %d seconds.", log_escape(msr->mp, col_name), log_escape(msr->mp, key.dptr), expiry_time - now); diff --git a/apache2/re.c b/apache2/re.c index 421df5cc..87f2bd88 100644 --- a/apache2/re.c +++ b/apache2/re.c @@ -316,7 +316,7 @@ int msre_parse_generic(apr_pool_t *mp, const char *text, apr_table_t *vartable, continue; } - *error_msg = apr_psprintf(mp, "Unexpected character at position %i: %s", + *error_msg = apr_psprintf(mp, "Unexpected character at position %d: %s", (int)(p - text), text); return -1; } @@ -351,14 +351,14 @@ int msre_parse_generic(apr_pool_t *mp, const char *text, apr_table_t *vartable, for(;;) { if (*p == '\0') { - *error_msg = apr_psprintf(mp, "Missing closing quote at position %i: %s", + *error_msg = apr_psprintf(mp, "Missing closing quote at position %d: %s", (int)(p - text), text); free(value); return -1; } else if (*p == '\\') { if ( (*(p + 1) == '\0') || ((*(p + 1) != '\'')&&(*(p + 1) != '\\')) ) { - *error_msg = apr_psprintf(mp, "Invalid quoted pair at position %i: %s", + *error_msg = apr_psprintf(mp, "Invalid quoted pair at position %d: %s", (int)(p - text), text); free(value); return -1; @@ -654,7 +654,7 @@ apr_status_t msre_ruleset_process_phase(msre_ruleset *ruleset, modsec_rec *msr) } if (msr->txcfg->debuglog_level >= 9) { - msr_log(msr, 9, "This phase consists of %i rule(s).", arr->nelts); + msr_log(msr, 9, "This phase consists of %d rule(s).", arr->nelts); } /* Loop through the rules in the selected set. */ @@ -730,7 +730,7 @@ apr_status_t msre_ruleset_process_phase(msre_ruleset *ruleset, modsec_rec *msr) #endif if (msr->txcfg->debuglog_level >= 4) { - msr_log(msr, 4, "Rule returned %i.", rc); + msr_log(msr, 4, "Rule returned %d.", rc); } if (rc == RULE_NO_MATCH) { @@ -784,14 +784,14 @@ apr_status_t msre_ruleset_process_phase(msre_ruleset *ruleset, modsec_rec *msr) if (rule->chain_starter->actionset->skip_count > 0) { skip = rule->chain_starter->actionset->skip_count; if (msr->txcfg->debuglog_level >= 4) { - msr_log(msr, 4, "Skipping %i rules/chains (from a chain).", skip); + msr_log(msr, 4, "Skipping %d rules/chains (from a chain).", skip); } } } else if (rule->actionset->skip_count > 0) { skip = rule->actionset->skip_count; if (msr->txcfg->debuglog_level >= 4) { - msr_log(msr, 4, "Skipping %i rules/chains.", skip); + msr_log(msr, 4, "Skipping %d rules/chains.", skip); } } } @@ -801,7 +801,7 @@ apr_status_t msre_ruleset_process_phase(msre_ruleset *ruleset, modsec_rec *msr) return -1; } else { - msr_log(msr, 1, "Rule processing failed with unknown return code: %i.", rc); + msr_log(msr, 1, "Rule processing failed with unknown return code: %d.", rc); return -1; } } @@ -852,7 +852,7 @@ apr_status_t msre_ruleset_process_phase(msre_ruleset *ruleset, modsec_rec *msr) rc = msre_ruleset_process_phase_(ruleset, msr); } - msr_log(msr, 1, "Phase %i: %" APR_TIME_T_FMT " usec", msr->phase, ((apr_time_now() - time1) / 10000)); + msr_log(msr, 1, "Phase %d: %" APR_TIME_T_FMT " usec", msr->phase, ((apr_time_now() - time1) / 10000)); rules = (msre_rule **)arr->elts; for (i = 0; i < arr->nelts; i++) { @@ -1425,7 +1425,7 @@ apr_status_t msre_rule_process(msre_rule *rule, modsec_rec *msr) { if (targets[i]->is_counting) { /* Count how many there are and just add the score to the target list. */ msre_var *newvar = (msre_var *)apr_pmemdup(mptmp, targets[i], sizeof(msre_var)); - newvar->value = apr_psprintf(mptmp, "%i", list_count); + newvar->value = apr_psprintf(mptmp, "%d", list_count); newvar->value_len = strlen(newvar->value); apr_table_addn(tartab, newvar->name, (void *)newvar); } else { @@ -1583,7 +1583,7 @@ apr_status_t msre_rule_process(msre_rule *rule, modsec_rec *msr) { var->value_len = crec->val_len; } - msr_log(msr, 9, "T (%i) %s: \"%s\" [cached hits=%d]", crec->changed, crec->path, log_escape_nq_ex(mptmp, var->value, var->value_len), crec->hits); + msr_log(msr, 9, "T (%d) %s: \"%s\" [cached hits=%d]", crec->changed, crec->path, log_escape_nq_ex(mptmp, var->value, var->value_len), crec->hits); rc = execute_operator(var, rule, msr, acting_actionset, mptmp); @@ -1682,7 +1682,7 @@ apr_status_t msre_rule_process(msre_rule *rule, modsec_rec *msr) { var->value_len = crec->val_len; } - msr_log(msr, 9, "T (%i) %s: \"%s\" [cached hits=%i]", crec->changed, metadata->name, log_escape_nq_ex(mptmp, var->value, var->value_len), crec->hits); + msr_log(msr, 9, "T (%d) %s: \"%s\" [cached hits=%d]", crec->changed, metadata->name, log_escape_nq_ex(mptmp, var->value, var->value_len), crec->hits); continue; } } @@ -1715,7 +1715,7 @@ apr_status_t msre_rule_process(msre_rule *rule, modsec_rec *msr) { } if (msr->txcfg->debuglog_level >= 9) { - msr_log(msr, 9, "T (%i) %s: \"%s\"", rc, metadata->name, + msr_log(msr, 9, "T (%d) %s: \"%s\"", rc, metadata->name, log_escape_nq_ex(mptmp, var->value, var->value_len)); } } diff --git a/apache2/re_actions.c b/apache2/re_actions.c index 1c5f65ce..3530779c 100644 --- a/apache2/re_actions.c +++ b/apache2/re_actions.c @@ -605,7 +605,7 @@ static apr_status_t msre_action_ctl_execute(modsec_rec *msr, apr_pool_t *mptmp, if (pv == -1) return -1; msr->txcfg->reqbody_access = pv; msr->usercfg->reqbody_access = pv; - msr_log(msr, 4, "Ctl: Set requestBodyAccess to %i.", pv); + msr_log(msr, 4, "Ctl: Set requestBodyAccess to %d.", pv); return 1; } else @@ -621,7 +621,7 @@ static apr_status_t msre_action_ctl_execute(modsec_rec *msr, apr_pool_t *mptmp, if (pv == -1) return -1; msr->txcfg->resbody_access = pv; msr->usercfg->resbody_access = pv; - msr_log(msr, 4, "Ctl: Set responseBodyAccess to %i.", pv); + msr_log(msr, 4, "Ctl: Set responseBodyAccess to %d.", pv); return 1; } else @@ -641,7 +641,7 @@ static apr_status_t msre_action_ctl_execute(modsec_rec *msr, apr_pool_t *mptmp, msr->usercfg->auditlog_flag = AUDITLOG_RELEVANT; } - msr_log(msr, 4, "Ctl: Set auditEngine to %i.", msr->txcfg->auditlog_flag); // TODO + msr_log(msr, 4, "Ctl: Set auditEngine to %d.", msr->txcfg->auditlog_flag); // TODO return 1; } else @@ -684,7 +684,7 @@ static apr_status_t msre_action_ctl_execute(modsec_rec *msr, apr_pool_t *mptmp, if (strcmp(name, "debugLogLevel") == 0) { msr->txcfg->debuglog_level = atoi(value); msr->usercfg->debuglog_level = atoi(value); - msr_log(msr, 4, "Ctl: Set debugLogLevel to %i.", msr->txcfg->debuglog_level); + msr_log(msr, 4, "Ctl: Set debugLogLevel to %d.", msr->txcfg->debuglog_level); return 1; } else @@ -969,7 +969,7 @@ static apr_status_t msre_action_setvar_execute(modsec_rec *msr, apr_pool_t *mptm if (value < 0) value = 0; /* Counters never go below zero. */ /* Put the variable back. */ - var->value = apr_psprintf(msr->mp, "%i", value); + var->value = apr_psprintf(msr->mp, "%d", value); var->value_len = strlen(var->value); apr_table_setn(target_col, var->name, (void *)var); @@ -1056,7 +1056,7 @@ static apr_status_t msre_action_expirevar_execute(modsec_rec *msr, apr_pool_t *m var = (msc_string *)apr_pcalloc(msr->mp, sizeof(msc_string)); var->name = apr_psprintf(msr->mp, "__expire_%s", var_name); var->name_len = strlen(var->name); - var->value = apr_psprintf(msr->mp, "%i", (int)(apr_time_sec(msr->request_time) + var->value = apr_psprintf(msr->mp, "%d", (int)(apr_time_sec(msr->request_time) + atoi(var_value))); var->value_len = strlen(var->value); apr_table_setn(target_col, var->name, (void *)var); @@ -1152,17 +1152,17 @@ static apr_status_t msre_action_deprecatevar_execute(modsec_rec *msr, apr_pool_t /* Only change the value if it differs. */ if (new_value != current_value) { - var->value = apr_psprintf(msr->mp, "%i", (int)new_value); + var->value = apr_psprintf(msr->mp, "%d", (int)new_value); var->value_len = strlen(var->value); - msr_log(msr, 4, "Deprecated variable \"%s.%s\" from %li to %li (%i seconds since " + msr_log(msr, 4, "Deprecated variable \"%s.%s\" from %li to %li (%d seconds since " "last update).", log_escape(msr->mp, col_name), log_escape(msr->mp, var_name), current_value, new_value, current_time - last_update_time); apr_table_set(msr->collections_dirty, col_name, "1"); } else { msr_log(msr, 9, "Not deprecating variable \"%s.%s\" because the new value (%li) is " - "the same as the old one (%li) (%i seconds since last update).", + "the same as the old one (%li) (%d seconds since last update).", log_escape(msr->mp, col_name), log_escape(msr->mp, var_name), current_value, new_value, current_time - last_update_time); } @@ -1201,7 +1201,7 @@ static apr_status_t init_collection(modsec_rec *msr, const char *real_col_name, var = (msc_string *)apr_pcalloc(msr->mp, sizeof(msc_string)); var->name = "__expire_KEY"; var->name_len = strlen(var->name); - var->value = apr_psprintf(msr->mp, "%i", (int)(apr_time_sec(msr->request_time) + 3600)); + var->value = apr_psprintf(msr->mp, "%d", (int)(apr_time_sec(msr->request_time) + 3600)); var->value_len = strlen(var->value); apr_table_setn(table, var->name, (void *)var); @@ -1217,7 +1217,7 @@ static apr_status_t init_collection(modsec_rec *msr, const char *real_col_name, var = apr_pcalloc(msr->mp, sizeof(msc_string)); var->name = "TIMEOUT"; var->name_len = strlen(var->name); - var->value = apr_psprintf(msr->mp, "%i", 3600); + var->value = apr_psprintf(msr->mp, "%d", 3600); var->value_len = strlen(var->value); apr_table_setn(table, var->name, (void *)var); @@ -1249,7 +1249,7 @@ static apr_status_t init_collection(modsec_rec *msr, const char *real_col_name, var = apr_pcalloc(msr->mp, sizeof(msc_string)); var->name = "CREATE_TIME"; var->name_len = strlen(var->name); - var->value = apr_psprintf(msr->mp, "%i", (int)apr_time_sec(msr->request_time)); + var->value = apr_psprintf(msr->mp, "%d", (int)apr_time_sec(msr->request_time)); var->value_len = strlen(var->value); apr_table_setn(table, var->name, (void *)var); diff --git a/apache2/re_operators.c b/apache2/re_operators.c index 1a10d7a6..5515172b 100644 --- a/apache2/re_operators.c +++ b/apache2/re_operators.c @@ -67,7 +67,7 @@ static int msre_op_rx_param_init(msre_rule *rule, char **error_msg) { /* Compile pattern */ regex = msc_pregcomp(rule->ruleset->mp, pattern, PCRE_DOTALL | PCRE_DOLLAR_ENDONLY, &errptr, &erroffset); if (regex == NULL) { - *error_msg = apr_psprintf(rule->ruleset->mp, "Error compiling pattern (pos %i): %s", + *error_msg = apr_psprintf(rule->ruleset->mp, "Error compiling pattern (pos %d): %s", erroffset, errptr); return 0; } @@ -135,14 +135,14 @@ static int msre_op_rx_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, c for(i = 0; i < rc; i++) { msc_string *s = (msc_string *)apr_pcalloc(msr->mp, sizeof(msc_string)); if (s == NULL) return -1; - s->name = apr_psprintf(msr->mp, "%i", i); + s->name = apr_psprintf(msr->mp, "%d", i); s->value = apr_pstrmemdup(msr->mp, target + ovector[2*i], ovector[2*i + 1] - ovector[2*i]); s->value_len = (ovector[2*i + 1] - ovector[2*i]); if ((s->name == NULL)||(s->value == NULL)) return -1; apr_table_setn(msr->tx_vars, s->name, (void *)s); if (msr->txcfg->debuglog_level >= 9) { - msr_log(msr, 9, "Adding regex subexpression to TXVARS (%i): %s", i, + msr_log(msr, 9, "Adding regex subexpression to TXVARS (%d): %s", i, log_escape_nq_ex(msr->mp, s->value, s->value_len)); } } @@ -150,7 +150,7 @@ static int msre_op_rx_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, c /* Unset the remaining ones (from previous invocations). */ for(i = rc; i <= 9; i++) { char buf[24]; - apr_snprintf(buf, sizeof(buf), "%i", i); + apr_snprintf(buf, sizeof(buf), "%d", i); apr_table_unset(msr->tx_vars, buf); } } @@ -352,7 +352,7 @@ static int msre_op_pm_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, c /* Unset the remaining ones (from previous invocations). */ for(i = rc; i <= 9; i++) { char buf[2]; - apr_snprintf(buf, sizeof(buf), "%i", i); + apr_snprintf(buf, sizeof(buf), "%d", i); apr_table_unset(msr->tx_vars, buf); } } @@ -941,7 +941,7 @@ static int msre_op_rbl_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, /* Construct the host name we want to resolve. */ if (sscanf(target, "%d.%d.%d.%d", &h0, &h1, &h2, &h3) == 4) { /* IPv4 address */ - name_to_check = apr_psprintf(msr->mp, "%i.%i.%i.%i.%s", h3, h2, h1, h0, rule->op_param); + name_to_check = apr_psprintf(msr->mp, "%d.%d.%d.%d.%s", h3, h2, h1, h0, rule->op_param); } else { /* Assume the input is a domain name. */ name_to_check = apr_psprintf(msr->mp, "%s.%s", target, rule->op_param); @@ -1032,7 +1032,7 @@ static int msre_op_validateByteRange_init(msre_rule *rule, char **error_msg) { /* Single value. */ int x = atoi(p); if ((x < 0)||(x > 255)) { - *error_msg = apr_psprintf(rule->ruleset->mp, "Invalid range value: %i", x); + *error_msg = apr_psprintf(rule->ruleset->mp, "Invalid range value: %d", x); return 0; } table[x>>3] = (table[x>>3] | (1 << (x & 0x7))); @@ -1042,16 +1042,16 @@ static int msre_op_validateByteRange_init(msre_rule *rule, char **error_msg) { int end = atoi(s + 1); if ((start < 0)||(start > 255)) { - *error_msg = apr_psprintf(rule->ruleset->mp, "Invalid range start value: %i", + *error_msg = apr_psprintf(rule->ruleset->mp, "Invalid range start value: %d", start); return 0; } if ((end < 0)||(end > 255)) { - *error_msg = apr_psprintf(rule->ruleset->mp, "Invalid range end value: %i", end); + *error_msg = apr_psprintf(rule->ruleset->mp, "Invalid range end value: %d", end); return 0; } if (start > end) { - *error_msg = apr_psprintf(rule->ruleset->mp, "Invalid range: %i-%i", start, end); + *error_msg = apr_psprintf(rule->ruleset->mp, "Invalid range: %d-%d", start, end); return 0; } @@ -1089,7 +1089,7 @@ static int msre_op_validateByteRange_execute(modsec_rec *msr, msre_rule *rule, m int x = ((unsigned char *)var->value)[i]; if (!(table[x >> 3] & (1 << (x & 0x7)))) { if (msr->txcfg->debuglog_level >= 9) { - msr_log(msr, 9, "Value %i in %s outside range: %s", x, var->name, rule->op_param); + msr_log(msr, 9, "Value %d in %s outside range: %s", x, var->name, rule->op_param); } count++; } @@ -1097,7 +1097,7 @@ static int msre_op_validateByteRange_execute(modsec_rec *msr, msre_rule *rule, m if (count == 0) return 0; /* Valid - no match. */ - *error_msg = apr_psprintf(msr->mp, "Found %i byte(s) in %s outside range: %s.", + *error_msg = apr_psprintf(msr->mp, "Found %d byte(s) in %s outside range: %s.", count, var->name, rule->op_param); return 1; /* Invalid - match.*/ @@ -1161,7 +1161,7 @@ static int msre_op_validateUrlEncoding_execute(modsec_rec *msr, msre_rule *rule, break; case -1 : default : - *error_msg = apr_psprintf(msr->mp, "Invalid URL Encoding: Internal Error (rc = %i)", rc); + *error_msg = apr_psprintf(msr->mp, "Invalid URL Encoding: Internal Error (rc = %d)", rc); return -1; break; @@ -1330,7 +1330,7 @@ static int msre_op_eq_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, return 0; } else { - *error_msg = apr_psprintf(msr->mp, "Operator EQ match: %i.", right); + *error_msg = apr_psprintf(msr->mp, "Operator EQ match: %d.", right); /* Match. */ return 1; } @@ -1359,7 +1359,7 @@ static int msre_op_gt_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, return 0; } else { - *error_msg = apr_psprintf(msr->mp, "Operator GT match: %i.", right); + *error_msg = apr_psprintf(msr->mp, "Operator GT match: %d.", right); /* Match. */ return 1; } @@ -1388,7 +1388,7 @@ static int msre_op_lt_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, return 0; } else { - *error_msg = apr_psprintf(msr->mp, "Operator LT match: %i.", right); + *error_msg = apr_psprintf(msr->mp, "Operator LT match: %d.", right); /* Match. */ return 1; } @@ -1417,7 +1417,7 @@ static int msre_op_ge_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, return 0; } else { - *error_msg = apr_psprintf(msr->mp, "Operator GE match: %i.", right); + *error_msg = apr_psprintf(msr->mp, "Operator GE match: %d.", right); /* Match. */ return 1; } @@ -1446,7 +1446,7 @@ static int msre_op_le_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, return 0; } else { - *error_msg = apr_psprintf(msr->mp, "Operator LE match: %i.", right); + *error_msg = apr_psprintf(msr->mp, "Operator LE match: %d.", right); /* Match. */ return 1; } diff --git a/apache2/re_variables.c b/apache2/re_variables.c index 6ba6cbe8..319ce69b 100644 --- a/apache2/re_variables.c +++ b/apache2/re_variables.c @@ -69,7 +69,7 @@ static char *var_generic_list_validate(msre_ruleset *ruleset, msre_var *var) { regex = msc_pregcomp(ruleset->mp, pattern, PCRE_DOTALL | PCRE_CASELESS | PCRE_DOLLAR_ENDONLY, &errptr, &erroffset); if (regex == NULL) { - return apr_psprintf(ruleset->mp, "Error compiling pattern (pos %i): %s", + return apr_psprintf(ruleset->mp, "Error compiling pattern (pos %d): %s", erroffset, errptr); } @@ -404,7 +404,7 @@ static int var_rule_generate(modsec_rec *msr, msre_var *var, msre_rule *rule, return var_simple_generate(var, vartab, mptmp, actionset->rev); } else if ((strcasecmp(var->param, "severity") == 0)&&(actionset->severity != -1)) { - char *value = apr_psprintf(mptmp, "%i", actionset->severity); + char *value = apr_psprintf(mptmp, "%d", actionset->severity); return var_simple_generate(var, vartab, mptmp, value); } else if ((strcasecmp(var->param, "msg") == 0)&&(actionset->msg != NULL)) { @@ -486,7 +486,7 @@ static int var_reqbody_processor_error_generate(modsec_rec *msr, msre_var *var, { msre_var *rvar = apr_pmemdup(mptmp, var, sizeof(msre_var)); - rvar->value = apr_psprintf(mptmp, "%i", msr->msc_reqbody_error); + rvar->value = apr_psprintf(mptmp, "%d", msr->msc_reqbody_error); rvar->value_len = strlen(rvar->value); apr_table_addn(vartab, rvar->name, (void *)rvar); @@ -681,7 +681,7 @@ static int var_remote_host_generate(modsec_rec *msr, msre_var *var, msre_rule *r static int var_remote_port_generate(modsec_rec *msr, msre_var *var, msre_rule *rule, apr_table_t *vartab, apr_pool_t *mptmp) { - char *value = apr_psprintf(mptmp, "%i", msr->remote_port); + char *value = apr_psprintf(mptmp, "%d", msr->remote_port); return var_simple_generate(var, vartab, mptmp, value); } @@ -1539,7 +1539,7 @@ static int var_time_epoch_generate(modsec_rec *msr, msre_var *var, msre_rule *ru tc = time(NULL); tm = localtime(&tc); rvar = apr_pmemdup(mptmp, var, sizeof(msre_var)); - rvar->value = apr_psprintf(mptmp, "%i", (int)tc); + rvar->value = apr_psprintf(mptmp, "%d", (int)tc); rvar->value_len = strlen(rvar->value); apr_table_addn(vartab, rvar->name, (void *)rvar); @@ -1800,7 +1800,7 @@ static int var_server_name_generate(modsec_rec *msr, msre_var *var, msre_rule *r static int var_server_port_generate(modsec_rec *msr, msre_var *var, msre_rule *rule, apr_table_t *vartab, apr_pool_t *mptmp) { - char *value = apr_psprintf(mptmp, "%i", msr->local_port); + char *value = apr_psprintf(mptmp, "%d", msr->local_port); return var_simple_generate(var, vartab, mptmp, value); } @@ -2015,7 +2015,7 @@ static int var_response_protocol_generate(modsec_rec *msr, msre_var *var, msre_r static int var_response_status_generate(modsec_rec *msr, msre_var *var, msre_rule *rule, apr_table_t *vartab, apr_pool_t *mptmp) { - const char *value = apr_psprintf(mptmp, "%i", msr->response_status); + const char *value = apr_psprintf(mptmp, "%d", msr->response_status); return var_simple_generate(var, vartab, mptmp, value); }