Modes: Colorize warnings and/or use _ONCE macros

Author: magnumripper

src/external.c

@@ -283,8 +283,8 @@ void ext_init(char *mode, struct db_main *db)
 	    (ext_flags & (EXT_USES_GENERATE | EXT_USES_FILTER)) ==
 	    EXT_USES_FILTER && f_generate)
 	if (john_main_process)
-		fprintf(stderr, "Warning: external mode defines generate(), "
-		    "but is only used for filter()\n");
+		fprintf_color(color_warning, stderr,
+		              "Warning: external mode defines generate(), but is only used for filter()\n");
 
 	ext_mode = mode;
 }

src/inc.c

@@ -531,9 +531,10 @@ void do_incremental_crack(struct db_main *db, const char *mode)
 		log_event("! MaxLen = %d is too large%s, reduced", max_length,
 		    options.force_maxlength ? "" : " for this hash type");
 		if (john_main_process && !options.force_maxlength)
-			fprintf(stderr, "Warning: MaxLen = %d is too large "
-			    "for the current hash type, reduced to %d\n",
-			    max_length, our_fmt_len);
+			fprintf_color(color_warning, stderr,
+			              "Warning: MaxLen = %d is too large "
+			              "for the current hash type, reduced to %d\n",
+			              max_length, our_fmt_len);
 		max_length = our_fmt_len;
 	}
 
@@ -714,8 +715,9 @@ void do_incremental_crack(struct db_main *db, const char *mode)
 
 		if ((unsigned int)max_count > real_count) {
 			log_event("! Only %u characters available", real_count);
-			fprintf(stderr, "Warning: only %u characters available\n",
-			        real_count);
+			fprintf_color(color_warning, stderr,
+			              "Warning: only %u characters available\n",
+			              real_count);
 		}
 	}
 
@@ -728,18 +730,20 @@ void do_incremental_crack(struct db_main *db, const char *mode)
 		log_event("! Mixed-case charset, "
 		    "but the hash type is case-insensitive");
 		if (john_main_process)
-			fprintf(stderr, "Warning: mixed-case charset, "
-			    "but the current hash type is case-insensitive;\n"
-			    "some candidate passwords may be unnecessarily "
-			    "tried more than once.\n");
+			fprintf_color(color_warning, stderr,
+			              "Warning: mixed-case charset, "
+			              "but the current hash type is case-insensitive;\n"
+			              "some candidate passwords may be unnecessarily "
+			              "tried more than once.\n");
 	}
 
 	if (!(db->format->params.flags & FMT_8_BIT) && has_8bit(allchars)) {
 		log_event("! 8-bit charset, but the hash type is 7-bit");
 		if (john_main_process)
-			fprintf(stderr, "Warning: 8-bit charset, but the current"
-			    " hash type is 7-bit;\n"
-			    "some candidate passwords may be redundant.\n");
+			fprintf_color(color_warning, stderr,
+			              "Warning: 8-bit charset, but the current"
+			              " hash type is 7-bit;\n"
+			              "some candidate passwords may be redundant.\n");
 	}
 
 	char2 = NULL;

src/mask.c

@@ -97,7 +97,6 @@ uint64_t mask_parent_keys;
  */
 static char* parse_hex(char *string)
 {
-	static int warned;
 	unsigned char *s = (unsigned char*)string;
 	unsigned char *d = s;
 
@@ -111,8 +110,8 @@ static char* parse_hex(char *string)
 	} else if (*s == '\\' && s[1] == 'x' &&
 	    atoi16[s[2]] != 0x7f && atoi16[s[3]] != 0x7f) {
 		char c = (atoi16[s[2]] << 4) + atoi16[s[3]];
-		if (!c && !warned++ && john_main_process)
-			fprintf(stderr, "Warning: \\x00 in mask terminates the string\n");
+		if (!c && john_main_process)
+			WARN_ONCE(color_warning, stderr, "Warning: \\x00 in mask terminates the string\n");
 		if (strchr("\\[]?-", c))
 			*d++ = '\\';
 		*d++ = c;
@@ -157,13 +156,8 @@ static char* expand_cplhdr(char *string, int *conv_err)
 			int pidx = s[1] - '1';
 			char *cs = options.custom_mask[pidx];
 
-			if (conv_err[pidx]) {
-				if (john_main_process)
-					fprintf(stderr,
-					        "Error: Selected internal codepage can't hold all chars of mask placeholder ?%d\n",
-					        pidx + 1);
-				error();
-			}
+			if (conv_err[pidx])
+				error_msg("Error: Selected internal codepage can't hold all chars of mask placeholder ?%d\n", pidx + 1);
 			if (*cs == 0) {
 				if (john_main_process)
 					fprintf(stderr, "Error: Custom mask placeholder ?%d not defined\n", pidx + 1);
@@ -2425,7 +2419,7 @@ static void finalize_mask(int len)
 		}
 	} else {
 		if (mask_num_qw && john_main_process)
-			fprintf(stderr, "Warning: ?w has no special meaning unless running hybrid mask\n");
+			fprintf_color(color_warning, stderr, "Warning: ?w has no special meaning unless running hybrid mask\n");
 		if (mask_add_len > len)
 			mask_add_len = len;
 	}
@@ -2436,12 +2430,12 @@ static void finalize_mask(int len)
 		format_cannot_reset = 0;
 		if (john_main_process) {
 			fprintf(stderr, "Note: Disabling internal mask due to stacked rules\n");
-			log_event("- Disabling internal mask due to stacked rules");
+			LOG_ONCE("- Disabling internal mask due to stacked rules");
 		}
 	}
 #if defined(HAVE_OPENCL) || defined(HAVE_ZTEX)
 	else if ((mask_fmt->params.flags & FMT_MASK) && options.req_int_cand_target > 0) {
-		log_event("- Overriding format's target internal mask factor of %d with user requested %d",
+		LOG_ONCE("- Overriding format's target internal mask factor of %d with user requested %d",
 		          mask_int_cand_target, options.req_int_cand_target);
 		mask_int_cand_target = options.req_int_cand_target;
 	}
@@ -2514,9 +2508,14 @@ static void finalize_mask(int len)
 	mask_tot_cand = cand * mask_int_cand.num_int_cand;
 
 	if ((john_main_process || !cfg_get_bool(SECTION_OPTIONS, SUBSECTION_MPI, "MPIAllGPUsSame", 0)) &&
-		mask_int_cand.num_int_cand > 1)
-		log_event("- Requested internal mask factor: %d, actual now %d",
-		          mask_int_cand_target, mask_int_cand.num_int_cand);
+	    mask_int_cand.num_int_cand > 1) {
+		static int old_factor = -1;
+		if (mask_int_cand.num_int_cand != old_factor) {
+			log_event("- Requested internal mask factor: %d, actual now %d",
+			          mask_int_cand_target, mask_int_cand.num_int_cand);
+			old_factor = mask_int_cand.num_int_cand;
+		}
+	}
 }
 
 void mask_crk_init(struct db_main *db)
@@ -2633,6 +2632,7 @@ int do_mask_crack(const char *extern_key)
 			}
 
 			mask_cur_len = i;
+			log_event("- Mask length now %u", mask_cur_len);
 
 			if (format_cannot_reset)
 				save_restore(&cpu_mask_ctx, 0, RESTORE);

src/mkv.c

@@ -391,22 +391,15 @@ void get_markov_options(struct db_main *db,
 
 		dummy_token = strtokm(NULL, ":");
 		if (dummy_token) {
-			if (john_main_process)
-				fprintf(stderr,
-				        "Too many markov parameters specified:"
-				        " %s\n", dummy_token);
-			error();
+			error_msg("Too many markov parameters specified: %s\n", dummy_token);
 		}
 	}
 
 	if (mode == NULL)
 		mode = SUBSECTION_DEFAULT;
 
 	if (cfg_get_section(SECTION_MARKOV, mode) == NULL) {
-		if (john_main_process)
-			fprintf(stderr,
-			        "Section [" SECTION_MARKOV "%s] not found\n", mode);
-		error();
+		error_msg("Section [" SECTION_MARKOV "%s] not found\n", mode);
 	}
 
 	if (options.mkv_stats == NULL)
@@ -415,22 +408,16 @@ void get_markov_options(struct db_main *db,
 		*statfile = options.mkv_stats;
 
 	if (*statfile == NULL) {
-		log_event("Statsfile not defined");
-		if (john_main_process)
-			fprintf(stderr,
-			        "Statsfile not defined in section ["
-			        SECTION_MARKOV "%s]\n", mode);
-		error();
+		error_msg("Statsfile not defined in section ["
+		          SECTION_MARKOV "%s]\n", mode);
 	}
 	/* treat 'empty' level token same as NULL, i.e. pull in from config */
 	if (NULL != lvl_token && !strlen(lvl_token))
 		lvl_token = 0;
 	if (lvl_token != NULL) {
 		if (sscanf(lvl_token, "%d-%d", &minlevel, &level) != 2) {
 			if (sscanf(lvl_token, "%d", &level) != 1) {
-				if (john_main_process)
-					fprintf(stderr, "Could not parse markov" " level\n");
-				error();
+				error_msg("Could not parse markov level\n");
 			}
 			if (level == 0)
 				/* get min. and max. level from markov section */
@@ -452,19 +439,13 @@ void get_markov_options(struct db_main *db,
 
 	if (level <= 0)
 		if ((level = cfg_get_int(SECTION_MARKOV, mode, "MkvLvl")) == -1) {
-			log_event("no markov level defined!");
-			if (john_main_process)
-				fprintf(stderr,
-				        "no markov level defined in section ["
-				        SECTION_MARKOV "%s]\n", mode);
-			error();
+			error_msg("no markov level defined in section ["
+			          SECTION_MARKOV "%s]\n", mode);
 		}
 
 	if (level > MAX_MKV_LVL) {
-		log_event("! Level = %d is too large (max=%d)", level, MAX_MKV_LVL);
 		if (john_main_process)
-			fprintf(stderr, "Warning: Level = %d is too large "
-			        "(max = %d)\n", level, MAX_MKV_LVL);
+			WARN_AND_LOG(color_warning, stderr, "! Level = %d is too large (max=%d)", level, MAX_MKV_LVL);
 		level = MAX_MKV_LVL;
 	}
 
@@ -474,8 +455,8 @@ void get_markov_options(struct db_main *db,
 
 	if (level < minlevel) {
 		if (john_main_process)
-			fprintf(stderr, "Warning: max level(%d) < min level(%d)"
-			        ", min level set to %d\n", level, minlevel, level);
+			fprintf_color(color_warning, stderr, "Warning: max level(%d) < min level(%d), min level set to %d\n",
+			              level, minlevel, level);
 		minlevel = level;
 	}
 
@@ -491,12 +472,8 @@ void get_markov_options(struct db_main *db,
 
 	if (maxlen <= 0) {
 		if ((maxlen = cfg_get_int(SECTION_MARKOV, mode, "MkvMaxLen")) == -1) {
-			log_event("no markov max length defined!");
-			if (john_main_process)
-				fprintf(stderr,
-				        "no markov max length defined in "
-				        "section [" SECTION_MARKOV "%s]\n", mode);
-			error();
+			error_msg("no markov max length defined in "
+			          "section [" SECTION_MARKOV "%s]\n", mode);
 		} else {
 			maxlen -= mask_add_len;
 			if (mask_num_qw > 1)
@@ -505,17 +482,16 @@ void get_markov_options(struct db_main *db,
 	}
 
 	if (our_fmt_len <= MAX_MKV_LEN && maxlen > our_fmt_len) {
-		log_event("! MaxLen = %d is too large for this hash type", maxlen);
 		if (john_main_process)
-			fprintf(stderr, "Warning: "
-			        "MaxLen = %d is too large for the current hash"
-			        " type, reduced to %d\n", maxlen, our_fmt_len);
+			WARN_AND_LOG(color_warning, stderr,
+			              "Warning: MaxLen = %d is too large for the current hash"
+			              " type, reduced to %d", maxlen, our_fmt_len);
 		maxlen = our_fmt_len;
 	} else if (maxlen > MAX_MKV_LEN) {
-		log_event("! MaxLen = %d is too large (max=%d)", maxlen, MAX_MKV_LEN);
 		if (john_main_process)
-			fprintf(stderr, "Warning: Maxlen = %d is too large (max"
-			        " = %d)\n", maxlen, MAX_MKV_LEN);
+			WARN_AND_LOG(color_warning, stderr,
+			              "Warning: Maxlen = %d is too large (max = %d)",
+			              maxlen, MAX_MKV_LEN);
 		maxlen = MAX_MKV_LEN;
 	}
 
@@ -531,9 +507,9 @@ void get_markov_options(struct db_main *db,
 
 	if (minlen > maxlen) {
 		if (john_main_process)
-			fprintf(stderr, "Warning: minimum length(%d) > maximum"
-			        " length(%d), minimum length set to %d\n",
-			        minlen, maxlen, maxlen);
+			fprintf_color(color_warning, stderr,
+			              "Warning: minimum length(%d) > maximum length(%d), minimum length set to %d\n",
+			              minlen, maxlen, maxlen);
 		minlen = maxlen;
 	}
 
@@ -568,9 +544,7 @@ void get_markov_start_end(char *start_token, char *end_token,
 		}
 		/* NOTE, end_token can be an empty string. Treat "" and mkv_max as equal */
 		else if (end_token != NULL && *end_token) {
-			if (john_main_process)
-				fprintf(stderr, "invalid end: %s\n", end_token);
-			error();
+			error_msg("invalid end: %s\n", end_token);
 		}
 	}
 	/*
@@ -584,64 +558,52 @@ void get_markov_start_end(char *start_token, char *end_token,
 	 */
 	/* NOTE, start_token can be an empty string. Treat "" and "0" equal */
 	else if (start_token != NULL && *start_token) {
-		if (john_main_process)
-			fprintf(stderr, "invalid start: %s\n", start_token);
-		error();
+		error_msg("invalid start: %s\n", start_token);
 	}
 
 	if (start_token != NULL && strlen(start_token) &&
 	        start_token[strlen(start_token) - 1] == '%') {
 		if (*mkv_start >= 100) {
-			log_event("! Start = %s is too large (max < 100%%)", end_token);
-			if (john_main_process)
-				fprintf(stderr, "Error: Start = %s is too large"
-				        " (max < 100%%)\n", start_token);
-			exit(1);
+			error_msg("Error: Start = %s is too large (max < 100%%)\n", start_token);
 		} else if (*mkv_start > 0) {
 			*mkv_start *= mkv_max / 100;
-			log_event("- Start: %s converted to %" PRId64, start_token,
-			          *mkv_start);
 			if (john_main_process)
-				fprintf(stderr, "Start: %s converted to %" PRId64
-				        "\n", start_token, *mkv_start);
+				WARN_AND_LOG(color_warning, stderr,
+				             "Start: %s converted to %" PRId64,
+				             start_token, *mkv_start);
 		}
 	}
 	if (end_token != NULL && strlen(end_token) &&
 	        end_token[strlen(end_token) - 1] == '%') {
 		if (*mkv_end >= 100) {
 			if (*mkv_end > 100) {
 				if (john_main_process)
-					fprintf(stderr, "Warning: End = %s is "
-					        "too large (max = 100%%)\n", end_token);
+					fprintf_color(color_warning, stderr,
+					              "Warning: End = %s is too large (max = 100%%)\n",
+					              end_token);
 			}
 			*mkv_end = 0;
 		} else if (*mkv_end > 0) {
 			*mkv_end *= mkv_max / 100;
-			log_event("- End: %s converted to %" PRId64 "", end_token, *mkv_end);
 			if (john_main_process)
-				fprintf(stderr, "End: %s converted to %" PRId64
-				        "\n", end_token, *mkv_end);
+				WARN_AND_LOG(color_warning, stderr,
+				             "End: %s converted to %" PRId64, end_token, *mkv_end);
 		}
 	}
 	if (*mkv_end == 0)
 		*mkv_end = mkv_max;
 
 	if (*mkv_end > mkv_max) {
-		log_event("! End = %" PRId64 " is too large (max=%" PRId64 ")", *mkv_end,
-		          mkv_max);
 		if (john_main_process)
-			fprintf(stderr, "Warning: End = %" PRId64 " is too large "
-			        "(max = %" PRId64 ")\n", *mkv_end, mkv_max);
+			WARN_AND_LOG(color_warning, stderr,
+			             "Warning: End = %" PRId64 " is too large (max = %" PRId64 ")",
+			             *mkv_end, mkv_max);
 		*mkv_end = mkv_max;
 	}
 
 	if (*mkv_start > *mkv_end) {
-		log_event("! MKV start > end (%" PRId64 " > %" PRId64 ")", *mkv_start,
-		          *mkv_end);
-		if (john_main_process)
-			fprintf(stderr, "Error: MKV start > end (%" PRId64 " > %" PRId64
-			        ")\n", *mkv_start, *mkv_end);
-		error();
+		error_msg("Error: MKV start > end (%" PRId64 " > %" PRId64 ")\n",
+		          *mkv_start, *mkv_end);
 	}
 }