feat: 统一扫描器离线相关配置处理逻辑 -- 兼容历史配置 TencentBlueKing#39

myqonnt · May 30, 2023 · 41b2ed3 · 41b2ed3
1 parent 822902a
commit 41b2ed3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/trivy/pkg/scan_executor.go b/trivy/pkg/scan_executor.go
@@ -19,7 +19,7 @@ type TrivyExecutor struct{}
 func (e TrivyExecutor) Execute(config *object.ToolConfig, file *os.File) (*object.ToolOutput, error) {
 	offline, err := config.GetBoolArg(constant.ConfigOffline)
 	if err != nil {
-		return nil, err
+		offline = len(config.GetStringArg(constant.ArgDbDownloadUrl)) > 0
 	}
 	if offline {
 		if err := downloadAllDB(config); err != nil {
@@ -46,7 +46,7 @@ func downloadAllDB(config *object.ToolConfig) error {
 
 	// download java db
 	javaDbUrl := config.GetStringArg(constant.ArgJavaDbDownloadUrl)
-	if len(javaDbUrl) == 0 {
+	if len(javaDbUrl) > 0 {
 		javaDbDir := filepath.Join(constant.DbCacheDir, constant.JavaDbDir)
 		if err := util.ExtractTarUrl(javaDbUrl, javaDbDir, 0770, downloader); err != nil {
 			return err