1.4.20

Signed-off-by: Emily Rodriguez <erodriguez92@gatech.edu>

Author: em-c-rod

VERSION

@@ -1 +1 @@
-1.4.19
+1.4.20

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@mitre/saf",
   "description": "The MITRE Security Automation Framework (SAF) Command Line Interface (CLI) brings together applications, techniques, libraries, and tools developed by MITRE and the security community to streamline security automation for systems and DevOps pipelines.",
-  "version": "1.4.19",
+  "version": "1.4.20",
   "author": "The MITRE Security Automation Framework",
   "bin": "./bin/run",
   "bugs": "https://github.com/mitre/saf/issues",
@@ -123,10 +123,16 @@
     },
     "theme": "./oclif-theme.json",
     "additionalHelpFlags": [
-      "-h", "-H", "--tell-me-more", "--explain"
+      "-h",
+      "-H",
+      "--tell-me-more",
+      "--explain"
     ],
     "additionalVersionFlags": [
-      "-v", "-V", "--version", "--Version"
+      "-v",
+      "-V",
+      "--version",
+      "--Version"
     ],
     "bin": "saf",
     "plugins": [

package.json

@@ -49,125 +49,6 @@ PrintColor "Yellow" "#----------------------------------------------------------
 
 #------------------------------------------------------------------------------
 # Start the Script
-PrintColor "Green" "Press enter to continue - or type exit/EXIT to terminate"
-read srtInput # Read user input
-# Check if input is 'exit', 'Exit', or 'EXIT'
-if [[ "$srtInput" == "exit" || "$srtInput" == "Exit" || "$srtInput" == "EXIT" ]]; then
-  TerminateScript
-fi
-
-#------------------------------------------------------------------------------
-# Retrieve the latest main content from github 
-PrintColor "Yellow" "Retrieve the latest main content from github..."
-git checkout main
-PrintColor "Green" "Done"
-echo
-
-#------------------------------------------------------------------------------
-# Pull the main branch content from github 
-PrintColor "Yellow" "Pull the main branch from github..."
-git pull origin main
-if [ $? -ne 0 ]; then
-  PrintColor "Red" "  Failed to Pull the main branch from github"
-  TerminateScript
-fi
-PrintColor "Green" "Done"
-echo
-
-#------------------------------------------------------------------------------
-# Update the version tag with the next value (package.json file)
-PrintColor "Yellow" "Increment the SAF CLI version number..."
-
-# 1. Read the JSON file
-json_content=$(cat "package.json")
-version=$(echo "$json_content" | jq -r '.version')
-
-# 2. Update the version (Increment the build number)
-IFS='.' read -r -a version_array <<< "$version" # Split the version into an array
-version_array[2]=$((version_array[2] + 1))      # Increment the last element (patch version)
-new_version="${version_array[0]}.${version_array[1]}.${version_array[2]}" # Join back into a string
-
-# 3. Ask the user to update or confirm the new version number
-PrintColor "Cyan" "Current SAF CLI version is: $version"
-prompt="Enter the new SAF CLI version number (default is: $new_version)"
-while true; do
-  read -p "$(echo -e ${CYAN}$prompt: ${RESET})" next_version
-  if [ -z "$next_version" ]; then
-    next_version=$new_version
-  fi
-
-  # Ask for confirmation
-  read -p "$(echo -e ${CYAN}Use version $next_version [y/n] exit to quit: ${RESET})" srtInput
-  if [[ "$srtInput" =~ ^(exit|Exit|EXIT)$ ]]; then
-    TerminateScript
-  elif [ "$srtInput" == "y" ]; then
-    break
-  fi
-done
-PrintColor "Green" "Setting SAF CLI version to: $next_version"
-
-# 4. Update the package.json and VERSION files
-updated_json=$(echo "$json_content" | jq --arg version "$next_version" '.version = $version')
-echo "$updated_json" > package.json
-echo "$next_version" > VERSION
-
-PrintColor "Green" "Done"
-echo
-
-#------------------------------------------------------------------------------
-# Update MITRE dependencies to latest version
-PrintColor "Yellow" "Update MITRE dependencies to latest version..."
-# List of MITRE packages to be checked - Add as needed
-packages=("@mitre/hdf-converters" "@mitre/heimdall-lite" "@mitre/inspec-objects" "@mitre/emass_client")
-
-# Iterate over each package
-for package in "${packages[@]}"; do
-  PrintColor "Cyan" "  Processing package: $package"
-  # Get the latest version of the package from npm
-  latest_version=$(npm show "$package" version)
-  # Get the current version from package.json
-  current_version=$(jq -r ".dependencies[\"$package\"]" package.json)
-  # Compare and update package.json as needed
-  if [[ "$latest_version" != "$current_version" ]]; then
-    PrintColor "Yellow" "    Updated package to version: $latest_version"
-    # Update the package version in package.json
-    jq ".dependencies[\"$package\"] = \"$latest_version\"" package.json > temp.json && mv temp.json package.json
-  else
-    PrintColor "Cyan" "    Package version is current: $current_version"
-  fi
-done
-PrintColor "Green" "Done"
-echo
-
-
-#------------------------------------------------------------------------------
-# Delete node_modules if it exists, install all supporting modules
-PrintColor "Yellow" "Delete node_modules if it exists, install supporting modules..."
-if [ -d "node_modules" ]; then
-  PrintColor "Cyan" "  Removing the node_modules directory"
-  rm -rf node_modules
-fi
-
-PrintColor "Cyan" "  Installing node modules"
-npm install 
-PrintColor "Green" "Done"
-echo
-
-#------------------------------------------------------------------------------
-# Build the SAF CLI package and run all tests
-PrintColor "Yellow" "Build the SAF CLI package and run all tests..."
-PrintColor "Cyan" "  Building the SAF CLI package"
-npm pack
-
-PrintColor "Cyan" "  Running the SAF CLI tests"
-npm run test
-# $? holds exit status of last command run, npm run test returns non-zero exit status if all tests don't pass
-if [ $? -ne 0 ]; then
-  PrintColor "Red" "  Failed the SAF CLI test(s)"
-  TerminateScript
-fi
-PrintColor "Green" "Done"
-echo
 
 #------------------------------------------------------------------------------
 # Add unstaged files to the staging area - Files with modified flag (M) set

release-prep.sh

@@ -72,6 +72,8 @@ describe('Test invalid checklist metadata example', () => {
       '-i', path.resolve('./test/sample_data/checklist/sample_input_report/ckl_with_invalid_metadata.ckl'),
       '-o', `${tmpobj.name}/invalid_output.json`,
     ])
-    expect(stderr).to.equal('Error converting to hdf:\nError: Invalid checklist metadata fields:\n\tHost FQDN (invalid)\n\tHost IP (invalid)\n\tHost MAC (invalid)\n')
+    const expected_error_message = 'Error converting to hdf:\nError: Invalid checklist metadata fields:\n\tHost FQDN (invalid)\n\tHost IP (invalid)\n\tHost MAC addresses must be valid and separated by newline, space, or comma. (invalid)\n'
+    // const expected_error_message2 = 'Error converting to hdf:\nError: Invalid checklist metadata fields:\n\tHost FQDN (invalid)\n\tHost IP (invalid)\n\tHost MAC (invalid)\n'
+    expect(stderr).to.equal(expected_error_message)
   })
 })