Merge pull request #844 from m-1-k-3/master

fix #839
e-m-b-a · Oct 23, 2023 · c2b832a · c2b832a
2 parents f172106 + 1fb8acf
commit c2b832a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/helpers/helpers_emba_html_generator.sh b/helpers/helpers_emba_html_generator.sh
@@ -635,6 +635,7 @@ update_index()
   # add emba.log to webreport
   generate_report_file "$MAIN_LOG"
   sed -i -e "s@buttonTimeInvisible@buttonTime@ ; s@TIMELINK@.\/$(basename "${MAIN_LOG%."${MAIN_LOG##*.}"}"".html")@" "$ABS_HTML_PATH""/""$INDEX_FILE"
+
   # generate files in $SUPPL_PATH (supplementary files from modules) 
   readarray -t SUPPL_FILES < <(find "$SUPPL_PATH" ! -path "$SUPPL_PATH")
   if [[ "${#SUPPL_FILES[@]}" -gt 0 ]] ; then

diff --git a/modules/S108_stacs_password_search.sh b/modules/S108_stacs_password_search.sh
@@ -23,7 +23,7 @@ S108_stacs_password_search()
   pre_module_reporter "${FUNCNAME[0]}"
 
   local STACS_RULES_DIR="$EXT_DIR"/stacs-rules
-  local STACS_LOG_FILE="$LOG_DIR"/etc/stacs_pw_hashes.json
+  local STACS_LOG_FILE="$LOG_PATH_MODULE"/stacs_pw_hashes.json
   local ELEMENTS=0
   local ELEMENTS_=0
   local PW_PATH=""

diff --git a/modules/S13_weak_func_check.sh b/modules/S13_weak_func_check.sh
@@ -571,10 +571,10 @@ output_function_details()
     SEARCH_TERM=$(basename "$BINARY_")
     if grep -q "^$SEARCH_TERM\$" "$BASE_LINUX_FILES" 2>/dev/null; then
       COMMON_FILES_FOUND="${CYAN}"" - common linux file: yes - "
-      write_log "[+] File $(print_path "$BINARY_") found in default Linux file dictionary" "$SUPPL_PATH/common_linux_files.txt"
+      write_log "[+] File $(print_path "$BINARY_") found in default Linux file dictionary" "$LOG_PATH_MODULE/common_linux_files.txt"
       CFF_CSV="true"
     else
-      write_log "[+] File $(print_path "$BINARY_") not found in default Linux file dictionary" "$SUPPL_PATH/common_linux_files.txt"
+      write_log "[+] File $(print_path "$BINARY_") not found in default Linux file dictionary" "$LOG_PATH_MODULE/common_linux_files.txt"
       COMMON_FILES_FOUND="${RED}"" - common linux file: no -"
       CFF_CSV="false"
     fi

diff --git a/modules/S14_weak_func_radare_check.sh b/modules/S14_weak_func_radare_check.sh
@@ -563,10 +563,10 @@ radare_output_function_details()
     SEARCH_TERM=$(basename "$BINARY_")
     if grep -q "^$SEARCH_TERM\$" "$BASE_LINUX_FILES" 2>/dev/null; then
       COMMON_FILES_FOUND="${CYAN}"" - common linux file: yes - "
-      write_log "[+] File $(print_path "$BINARY_") found in default Linux file dictionary" "$SUPPL_PATH/common_linux_files.txt"
+      write_log "[+] File $(print_path "$BINARY_") found in default Linux file dictionary" "$LOG_PATH_MODULE/common_linux_files.txt"
       CFF_CSV="true"
     else
-      write_log "[+] File $(print_path "$BINARY_") not found in default Linux file dictionary" "$SUPPL_PATH/common_linux_files.txt"
+      write_log "[+] File $(print_path "$BINARY_") not found in default Linux file dictionary" "$LOG_PATH_MODULE/common_linux_files.txt"
       COMMON_FILES_FOUND="${RED}"" - common linux file: no -"
       CFF_CSV="false"
     fi

diff --git a/modules/S15_radare_decompile_checks.sh b/modules/S15_radare_decompile_checks.sh
@@ -249,10 +249,10 @@ radare_decomp_output_function_details() {
     SEARCH_TERM=$(basename "$BINARY_")
     if grep -q "^$SEARCH_TERM\$" "$BASE_LINUX_FILES" 2>/dev/null; then
       COMMON_FILES_FOUND="${CYAN}"" - common linux file: yes - "
-      write_log "[+] File $(print_path "$BINARY_") found in default Linux file dictionary" "$SUPPL_PATH/common_linux_files.txt"
+      write_log "[+] File $(print_path "$BINARY_") found in default Linux file dictionary" "$LOG_PATH_MODULE/common_linux_files.txt"
       CFF_CSV="true"
     else
-      write_log "[+] File $(print_path "$BINARY_") not found in default Linux file dictionary" "$SUPPL_PATH/common_linux_files.txt"
+      write_log "[+] File $(print_path "$BINARY_") not found in default Linux file dictionary" "$LOG_PATH_MODULE/common_linux_files.txt"
       COMMON_FILES_FOUND="${RED}"" - common linux file: no -"
       CFF_CSV="false"
     fi