diff --git a/discordHelperWin.py b/discordHelperWin.py index d89c84a..a9f320e 100644 --- a/discordHelperWin.py +++ b/discordHelperWin.py @@ -26,7 +26,7 @@ if __name__ == "__main__": # Will always try to load discordHelper/discordHelper.json # TODO : Document this feature. run_db = os.path.join(directory_path, "test_results_found.json") - argv = rf"--all --autodetect --launch --continue --timeout 10 {db_path}--gen-data {run_db} --db discordHelper/test_results.json".split(" ") + argv = rf"--all --autodetect --launch --continue --timeout 25 {db_path}--gen-data {run_db} --db discordHelper/test_results.json".split(" ") # noqa E501 # print(" > Starting the discordHelper with the following arguments:") # print(" > " + " ".join(argv)) @@ -34,7 +34,7 @@ if __name__ == "__main__": discordHelper.main(args) except Exception as e: - print(e) + print("Error: " + str(e)) print(" > An error occured, please check the console for more information...") time.sleep(5) raise SystemExit diff --git a/modules/adler_test.py b/modules/adler_test.py index ea4a6db..6493895 100644 --- a/modules/adler_test.py +++ b/modules/adler_test.py @@ -39,13 +39,22 @@ class AdlerTest(test_template.TestWalkTemplateNoLogs): self.add_failure(path, f"Test {self.name()} failed on {short_path}") error_msg += f"{short_path} is " \ f"({res}) not ({self.get_expected_result(path, 'adler32')} b).\n" - self.is_infected = True - if not self.args.continue_on_error: - return self.finish( - "failure", - f"{short_path} is supposed to be {self.get_expected_result(path, 'adler32')} " - f"bytes, but it is {adler32(open(path, 'rb').read())} bytes." - ) + if not self.bad_database: + self.is_infected = True + if not self.args.continue_on_error: + return self.finish( + "failure", + f"{short_path} is supposed to be {self.get_expected_result(path, 'adler32')} " + f"bytes, but it is {adler32(open(path, 'rb').read())} bytes." + ) + else: + self.is_unknown = True + if not self.args.continue_on_error: + return self.finish( + "problem", + f"{short_path} is supposed to be {self.get_expected_result(path, 'adler32')} " + f"bytes, but it is {adler32(open(path, 'rb').read())} bytes." + ) self.progress = 100 if self.is_infected: @@ -53,4 +62,9 @@ class AdlerTest(test_template.TestWalkTemplateNoLogs): "failure", error_msg ) + elif self.is_unknown: + return self.finish( + "problem", + error_msg + ) return self.finish("success", "Your discord is not infected.") diff --git a/modules/agnostic_paths.py b/modules/agnostic_paths.py index ee8f598..dbdde00 100644 --- a/modules/agnostic_paths.py +++ b/modules/agnostic_paths.py @@ -6,6 +6,7 @@ import re import sys import random + class AgnosticPaths: """ An agnostic path object, containing all methods to access the files and folders in a standard discord install diff --git a/modules/internal_io.py b/modules/internal_io.py index 8e94cfa..62e669b 100644 --- a/modules/internal_io.py +++ b/modules/internal_io.py @@ -27,4 +27,4 @@ thread_parameters = namedtuple( 'thread_parameters', 'args, agnpath, test_data, queue, queue_lock, dict_process, dict_process_lock, bad_database', defaults=(None, None, None, None, None, None, None, None) -) \ No newline at end of file +) diff --git a/modules/main_runner.py b/modules/main_runner.py index 38fa0c2..0c3a002 100644 --- a/modules/main_runner.py +++ b/modules/main_runner.py @@ -113,7 +113,7 @@ class TestRunner: :param threat_level: The new threat level :type threat_level: int """ - threat_level = max(threat_level, self.threat_level) + self.threat_level = max(threat_level, self.threat_level) def open_base_data(self): """ @@ -145,6 +145,7 @@ class TestRunner: "\n > The database file does not exist, and the default " "one for your os does not exist either.\n", "red" )) + self.bad_database = True self.base_data = {} return self.base_data @@ -224,14 +225,14 @@ class TestRunner: for module_name, test_class in self.loaded_test_classes.items(): print(colored(f" > Starting test {module_name}...", "blue")) tc = test_class(thread_parameters( - self.args, - self.agnostic_path, - self.base_data, - self.finished_tests, - queue_lock, - self.dict_of_processes, - processes_lock, - self.bad_database, + args=self.args, + agnpath=self.agnostic_path, + test_data=self.base_data, + queue=self.finished_tests, + queue_lock=queue_lock, + dict_process=self.dict_of_processes, + dict_process_lock=processes_lock, + bad_database=self.bad_database, )) tc = threading.Thread(target=tc.run, args=()) tc.name = str(module_name) @@ -343,6 +344,7 @@ class TestRunner: nb_tests_success = 0 nb_tests_failure = 0 nb_tests_skipped = 0 + nb_tests_error = 0 progress = 0 for test in self.finished_tests: if test.status == "success": @@ -353,7 +355,7 @@ class TestRunner: elif test.status == "skipped": nb_tests_skipped += 1 elif test.status == "problem": - nb_tests_failure += 1 + nb_tests_error += 1 # progress += test.progress queue_lock.release() @@ -361,7 +363,7 @@ class TestRunner: progress += test.progress progress = int(progress / nb_tests) - nb_tests_ran = nb_tests_success + nb_tests_failure + nb_tests_skipped + nb_tests_ran = nb_tests_success + nb_tests_failure + nb_tests_skipped + nb_tests_error nb_test_running = nb_tests - nb_tests_ran return global_status( tests_total=nb_tests, @@ -370,7 +372,7 @@ class TestRunner: tests_failed=nb_tests_failure, tests_running=nb_test_running, tests_skipped=nb_tests_skipped, - tests_error=nb_tests_failure, + tests_error=nb_tests_error, progress=progress ) @@ -495,7 +497,7 @@ def resource_path(relative_path): """ Get absolute path to resource, works for dev and for PyInstaller """ try: # PyInstaller creates a temp folder and stores path in _MEIPASS - base_path = sys._MEIPASS # noqa + base_path = sys._MEIPASS # noqa # TODO: Detect if archive, likely with a ugly global check except Exception: base_path = os.path.abspath(".") return os.path.join(base_path, relative_path) @@ -506,12 +508,16 @@ def print_final_status(testrunner, start_time, args): Prints the final status """ status = testrunner.get_status() - if status.tests_failed == 0: + if status.tests_failed == 0 and status.tests_error == 0: color = "green" print(CLEAR_CODE) - else: + elif status.tests_failed > 0: color = "red" print(INFECTED_CODE) + else: + color = "yellow" + print(UNKNOWN_CODE) + print(colored( f"\nThe test sequence is now finished, DiscordHelper ran for " f"{round(time.time() - start_time,2)} seconds", color @@ -522,12 +528,14 @@ def print_final_status(testrunner, start_time, args): print(colored(f" > {fill_it(SIZE,test,'SUCCESS')}", "green")) elif test_object.status_code == "failure": print(colored(f" > {fill_it(SIZE,test,'FAILURE')}", "red")) - error_message = fit_it_under(test_object.status, SIZE-3, ' > ') - if args.max_shown != -1: # TODO : Correct this abomination - table = error_message.split("\n") - extra = [f" > ... {len(table) - args.max_shown} more lines"] if len(table) > args.max_shown else [] - error_message = "\n".join(table[:args.max_shown] + extra) + error_message = "\n".join(at_max_elements( + fit_it_under(test_object.status, SIZE-3, ' > '), args.max_shown, " > ... ")) print(colored(f"{error_message}", "red")) + elif test_object.status_code == "problem": + print(colored(f" > {fill_it(SIZE,test,'PROBLEM')}", "yellow")) + error_message = "\n".join(at_max_elements( + fit_it_under(test_object.status, SIZE-3, ' > '), args.max_shown, " > ... ")) + print(colored(f"{error_message}", "yellow")) else: print(colored(f" > {fill_it(SIZE,test,test_object.status_code.upper())}", "yellow")) msg_error = "sucessfully" if status.tests_failed == 0 else f"with {status.tests_error} errors" @@ -541,20 +549,30 @@ def fill_it(size, string1, string2): return string1 + max(size - len(string1)-len(string2), 0) * "." + string2 +def at_max_elements(table, msize, fill): + """ + Display at maximum msize elements, replace last with fill and return the table + """ + if msize == -1: + return table + + # if en(table) > lmsize: + table = table[:msize] + [ + fill+"..."+str(len(table)-msize)+" more lines" if len(table) > msize else ""] + return table + + def fit_it_under(message, size, start_line=""): """ Fits a message under a size """ - final_message = "" + final_message = [] for line in message.split('\n'): if len(line) > size: - final_message += start_line + line[:size] + "\n" + final_message += [start_line + line[:size]] final_message += fit_it_under(line[size:], size, start_line) else: - final_message += start_line + line + "\n" - # final_message += start_line + line + '\n' - # if len(message) > size: - # return message[:size-3] + "..." + final_message += [start_line + line] return final_message diff --git a/modules/size_test.py b/modules/size_test.py index 07b6596..e1912ed 100644 --- a/modules/size_test.py +++ b/modules/size_test.py @@ -9,6 +9,7 @@ class SizeTest(test_template.TestWalkTemplateNoLogs): Simple test runner, compare file size to known good values. """ super().__init__(thread_parameters) + self.is_unknown = False def run_test(self): """ @@ -17,7 +18,8 @@ class SizeTest(test_template.TestWalkTemplateNoLogs): :rtype: bool """ self.set_status("running") - size = len(self.walk()) + size = self.agnostic_path.size + error_msg = "" for i, path in enumerate(self.walk()): self.progress = int(100*i/size) @@ -28,12 +30,21 @@ class SizeTest(test_template.TestWalkTemplateNoLogs): self.add_failure(path, f"Test {self.name()} failed on {short_path}") error_msg += f"{short_path} is " \ f"({res} b) not ({self.get_expected_result(path, 'size')} b).\n" - self.is_infected = True - if not self.args.continue_on_error: - return self.finish( - "failure", - f"{short_path} is supposed to be {self.get_expected_result(path, 'size')}" - f" bytes, but it is {os.path.getsize(path)} bytes.") + # print(self.bad_database) + if not self.bad_database: + self.is_infected = True + if not self.args.continue_on_error: + return self.finish( + "failure", + f"{short_path} is supposed to be {self.get_expected_result(path, 'size')}" + f" bytes, but it is {os.path.getsize(path)} bytes.") + else: + self.is_unknown = True + if not self.args.continue_on_error: + return self.finish( + "problem", + f"{short_path} is supposed to be {self.get_expected_result(path, 'size')}" + f" bytes, but it is {os.path.getsize(path)} bytes.") self.progress = 100 if self.is_infected: @@ -41,4 +52,9 @@ class SizeTest(test_template.TestWalkTemplateNoLogs): "failure", error_msg ) + elif self.is_unknown: + return self.finish( + "problem", + error_msg + ) return self.finish("success", "Your discord is not infected.") diff --git a/modules/test_template.py b/modules/test_template.py index f113d2c..ca5e989 100644 --- a/modules/test_template.py +++ b/modules/test_template.py @@ -48,6 +48,7 @@ class TestTemplate: self.failure_dict = {} self.new_data = {} self.progress = 0 + self.is_unknown = False self.dict_process = thread_parameters.dict_process self.dict_process_lock = thread_parameters.dict_process_lock self.bad_database = thread_parameters.bad_database @@ -63,8 +64,8 @@ class TestTemplate: try: self.run_test() except Exception as e: - self.set_status("problem", str(e)) - return self.finish() + self.add_failure("problem", "DISCORD HELPER:"+str(e)) + return self.finish("problem", str(e)) def run_test(self): """ @@ -253,10 +254,10 @@ class TestWalkTemplate(TestTemplate): def walk(self): """ Walks the given path and returns a list of all files and directories. - :return: List of all files and directories + :return: List of all files :return: """ - return self.agnostic_path.walk_all_files(self.agnostic_path()) + return self.agnostic_path.all_files def compare(self, path, entry_name, function, args, kwargs, cmp_function=None): """