Updated gradle-dep-tree plugin and added support included builds

buildscripts/download-jars.sh

@@ -7,7 +7,7 @@
 # https://github.com/jfrog/maven-dep-tree
 
 # Once you have updated the versions mentioned below, please execute this script from the root directory of the jfrog-cli-core to ensure the JAR files are updated.
-GRADLE_DEP_TREE_VERSION="3.1.0"
+GRADLE_DEP_TREE_VERSION="3.2.0"
 # Changing this version also requires a change in mavenDepTreeVersion within utils/java/mvn.go.
 MAVEN_DEP_TREE_VERSION="1.1.5"
 

cli/docs/flags.go

@@ -7,6 +7,7 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/common/cliutils"
 	pluginsCommon "github.com/jfrog/jfrog-cli-core/v2/plugins/common"
 	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
+
 	"github.com/jfrog/jfrog-cli-security/commands/git/contributors"
 	"github.com/jfrog/jfrog-cli-security/commands/xray/offlineupdate"
 	"github.com/jfrog/jfrog-cli-security/utils"
@@ -83,15 +84,16 @@ const (
 	InsecureTls = "insecure-tls"
 
 	// Generic command flags
-	SpecFlag    = "spec"
-	Threads     = "threads"
-	Recursive   = "recursive"
-	RegexpFlag  = "regexp"
-	AntFlag     = "ant"
-	Project     = "project"
-	Exclusions  = "exclusions"
-	IncludeDirs = "include-dirs"
-	UseWrapper  = "use-wrapper"
+	SpecFlag          = "spec"
+	Threads           = "threads"
+	Recursive         = "recursive"
+	RegexpFlag        = "regexp"
+	AntFlag           = "ant"
+	Project           = "project"
+	Exclusions        = "exclusions"
+	IncludeDirs       = "include-dirs"
+	UseWrapper        = "use-wrapper"
+	UseIncludedBuilds = "use-included-builds"
 )
 
 const (
@@ -282,6 +284,11 @@ var flagsMap = map[string]components.Flag{
 		"[Gradle, Maven] Set to true if you'd like to use the Gradle or Maven wrapper.",
 		components.WithBoolDefaultValue(true),
 	),
+	UseIncludedBuilds: components.NewBoolFlag(
+		UseIncludedBuilds,
+		"[Gradle] Set to true if you'd like to take into account included builds (composite builds) of gradle projects, in addition to including subprojects",
+		components.WithBoolDefaultValue(false),
+	),
 	WorkingDirs:         components.NewStringFlag(WorkingDirs, "A comma-separated(,) list of relative working directories, to determine the audit targets locations. If flag isn't provided, a recursive scan is triggered from the root directory of the project."),
 	OutputDir:           components.NewStringFlag(OutputDir, "Target directory to save partial results to.", components.SetHiddenStrFlag()),
 	UploadRepoPath:      components.NewStringFlag(UploadRepoPath, "Artifactory repository name or path to upload the cyclonedx file to. If no name or path are provided, a local generic repository will be created which will automatically be indexed by Xray.", components.WithStrDefaultValue("import-cdx-scan-results")),

cli/scancommands.go

@@ -18,6 +18,7 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
 	coreConfig "github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+
 	flags "github.com/jfrog/jfrog-cli-security/cli/docs"
 	auditSpecificDocs "github.com/jfrog/jfrog-cli-security/cli/docs/auditspecific"
 	enrichDocs "github.com/jfrog/jfrog-cli-security/cli/docs/enrich"
@@ -30,13 +31,14 @@ import (
 	uploadCdxDocs "github.com/jfrog/jfrog-cli-security/cli/docs/upload"
 	"github.com/jfrog/jfrog-cli-security/utils"
 
+	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
+	"github.com/jfrog/jfrog-client-go/utils/log"
+	"github.com/urfave/cli"
+
 	"github.com/jfrog/jfrog-cli-security/commands/enrich"
 	"github.com/jfrog/jfrog-cli-security/commands/source_mcp"
 	"github.com/jfrog/jfrog-cli-security/sca/bom/indexer"
 	"github.com/jfrog/jfrog-cli-security/utils/xray"
-	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
-	"github.com/jfrog/jfrog-client-go/utils/log"
-	"github.com/urfave/cli"
 
 	"github.com/jfrog/jfrog-cli-security/commands/audit"
 	"github.com/jfrog/jfrog-cli-security/commands/curation"
@@ -507,7 +509,8 @@ func CreateAuditCmd(c *components.Context) (string, string, *coreConfig.ServerDe
 		SetNpmScope(c.GetStringFlagValue(flags.DepType)).
 		SetPipRequirementsFile(c.GetStringFlagValue(flags.RequirementsFile)).
 		SetMaxTreeDepth(c.GetStringFlagValue(flags.MaxTreeDepth)).
-		SetExclusions(pluginsCommon.GetStringsArrFlagValue(c, flags.Exclusions))
+		SetExclusions(pluginsCommon.GetStringsArrFlagValue(c, flags.Exclusions)).
+		SetUseIncludedBuilds(c.GetBoolFlagValue(flags.UseIncludedBuilds))
 	return xrayVersion, xscVersion, serverDetails, auditCmd, err
 }
 

commands/audit/auditbasicparams.go

@@ -82,6 +82,7 @@ type AuditBasicParams struct {
 	xscVersion                       string
 	configProfile                    *xscservices.ConfigProfile
 	solutionFilePath                 string
+	useIncludedBuilds                bool
 }
 
 func (abp *AuditBasicParams) DirectDependencies() *[]string {
@@ -342,3 +343,10 @@ func (abp *AuditBasicParams) SetSolutionFilePath(solutionFilePath string) *Audit
 	abp.solutionFilePath = solutionFilePath
 	return abp
 }
+
+func (abp *AuditBasicParams) UseIncludedBuilds() bool { return abp.useIncludedBuilds }
+
+func (abp *AuditBasicParams) SetUseIncludedBuilds(useIncludedBuilds bool) *AuditBasicParams {
+	abp.useIncludedBuilds = useIncludedBuilds
+	return abp
+}

commands/audit/auditparams.go

@@ -231,7 +231,8 @@ func (params *AuditParams) ToBuildInfoBomGenParams() (bomParams technologies.Bui
 		// Python params
 		PipRequirementsFile: params.PipRequirementsFile(),
 		// Pnpm params
-		MaxTreeDepth: params.MaxTreeDepth(),
+		MaxTreeDepth:      params.MaxTreeDepth(),
+		UseIncludedBuilds: params.UseIncludedBuilds(),
 	}
 	return
 }

sca/bom/buildinfo/buildinfobom.go

@@ -195,6 +195,7 @@ func GetTechDependencyTree(params technologies.BuildInfoBomGeneratorParams, arti
 			UseWrapper:              params.UseWrapper,
 			IsCurationCmd:           params.IsCurationCmd,
 			CurationCacheFolder:     curationCacheFolder,
+			UseIncludedBuilds:       params.UseIncludedBuilds,
 		}, tech)
 	case techutils.Npm:
 		depTreeResult.FullDepTrees, uniqueDepsIds, err = npm.BuildDependencyTree(params)

sca/bom/buildinfo/technologies/common.go

@@ -10,17 +10,18 @@ import (
 	buildInfoUtils "github.com/jfrog/build-info-go/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/tests"
-	"github.com/jfrog/jfrog-cli-security/utils"
-	"github.com/jfrog/jfrog-cli-security/utils/techutils"
-	"github.com/jfrog/jfrog-cli-security/utils/xray"
-	"github.com/jfrog/jfrog-cli-security/utils/xray/scangraph"
 	"github.com/jfrog/jfrog-client-go/artifactory/services/fspatterns"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	ioUtils "github.com/jfrog/jfrog-client-go/utils/io"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	"github.com/jfrog/jfrog-client-go/xray/services"
 	xscservices "github.com/jfrog/jfrog-client-go/xsc/services"
+
+	"github.com/jfrog/jfrog-cli-security/utils"
+	"github.com/jfrog/jfrog-cli-security/utils/techutils"
+	"github.com/jfrog/jfrog-cli-security/utils/xray"
+	"github.com/jfrog/jfrog-cli-security/utils/xray/scangraph"
 )
 
 const (
@@ -59,7 +60,8 @@ type BuildInfoBomGeneratorParams struct {
 	// Pnpm params
 	MaxTreeDepth string
 	// NuGet params
-	SolutionFilePath string
+	SolutionFilePath  string
+	UseIncludedBuilds bool
 }
 
 func (bbp *BuildInfoBomGeneratorParams) SetNpmScope(depType string) *BuildInfoBomGeneratorParams {

sca/bom/buildinfo/technologies/conan/conan_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/jfrog/jfrog-cli-core/v2/utils/tests"
+
 	"github.com/jfrog/jfrog-cli-security/sca/bom/buildinfo/technologies"
 )
 

sca/bom/buildinfo/technologies/java/deptreemanager.go

@@ -31,16 +31,18 @@ type DepTreeParams struct {
 	IsMavenDepTreeInstalled bool
 	IsCurationCmd           bool
 	CurationCacheFolder     string
+	UseIncludedBuilds       bool
 }
 
 type DepTreeManager struct {
-	server     *config.ServerDetails
-	depsRepo   string
-	useWrapper bool
+	server            *config.ServerDetails
+	depsRepo          string
+	useWrapper        bool
+	useIncludedBuilds bool
 }
 
 func NewDepTreeManager(params *DepTreeParams) DepTreeManager {
-	return DepTreeManager{useWrapper: params.UseWrapper, depsRepo: params.DepsRepo, server: params.Server}
+	return DepTreeManager{useWrapper: params.UseWrapper, depsRepo: params.DepsRepo, server: params.Server, useIncludedBuilds: params.UseIncludedBuilds}
 }
 
 // The structure of a dependency tree of a module in a Gradle/Maven project, as created by the gradle-dep-tree and maven-dep-tree plugins.
@@ -78,10 +80,13 @@ func GetModuleTreeAndDependencies(module *moduleDepTree) (*xrayUtils.GraphNode,
 			childId := GavPackageTypeIdentifier + childName
 			childrenList = append(childrenList, childId)
 		}
+
 		moduleTreeMap[dependencyId] = xray.DepTreeNode{
-			Classifier: dependency.Classifier,
-			Types:      dependency.Types,
-			Children:   childrenList,
+			Classifier:     dependency.Classifier,
+			Types:          dependency.Types,
+			Children:       childrenList,
+			Unresolved:     dependency.Unresolved,
+			Configurations: dependency.Configurations,
 		}
 	}
 	return xray.BuildXrayDependencyTree(moduleTreeMap, GavPackageTypeIdentifier+module.Root)

sca/bom/buildinfo/technologies/java/gradle.go

@@ -163,7 +163,8 @@ func (gdt *gradleDepTreeManager) execGradleDepTree(depTreeDir string) (outputFil
 		"-q",
 		gradleNoCacheFlag,
 		fmt.Sprintf("-Dcom.jfrog.depsTreeOutputFile=%s", outputFilePath),
-		"-Dcom.jfrog.includeAllBuildFiles=true"}
+		"-Dcom.jfrog.includeAllBuildFiles=true",
+		fmt.Sprintf("-Dcom.jfrog.includeIncludedBuilds=%t", gdt.useIncludedBuilds)}
 
 	// Add curation audit mode for pass-through functionality if this is a curation command
 	if gdt.isCurationCmd {

sca/bom/buildinfo/technologies/java/gradle_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/tests"
+
 	"github.com/jfrog/jfrog-cli-security/sca/bom/buildinfo/technologies"
 
 	"github.com/stretchr/testify/assert"
@@ -91,6 +92,30 @@ func TestGradleTreesWithConfig(t *testing.T) {
 	}
 }
 
+func TestGradleTreesWithConfig_UsingIncludedBuilds(t *testing.T) {
+	// Create and change directory to test workspace
+	tempDirPath, cleanUp := technologies.CreateTestWorkspace(t, filepath.Join("projects", "package-managers", "gradle", "gradle-example-included-builds"))
+	defer cleanUp()
+	assert.NoError(t, os.Chmod(filepath.Join(tempDirPath, "gradlew"), 0700))
+
+	// Run getModulesDependencyTrees
+	modulesDependencyTrees, uniqueDeps, err := buildGradleDependencyTree(&DepTreeParams{UseWrapper: true, UseIncludedBuilds: true})
+	if assert.NoError(t, err) && assert.NotNil(t, modulesDependencyTrees) {
+		assert.Len(t, modulesDependencyTrees, 4)
+		assert.Len(t, uniqueDeps, 10)
+		// Check module
+		module := tests.GetAndAssertNode(t, modulesDependencyTrees, "org.jfrog.test.gradle.publish:api:1.0-SNAPSHOT")
+		assert.Len(t, module.Nodes, 4)
+
+		// Check direct dependency
+		directDependency := tests.GetAndAssertNode(t, module.Nodes, "commons-lang:commons-lang:2.4")
+		assert.Len(t, directDependency.Nodes, 1)
+
+		// Check transitive dependency
+		tests.GetAndAssertNode(t, directDependency.Nodes, "commons-io:commons-io:1.2")
+	}
+}
+
 func TestIsGradleWrapperExist(t *testing.T) {
 	// Check Gradle wrapper doesn't exist
 	isWrapperExist, err := isGradleWrapperExist()

tests/testdata/projects/package-managers/go/curation-project/go.sum

@@ -0,0 +1,3 @@
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+rsc.io/quote v1.5.2/go.mod h1:LzX7hefJvL54yjefDEDHNONDjII0t9xZLPXsUe+TKr0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

tests/testdata/projects/package-managers/gradle/gradle-example-included-builds/.jfrog/projects/gradle.yaml

@@ -0,0 +1,4 @@
+version: 1
+type: gradle
+usePlugin: true
+useWrapper: true

tests/testdata/projects/package-managers/gradle/gradle-example-included-builds/api/build.gradle

@@ -0,0 +1,81 @@
+configurations {
+    spi
+}
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '4+')
+    }
+    configurations.classpath {
+        resolutionStrategy {
+            cacheDynamicVersionsFor 0, 'seconds'
+            cacheChangingModulesFor 0, 'seconds'
+        }
+    }
+}
+
+apply plugin: 'com.jfrog.artifactory'
+group = 'org.jfrog.test.gradle.publish'
+version = currentVersion
+status = 'Integration'
+repositories {
+    mavenCentral()
+}
+
+apply plugin: 'java'
+apply plugin: 'maven-publish'
+
+dependencies {
+    testImplementation 'junit:junit:4.7'
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifact(file("$rootDir/gradle.properties"))
+        }
+    }
+}
+
+apply plugin: 'ivy-publish'
+
+publishing {
+    publications {
+        ivyJava(IvyPublication) {
+            from components.java
+            artifact(file("$rootDir/settings.gradle")) {
+                name "gradle-settings"
+                extension "txt"
+                type "text"
+            }
+            // The config below will add a extra attribute to the ivy.xml
+            // See http://ant.apache.org/ivy/history/latest-milestone/concept.html#extra
+            descriptor.withXml {
+                asNode().info[0].attributes().put('e:architecture', 'amd64')
+            }
+        }
+    }
+}
+
+artifactoryPublish {
+    publications(publishing.publications.ivyJava)
+    properties {
+        simpleFile '**:**:**:*@*', simpleFile: 'only on settings file'
+    }
+}
+
+dependencies {
+    implementation project(':shared')
+    implementation module("commons-lang:commons-lang:2.4") {
+        dependency("commons-io:commons-io:1.2")
+    }
+    implementation group: 'org.apache.wicket', name: 'wicket', version: '1.3.7'
+
+}
+
+// Just a smoke test that using this option does not lead to any exception
+compileJava.options.compilerArgs = ['-Xlint:unchecked']

tests/testdata/projects/package-managers/gradle/gradle-example-included-builds/api/gradle.properties

@@ -0,0 +1,3 @@
+currentVersion=1.0-SNAPSHOT
+artifactory_user=admin
+artifactory_password=password

tests/testdata/projects/package-managers/gradle/gradle-example-included-builds/api/settings.gradle

@@ -0,0 +1,5 @@
+rootProject.name = 'api'
+//include 'proj'
+
+include ':shared'
+project(':shared').projectDir=file("$rootDir/../shared")

tests/testdata/projects/package-managers/gradle/gradle-example-included-builds/api/src/main/java/org/gradle/api/PersonList.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2011 JFrog Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.gradle.api;
+
+import org.gradle.apiImpl.Impl;
+import org.gradle.shared.Person;
+
+import java.util.ArrayList;
+
+
+public class PersonList {
+    private ArrayList<Person> persons = new ArrayList<Person>();
+
+    public void doSomethingWithImpl() {
+        org.apache.commons.lang.builder.ToStringBuilder stringBuilder;
+        try {
+            Class.forName("org.apache.commons.io.FileUtils");
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        new Impl().implMethod();
+    }
+
+}