make combined sandbox opt-out rather than opt-in for local analysis (#…

…656) * make combined dynamic analysis sandbox opt-out rather than opt-in for local analysis Signed-off-by: Max Fisher <[email protected]> * don't use inverted logic for command line argument Signed-off-by: Max Fisher <[email protected]> --------- Signed-off-by: Max Fisher <[email protected]>
ossf · Feb 23, 2023 · 8c4d58a · 8c4d58a
1 parent 3269b6c
commit 8c4d58a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -220,19 +220,19 @@ test_go:
 .PHONY: test_dynamic_analysis
 test_dynamic_analysis:
 	@echo -e "\n##\n## Test NPM \n##\n"
-	scripts/run_analysis.sh -mode dynamic -combined-sandbox -nopull -ecosystem npm -package async
+	scripts/run_analysis.sh -mode dynamic -nopull -ecosystem npm -package async
 	@echo -e "\n##\n## Test PyPI \n##\n"
-	scripts/run_analysis.sh -mode dynamic -combined-sandbox -nopull -ecosystem pypi -package requests
+	scripts/run_analysis.sh -mode dynamic -nopull -ecosystem pypi -package requests
 	@echo -e "\n##\n## Test Packagist \n##\n"
-	scripts/run_analysis.sh -mode dynamic -combined-sandbox -nopull -ecosystem packagist -package symfony/deprecation-contracts
+	scripts/run_analysis.sh -mode dynamic -nopull -ecosystem packagist -package symfony/deprecation-contracts
 	@echo -e "\n##\n## Test Crates.io \n##\n"
-	scripts/run_analysis.sh -mode dynamic -combined-sandbox -nopull -ecosystem crates.io -package itoa
+	scripts/run_analysis.sh -mode dynamic -nopull -ecosystem crates.io -package itoa
 	@echo -e "\n##\n## Test RubyGems \n##\n"
-	scripts/run_analysis.sh -mode dynamic -combined-sandbox -nopull -ecosystem rubygems -package guwor_palindrome
+	scripts/run_analysis.sh -mode dynamic -nopull -ecosystem rubygems -package guwor_palindrome
 	@echo "Dynamic analysis test passed"
 
 .PHONY: test_static_analysis
 test_static_analysis:
 	@echo -e "\n##\n## Test NPM \n##\n"
-	scripts/run_analysis.sh -mode static -combined-sandbox -nopull -ecosystem npm -package async
+	scripts/run_analysis.sh -mode static -nopull -ecosystem npm -package async
 	@echo "Static analysis test passed"
diff --git a/cmd/analyze/main.go b/cmd/analyze/main.go
@@ -29,7 +29,7 @@ var (
 	staticUpload        = flag.String("upload-static", "", "bucket path for uploading static analysis results")
 	uploadFileWriteInfo = flag.String("upload-file-write-info", "", "bucket path for uploading information from file writes")
 	offline             = flag.Bool("offline", false, "disables sandbox network access")
-	combinedSandbox     = flag.Bool("combined-sandbox", false, "use combined dynamic analysis sandbox")
+	combinedSandbox     = flag.Bool("combined-sandbox", true, "use combined sandbox image for dynamic analysis (default true)")
 	listModes           = flag.Bool("list-modes", false, "prints out a list of available analysis modes")
 	help                = flag.Bool("help", false, "print help on available options")
 	analysisMode        = utils.CommaSeparatedFlags("mode", "dynamic",