Initial working solution

Author: fastlag

internal/callgraph/cgexec/command.go

@@ -109,7 +109,13 @@ func RunCommand(cmd ICommand, ctx IContext) error {
 	go func() {
 		err := cmd.Wait()
 		if err != nil {
-			err = fmt.Errorf("Command '%s' executed in folder '%s' gave the following error: \n%s\n%s", args, cmd.GetDir(), cmd.GetStdOut().String(), cmd.GetStdErr().String())
+			err = fmt.Errorf(
+				"Command '%s' executed in folder '%s' gave the following error: \n%s\n%s",
+				args,
+				cmd.GetDir(),
+				cmd.GetStdOut().String(),
+				cmd.GetStdErr().String(),
+			)
 		}
 
 		done <- err

internal/callgraph/language/java/callgraph.go

@@ -1,6 +1,8 @@
 package java
 
 import (
+	"regexp"
+
 	"github.com/debricked/cli/internal/callgraph/cgexec"
 	ioFs "github.com/debricked/cli/internal/io"
 )
@@ -13,11 +15,13 @@ type ICallgraph interface {
 type Callgraph struct {
 	cmdFactory       ICmdFactory
 	filesystem       ioFs.IFileSystem
+	archive          ioFs.IArchive
 	workingDirectory string
 	targetClasses    []string
 	targetDir        string
 	outputName       string
 	ctx              cgexec.IContext
+	sootHandler      ISootHandler
 }
 
 func NewCallgraph(
@@ -27,7 +31,9 @@ func NewCallgraph(
 	targetDir string,
 	outputName string,
 	filesystem ioFs.IFileSystem,
+	archive ioFs.IArchive,
 	ctx cgexec.IContext,
+	sootHandler ISootHandler,
 ) Callgraph {
 	return Callgraph{
 		cmdFactory:       cmdFactory,
@@ -36,30 +42,55 @@ func NewCallgraph(
 		targetDir:        targetDir,
 		outputName:       outputName,
 		filesystem:       filesystem,
+		archive:          archive,
 		ctx:              ctx,
+		sootHandler:      sootHandler,
 	}
 }
 
 func (cg *Callgraph) RunCallGraphWithSetup() error {
-	tempDir, err := cg.filesystem.MkdirTemp("jar")
+	version, err := cg.javaVersion(".")
 	if err != nil {
 		return err
 	}
-	defer cg.filesystem.RemoveAll(tempDir)
 
-	tempJarFile, err := initializeSootWrapper(cg.filesystem, tempDir)
+	jarFile, err := cg.sootHandler.GetSootWrapper(version, cg.filesystem, cg.archive)
 	if err != nil {
 
 		return err
 	}
 
-	err = cg.RunCallGraph(tempJarFile)
+	err = cg.RunCallGraph(jarFile)
 
 	return err
 }
 
+func (cg *Callgraph) javaVersion(path string) (string, error) {
+	osCmd, err := cg.cmdFactory.MakeJavaVersionCmd(path, cg.ctx)
+	if err != nil {
+
+		return "", err
+	}
+
+	cmd := cgexec.NewCommand(osCmd)
+	err = cgexec.RunCommand(*cmd, cg.ctx)
+	javaVersionRegex := regexp.MustCompile(`\b(\d+)\.\d+\.\d+\b`)
+	match := javaVersionRegex.FindStringSubmatch(cmd.GetStdOut().String())
+	if len(match) > 1 {
+		return match[1], nil
+	}
+	return "", err
+}
+
 func (cg *Callgraph) RunCallGraph(callgraphJarPath string) error {
-	osCmd, err := cg.cmdFactory.MakeCallGraphGenerationCmd(callgraphJarPath, cg.workingDirectory, cg.targetClasses, cg.targetDir, cg.outputName, cg.ctx)
+	osCmd, err := cg.cmdFactory.MakeCallGraphGenerationCmd(
+		callgraphJarPath,
+		cg.workingDirectory,
+		cg.targetClasses,
+		cg.targetDir,
+		cg.outputName,
+		cg.ctx,
+	)
 	if err != nil {
 
 		return err

internal/callgraph/language/java/callgraph_test.go

@@ -13,57 +13,21 @@ func TestRunCallGraphWithSetupMock(t *testing.T) {
 
 	cmdMock := testdata.NewEchoCmdFactory()
 	fsMock := ioTestData.FileSystemMock{}
-	cg := NewCallgraph(cmdMock, ".", []string{"."}, ".", ".", fsMock, nil)
+	arcMock := ioTestData.ArchiveMock{}
+	swMock := testdata.MockSootHandler{}
+	cg := NewCallgraph(cmdMock, ".", []string{"."}, ".", ".", fsMock, arcMock, nil, swMock)
 
 	err := cg.RunCallGraphWithSetup()
 
 	assert.Nil(t, err)
 }
 
-func TestFsOpenEmbedError(t *testing.T) {
-	cmdMock := testdata.NewEchoCmdFactory()
-	fsMock := ioTestData.FileSystemMock{FsOpenEmbedError: fmt.Errorf("error")}
-	cg := NewCallgraph(cmdMock, ".", []string{"."}, ".", ".", fsMock, nil)
-
-	err := cg.RunCallGraphWithSetup()
-
-	assert.NotNil(t, err)
-}
-
-func TestMkdirTempError(t *testing.T) {
-	cmdMock := testdata.NewEchoCmdFactory()
-	fsMock := ioTestData.FileSystemMock{MkdirTempError: fmt.Errorf("error")}
-	cg := NewCallgraph(cmdMock, ".", []string{"."}, ".", ".", fsMock, nil)
-
-	err := cg.RunCallGraphWithSetup()
-
-	assert.NotNil(t, err)
-}
-
-func TestReadAllError(t *testing.T) {
-	cmdMock := testdata.NewEchoCmdFactory()
-	fsMock := ioTestData.FileSystemMock{FsReadAllError: fmt.Errorf("error")}
-	cg := NewCallgraph(cmdMock, ".", []string{"."}, ".", ".", fsMock, nil)
-
-	err := cg.RunCallGraphWithSetup()
-
-	assert.NotNil(t, err)
-}
-
-func TestWriteFileError(t *testing.T) {
-	cmdMock := testdata.NewEchoCmdFactory()
-	fsMock := ioTestData.FileSystemMock{FsWriteFileError: fmt.Errorf("error")}
-	cg := NewCallgraph(cmdMock, ".", []string{"."}, ".", ".", fsMock, nil)
-
-	err := cg.RunCallGraphWithSetup()
-
-	assert.NotNil(t, err)
-}
-
 func TestRunCallGraphMock(t *testing.T) {
 	cmdMock := testdata.NewEchoCmdFactory()
 	fsMock := ioTestData.FileSystemMock{}
-	cg := NewCallgraph(cmdMock, ".", []string{"."}, ".", ".", fsMock, nil)
+	arcMock := ioTestData.ArchiveMock{}
+	swMock := testdata.MockSootHandler{}
+	cg := NewCallgraph(cmdMock, ".", []string{"."}, ".", ".", fsMock, arcMock, nil, swMock)
 
 	err := cg.RunCallGraph(".")
 
@@ -74,7 +38,9 @@ func TestRunCallGraphErrorMock(t *testing.T) {
 	cmdMock := testdata.NewEchoCmdFactory()
 	cmdMock.CallGraphGenErr = fmt.Errorf("error")
 	fsMock := ioTestData.FileSystemMock{}
-	cg := NewCallgraph(cmdMock, ".", []string{"."}, ".", ".", fsMock, nil)
+	arcMock := ioTestData.ArchiveMock{}
+	swMock := testdata.MockSootHandler{}
+	cg := NewCallgraph(cmdMock, ".", []string{"."}, ".", ".", fsMock, arcMock, nil, swMock)
 
 	err := cg.RunCallGraph(".")
 

internal/callgraph/language/java/cmd_factory.go

@@ -10,6 +10,7 @@ type ICmdFactory interface {
 	MakeMvnCopyDependenciesCmd(workingDirectory string, targetDir string, ctx cgexec.IContext) (*exec.Cmd, error)
 	MakeCallGraphGenerationCmd(callgraphJarPath string, workingDirectory string, targetClasses []string, dependencyClasses string, outputName string, ctx cgexec.IContext) (*exec.Cmd, error)
 	MakeBuildMavenCmd(workingDirectory string, ctx cgexec.IContext) (*exec.Cmd, error)
+	MakeJavaVersionCmd(workingDirectory string, ctx cgexec.IContext) (*exec.Cmd, error)
 }
 
 type CmdFactory struct{}
@@ -71,3 +72,13 @@ func (_ CmdFactory) MakeBuildMavenCmd(workingDirectory string, ctx cgexec.IConte
 
 	return cgexec.MakeCommand(workingDirectory, path, args, ctx), err
 }
+
+func (_ CmdFactory) MakeJavaVersionCmd(workingDirectory string, ctx cgexec.IContext) (*exec.Cmd, error) {
+	path, err := exec.LookPath("java")
+	args := []string{
+		"java",
+		"--version",
+	}
+
+	return cgexec.MakeCommand(workingDirectory, path, args, ctx), err
+}

internal/callgraph/language/java/job.go

@@ -22,21 +22,33 @@ const (
 
 type Job struct {
 	job.BaseJob
-	cmdFactory ICmdFactory
-	config     conf.IConfig
-	archive    io.IArchive
-	ctx        cgexec.IContext
-	fs         ioFs.IFileSystem
+	cmdFactory  ICmdFactory
+	config      conf.IConfig
+	archive     io.IArchive
+	ctx         cgexec.IContext
+	fs          ioFs.IFileSystem
+	sootHandler ISootHandler
 }
 
-func NewJob(dir string, files []string, cmdFactory ICmdFactory, writer ioFs.IFileWriter, archive io.IArchive, config conf.IConfig, ctx cgexec.IContext, fs ioFs.IFileSystem) *Job {
+func NewJob(
+	dir string,
+	files []string,
+	cmdFactory ICmdFactory,
+	writer ioFs.IFileWriter,
+	archive io.IArchive,
+	config conf.IConfig,
+	ctx cgexec.IContext,
+	fs ioFs.IFileSystem,
+	sootHandler ISootHandler,
+) *Job {
 	return &Job{
-		BaseJob:    job.NewBaseJob(dir, files),
-		cmdFactory: cmdFactory,
-		config:     config,
-		archive:    archive,
-		ctx:        ctx,
-		fs:         fs,
+		BaseJob:     job.NewBaseJob(dir, files),
+		cmdFactory:  cmdFactory,
+		config:      config,
+		archive:     archive,
+		ctx:         ctx,
+		fs:          fs,
+		sootHandler: sootHandler,
 	}
 }
 
@@ -78,7 +90,9 @@ func (j *Job) Run() {
 		targetDir,
 		outputName,
 		j.fs,
+		j.archive,
 		j.ctx,
+		j.sootHandler,
 	)
 	j.SendStatus("generating call graph")
 	j.runCallGraph(&callgraph)