Merge pull request e-m-b-a#930 from m-1-k-3/master

Multiple fixes

Author: m-1-k-3

docker-compose.yml

@@ -21,6 +21,7 @@ services:
       - /root/.ghidra/
       - /root/.routersploit/
       - /root/.msf4
+      - /root/.john
       - /run/lock
       - /var/run
       - /var/tmp

helpers/helpers_emba_defaults.sh

@@ -131,4 +131,5 @@ set_defaults() {
   export TOTAL_MEMORY=0
   TOTAL_MEMORY="$(grep MemTotal /proc/meminfo | awk '{print $2}' || true)"
   export Q_MOD_PID=""
+  export F20_DEEP=1      # F20 module - set to cve-discovery caller for further processing
 }

helpers/helpers_emba_dependency_check.sh

@@ -129,8 +129,8 @@ check_git_hash(){
 check_docker_image(){
   local LOCAL_DOCKER_HASH=""
   local REMOTE_DOCKER_HASH=""
-  LOCAL_DOCKER_HASH="$(sudo docker image inspect embeddedanalyzer/emba:latest --format '{{json .RepoDigests}}' | jq . | grep "sha" | sed -E 's/.*sha256:([0-9|[a-z]+)"/\1/' || true)"
-  REMOTE_DOCKER_HASH="$(sudo docker manifest inspect embeddedanalyzer/emba:latest -v | jq . | grep "digest" | head -n1 | awk '{print $2}' | sed -E 's/"sha256:(.+)",/\1/' || true)"
+  LOCAL_DOCKER_HASH="$(docker image inspect embeddedanalyzer/emba:latest --format '{{json .RepoDigests}}' | jq . | grep "sha" | sed -E 's/.*sha256:([0-9|[a-z]+)"/\1/' || true)"
+  REMOTE_DOCKER_HASH="$(docker manifest inspect embeddedanalyzer/emba:latest -v | jq . | grep "digest" | head -n1 | awk '{print $2}' | sed -E 's/"sha256:(.+)",/\1/' || true)"
 
   if [[ "${LOCAL_DOCKER_HASH}" == "${REMOTE_DOCKER_HASH}" ]]; then
     echo -e "    Docker image version - ${GREEN}ok${NC}"
@@ -154,22 +154,26 @@ dependency_check()
   if [[ "${CONTAINER_NUMBER}" -ne 1 ]]; then
     print_output "    Internet connection - \\c" "no_log"
 
-    if [[ -n "${PROXY_SETTINGS}" ]]; then
-      export http_proxy="${PROXY_SETTINGS}"
-      export https_proxy="${PROXY_SETTINGS}"
-      print_output "[*] Info: Proxy settings detected: ${ORANGE}${PROXY_SETTINGS}${NC}" "no_log"
-    fi
-
     LATEST_EMBA_VERSION="$(curl --connect-timeout 5 -s -o - https://github.com/e-m-b-a/emba/blob/master/config/VERSION.txt | grep -w "rawLines" | sed -E 's/.*"rawLines":\["([0-9]\.[0-9]\.[0-9]).*/\1/' || true)"
     if [[ -z "${LATEST_EMBA_VERSION}" ]] ; then
       echo -e "${RED}""not ok""${NC}"
       print_output "[-] Warning: Quest container has no internet connection!" "no_log"
     else
       echo -e "${GREEN}""ok""${NC}"
-      check_emba_version "${LATEST_EMBA_VERSION}"
-      check_docker_image
-      check_git_hash
+      # ensure this only runs on the host and not in any container
+      if [[ "${IN_DOCKER}" -eq 0 ]]; then
+        check_emba_version "${LATEST_EMBA_VERSION}"
+        check_docker_image
+        check_git_hash
+      fi
     fi
+
+    if [[ -n "${PROXY_SETTINGS}" ]]; then
+      export http_proxy="${PROXY_SETTINGS}"
+      export https_proxy="${PROXY_SETTINGS}"
+      print_output "[*] Info: Proxy settings detected: ${ORANGE}${PROXY_SETTINGS}${NC}" "no_log"
+    fi
+
     if [[ -f "${CONFIG_DIR}/gpt_config.env" ]]; then
       if grep -v -q "#" "${CONFIG_DIR}/gpt_config.env"; then
         # readin gpt_config.env
@@ -517,7 +521,11 @@ dependency_check()
       check_dep_file "Binarly FwHunt analyzer" "${EXT_DIR}""/fwhunt-scan/fwhunt_scan_analyzer.py"
 
       if function_exists F20_vul_aggregator; then
-        check_dep_file "NVD CVE database" "${EXT_DIR}""/nvd-json-data-feeds/README.md"
+        # ensure this check is not running as github action:
+        # "${CONFIG_DIR}"/gh_action is created from the installer
+        if ! [[ -f "${CONFIG_DIR}"/gh_action ]]; then
+          check_dep_file "NVD CVE database" "${EXT_DIR}""/nvd-json-data-feeds/README.md"
+        fi
         # CVE searchsploit
         check_dep_tool "CVE Searchsploit" "cve_searchsploit"
 

helpers/helpers_emba_helpers.sh

@@ -178,6 +178,12 @@ cleaner() {
     done < "${TMP_DIR}"/EXIT_KILL_PIDS.log
   fi
 
+  if [[ -f "${LOG_DIR}"/emba_error.log ]]; then
+    if ! [[ -s "${LOG_DIR}"/emba_error.log ]]; then
+      rm "${LOG_DIR}"/emba_error.log > /dev/null || true
+    fi
+  fi
+
   if [[ "${IN_DOCKER}" -eq 0 ]] && [[ -d "${TMP_DIR}" ]]; then
     rm -r "${TMP_DIR}" 2>/dev/null || true
   fi

installer.sh

@@ -361,12 +361,7 @@ chmod 755 ./external
 
 if [[ "${LIST_DEP}" -eq 0 ]] || [[ ${IN_DOCKER} -eq 0 ]] || [[ ${DOCKER_SETUP} -eq 1 ]] || [[ ${FULL} -eq 1 ]]; then
   echo -e "\\n""${MAGENTA}""${BOLD}""Installation notes:""${NC}"
-  echo -e "\\n""${MAGENTA}""INFO: The cron.daily update script for EMBA is located in config/emba_updater""${NC}"
-  echo -e "${MAGENTA}""INFO: For automatic updates it should be copied to /etc/cron.daily/""${NC}"
-  echo -e "${MAGENTA}""INFO: For manual updates just start it via sudo ./config/emba_updater""${NC}"
-
   echo -e "\\n""${MAGENTA}""WARNING: If you plan using the emulator (-E switch) your host and your internal network needs to be protected.""${NC}"
-
   echo -e "\\n""${MAGENTA}""INFO: Do not forget to checkout current development of EMBA at https://github.com/e-m-b-a.""${NC}"
 fi
 if [[ "${WSL}" -eq 1 ]]; then

installer/IF20_nvd_feed.sh

@@ -37,6 +37,7 @@ IF20_nvd_feed() {
         echo -e "\\n""${MAGENTA}""Check if the NVD JSON data feed is already installed and populated.""${NC}"
         if [[ "${GH_ACTION}" -eq 1 ]]; then
           echo "[*] Github action - not installing NVD database"
+          echo "GH_action:true" > ./config/gh_action || true
           return
         fi
         if [[ -d external/nvd-json-data-feeds ]]; then