[REFACT] Moved params info to separate files

hasherezade · Nov 5, 2018 · c78463c · c78463c
1 parent a08689f
commit c78463c
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 44 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,6 +68,7 @@ set (utils_hdrs
 
 set (srcs
 	pe_sieve.cpp
+	pe_sieve_params_info.cpp
 	report_formatter.cpp
 	results_dumper.cpp
 	pe_reconstructor.cpp
@@ -77,6 +78,7 @@ set (srcs
 
 set (hdrs
 	pe_sieve.h
+	pe_sieve_params_info.h
 	report_formatter.h
 	results_dumper.h
 	pe_reconstructor.h

diff --git a/main.cpp b/main.cpp
@@ -9,6 +9,7 @@
 #include "utils/process_privilege.h"
 
 #include "utils/util.h"
+#include "pe_sieve_params_info.h"
 
 #include "peconv.h"
 #include "pe_sieve.h"
@@ -39,49 +40,6 @@ void print_in_color(int color, std::string text)
 	SetConsoleTextAttribute(hConsole, 7); // back to default color
 }
 
-std::string translate_dump_mode(const peconv::t_pe_dump_mode dump_mode)
-{
-	switch (dump_mode) {
-		case peconv::PE_DUMP_AUTO: 
-			return "autodetect (default)";
-		case peconv::PE_DUMP_VIRTUAL:
-			return "virtual (as it is in the memory, no unmapping)";
-		case peconv::PE_DUMP_UNMAP:
-			return "unmapped (converted to raw using sections' raw headers)";
-		case peconv::PE_DUMP_REALIGN:
-			return "realigned raw (converted raw format to be the same as virtual)";
-	}
-	return "undefined";
-}
-
-std::string translate_out_filter(const t_output_filter o_filter)
-{
-	switch (o_filter) {
-		case OUT_FULL:
-			return "no filter: dump everything (default)";
-		case OUT_NO_DUMPS:
-			return "don't dump the modified PEs, but save the report";
-		case OUT_NO_DIR:
-			return "don't dump any files";
-	}
-	return "undefined";
-}
-
-std::string translate_modules_filter(DWORD m_filter)
-{
-	switch (m_filter) {
-		case LIST_MODULES_DEFAULT:
-			return "no filter (as the scanner)";
-		case LIST_MODULES_32BIT:
-			return "32bit only";
-		case LIST_MODULES_64BIT:
-			return "64bit only";
-		case LIST_MODULES_ALL:
-			return "all accessible (default)";
-	}
-	return "undefined";
-}
-
 peconv::t_pe_dump_mode normalize_dump_mode(size_t mode_id)
 {
 	if (mode_id > peconv::PE_DUMP_MODES_COUNT) {
@@ -259,7 +217,7 @@ int main(int argc, char *argv[])
 		std::cout << "PID: " << args.pid << std::endl;
 		std::cout << "Modules filter: " << translate_modules_filter(args.modules_filter) << std::endl;
 		std::cout << "Output filter: " << translate_out_filter(args.out_filter) << std::endl;
-		std::cout << "Dump mode: " << translate_dump_mode(peconv::t_pe_dump_mode(args.dump_mode)) << std::endl;
+		std::cout << "Dump mode: " << translate_dump_mode(args.dump_mode) << std::endl;
 	}
 	ProcessScanReport* report = scan_process(args);
 	if (report != nullptr) {

diff --git a/pe_sieve_params_info.cpp b/pe_sieve_params_info.cpp
@@ -0,0 +1,48 @@
+#include "pe_sieve_params_info.h"
+
+#include <peconv.h>
+#include <Windows.h>
+#include <Psapi.h>
+
+std::string translate_dump_mode(const DWORD dump_mode)
+{
+	switch (dump_mode) {
+	case peconv::PE_DUMP_AUTO:
+		return "autodetect (default)";
+	case peconv::PE_DUMP_VIRTUAL:
+		return "virtual (as it is in the memory, no unmapping)";
+	case peconv::PE_DUMP_UNMAP:
+		return "unmapped (converted to raw using sections' raw headers)";
+	case peconv::PE_DUMP_REALIGN:
+		return "realigned raw (converted raw format to be the same as virtual)";
+	}
+	return "undefined";
+}
+
+std::string translate_out_filter(const t_output_filter o_filter)
+{
+	switch (o_filter) {
+	case OUT_FULL:
+		return "no filter: dump everything (default)";
+	case OUT_NO_DUMPS:
+		return "don't dump the modified PEs, but save the report";
+	case OUT_NO_DIR:
+		return "don't dump any files";
+	}
+	return "undefined";
+}
+
+std::string translate_modules_filter(DWORD m_filter)
+{
+	switch (m_filter) {
+	case LIST_MODULES_DEFAULT:
+		return "no filter (as the scanner)";
+	case LIST_MODULES_32BIT:
+		return "32bit only";
+	case LIST_MODULES_64BIT:
+		return "64bit only";
+	case LIST_MODULES_ALL:
+		return "all accessible (default)";
+	}
+	return "undefined";
+}
diff --git a/pe_sieve_params_info.h b/pe_sieve_params_info.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <iostream>
+#include "pe_sieve.h"
+
+std::string translate_dump_mode(const DWORD dump_mode);
+std::string translate_out_filter(const t_output_filter o_filter);
+std::string translate_modules_filter(DWORD m_filter);