Merge pull request #687 from m-1-k-3/restart_emulation

typo, csv cleanup
e-m-b-a · Jul 6, 2023 · c9f15e3 · c9f15e3
2 parents 0010672 + 428fca2
commit c9f15e3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/helpers/helpers_emba_defaults.sh b/helpers/helpers_emba_defaults.sh
@@ -18,8 +18,8 @@
 
 set_defaults() {
   # if this is a release version set RELEASE to 1, add a banner to config/banner and name the banner with the version details
-  export RELEASE=1
-  export EMBA_VERSION="1.2.3"
+  export RELEASE=0
+  export EMBA_VERSION="1.2.x"
 
   export CLEANED=0              # used for the final cleaner function for not running it multiple times
   export STRICT_MODE=0

diff --git a/modules/L15_emulated_checks_nmap.sh b/modules/L15_emulated_checks_nmap.sh
@@ -206,6 +206,8 @@ l15_version_detector() {
       print_output "[+] Version information found ${RED}""$VERSION_FINDER""${NC}${GREEN} in $TYPE_ log."
       # use get_csv_rule from s09:
       get_csv_rule "$VERSION_FINDER" "$CSV_REGEX"
+      # get rid of ; which destroys our csv:
+      VERSION_FINDER="${VERSION_FINDER/;}"
       write_csv_log "---" "$IDENTIFIER" "$VERSION_FINDER" "$CSV_RULE" "$LIC" "$TYPE_"
       continue
     fi

diff --git a/modules/L25_web_checks.sh b/modules/L25_web_checks.sh
@@ -159,7 +159,7 @@ main_web_check() {
       mapfile -t VERSIONS < <(grep "+ Server: " "$LOG_PATH_MODULE"/nikto-scan-"$IP_ADDRESS_".txt | cut -d: -f2 | sort -u | grep -v "null" | grep -e "[0-9]" | sed 's/^\ //' || true)
       for VERSION in "${VERSIONS[@]}"; do
         if [[ "$VERSION" != *"Server banner has changed from"* ]]; then
-          l15_version_detector "$VERSION" "Nikto web server scanning log"
+          l15_version_detector "$VERSION" "Nikto web server scanning"
         fi
       done