Merge remote-tracking branch 'upstream/dev'

Author: EyalDelarea

artifactory/commands/transferfiles/transfer_test.go

@@ -87,11 +87,11 @@ func TestSignalStopError(t *testing.T) {
 }
 
 const (
-	//#nosec G101 - Dummy token for tests.
+	//#nosec G101 jfrog-ignore - Dummy token for tests.
 	firstUuidTokenForTest = "347cd3e9-86b6-4bec-9be9-e053a485f327"
-	//#nosec G101 - Dummy token for tests.
+	//#nosec G101 jfrog-ignore - Dummy token for tests.
 	secondUuidTokenForTest = "af14706e-e0c1-4b7d-8791-6a18bd1fd339"
-	//#nosec G101 - Dummy token for tests.
+	//#nosec G101 jfrog-ignore - Dummy token for tests.
 	nodeIdForTest = "nodea0gwihu76sk5g-artifactory-primary-0"
 )
 

artifactory/utils/container/image.go

@@ -3,6 +3,7 @@ package container
 import (
 	"net/http"
 	"path"
+	"strconv"
 	"strings"
 
 	"github.com/jfrog/jfrog-client-go/artifactory"
@@ -152,6 +153,9 @@ func (image *Image) GetRemoteRepo(serviceManager artifactory.ArtifactoryServices
 	if err != nil {
 		return "", err
 	}
+	if resp.StatusCode == http.StatusForbidden {
+		return "", errorutils.CheckErrorf(getStatusForbiddenErrorMessage())
+	}
 	if resp.StatusCode != http.StatusOK {
 		return "", errorutils.CheckErrorf("error while getting docker repository name. Artifactory response: " + resp.Status)
 	}
@@ -169,3 +173,10 @@ func buildRequestUrl(longImageName, imageTag, containerRegistryUrl string, https
 	}
 	return "http://" + endpoint
 }
+
+func getStatusForbiddenErrorMessage() string {
+	errorMessage := "error while getting docker repository name. Artifactory response:  " + strconv.Itoa(http.StatusForbidden) +
+		", Possible causes include: \n- Xray scan in progress \n- Xray policy violations \n- insufficient permissions\n- invalid authentication method\n- disabled anonymous access\n- missing Docker manifests." +
+		"\nPlease verify the above factors to resolve the issue."
+	return errorMessage
+}

common/cliutils/spec.go

@@ -4,6 +4,7 @@ import (
 	speccore "github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"strconv"
 	"strings"
 )
 
@@ -62,7 +63,12 @@ func OverrideFieldsIfSet(spec *speccore.File, c *components.Context) {
 // If `fieldName` exist in the cli args, read it to `field` as a string.
 func overrideStringIfSet(field *string, c *components.Context, fieldName string) {
 	if c.IsFlagSet(fieldName) {
-		*field = c.GetStringFlagValue(fieldName)
+		stringFlag := c.GetStringFlagValue(fieldName)
+		if stringFlag != "" {
+			*field = stringFlag
+			return
+		}
+		*field = strconv.FormatBool(c.GetBoolFlagValue(fieldName))
 	}
 }
 

common/cliutils/utils.go

@@ -3,8 +3,10 @@ package cliutils
 import (
 	"errors"
 	"fmt"
+	"github.com/jfrog/jfrog-cli-core/v2/common/project"
 	"io"
 	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -18,6 +20,13 @@ import (
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
 
+const (
+	JfConfigDirName    = ".jfrog"
+	JfConfigFileName   = "config.yml"
+	ApplicationRootYML = "application"
+	Key                = "key"
+)
+
 func FixWinPathBySource(path string, fromSpec bool) string {
 	if strings.Count(path, "/") > 0 {
 		// Assuming forward slashes - not doubling backslash to allow regexp escaping
@@ -251,3 +260,39 @@ func FixWinPathsForFileSystemSourcedCmds(uploadSpec *spec.SpecFiles, specFlag, e
 		}
 	}
 }
+
+// Retrieves the application key from the .jfrog/config file or the environment variable.
+// If the application key is not found in either, returns an empty string.
+func ReadJFrogApplicationKeyFromConfigOrEnv() (applicationKeyValue string) {
+	applicationKeyValue = getApplicationKeyFromConfig()
+	if applicationKeyValue != "" {
+		log.Debug("Found application key in config file:", applicationKeyValue)
+		return
+	}
+	applicationKeyValue = os.Getenv(coreutils.ApplicationKey)
+	if applicationKeyValue != "" {
+		log.Debug("Found application key in environment variable:", applicationKeyValue)
+		return
+	}
+	log.Debug("Application key is not found in the config file or environment variable.")
+	return ""
+}
+
+func getApplicationKeyFromConfig() string {
+	configFilePath := filepath.Join(JfConfigDirName, JfConfigFileName)
+	vConfig, err := project.ReadConfigFile(configFilePath, project.YAML)
+	if err != nil {
+		log.Debug("error reading config file: %v", err)
+		return ""
+	}
+
+	application := vConfig.GetStringMapString(ApplicationRootYML)
+	applicationKey, ok := application[Key]
+	if !ok {
+		log.Debug("Application key is not found in the config file.")
+		return ""
+	}
+
+	log.Debug("Found application key:", applicationKey)
+	return applicationKey
+}

common/cliutils/utils_test.go

@@ -0,0 +1,78 @@
+package cliutils
+
+import (
+	testUtils "github.com/jfrog/jfrog-cli-core/v2/utils/tests"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestReadJFrogApplicationKeyFromConfigOrEnv(t *testing.T) {
+	configFilePath := filepath.Join(JfConfigDirName, JfConfigFileName)
+
+	// Test cases
+	tests := []struct {
+		name           string
+		configContent  string
+		envValue       string
+		expectedResult string
+	}{
+		{
+			name:           "Application key in config file",
+			configContent:  "application:\n  key: configKey",
+			envValue:       "",
+			expectedResult: "configKey",
+		},
+		{
+			name:           "Application key in environment variable",
+			configContent:  "",
+			envValue:       "envKey",
+			expectedResult: "envKey",
+		},
+		{
+			name:           "Application key in both config file and environment variable",
+			configContent:  "application:\n  key: configKey",
+			envValue:       "envKey",
+			expectedResult: "configKey",
+		},
+		{
+			name:           "No application key in config file or environment variable",
+			configContent:  "",
+			envValue:       "",
+			expectedResult: "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Setup temp dir for each test
+			testDirPath, err := filepath.Abs(filepath.Join("../", "tests", "applicationConfigTestDir"))
+			assert.NoError(t, err)
+			_, cleanUp := testUtils.CreateTestWorkspace(t, testDirPath)
+
+			// Write config content to file
+			if tt.configContent != "" {
+				err = os.WriteFile(configFilePath, []byte(tt.configContent), 0644)
+				assert.NoError(t, err)
+			}
+
+			// Set environment variable
+			if tt.envValue != "" {
+				assert.NoError(t, os.Setenv(coreutils.ApplicationKey, tt.envValue))
+			} else {
+				assert.NoError(t, os.Unsetenv(coreutils.ApplicationKey))
+			}
+
+			// Call the function
+			result := ReadJFrogApplicationKeyFromConfigOrEnv()
+
+			// Assert the result
+			assert.Equal(t, tt.expectedResult, result)
+			// delete temp folder
+			cleanUp()
+		})
+	}
+}

common/commands/command.go

@@ -39,6 +39,17 @@ func Exec(command Command) error {
 	return err
 }
 
+// ExecAndThenReportUsage runs the command and then triggers a usage report
+// Is used for commands which don't have the full server details before execution
+// For example: oidc exchange command, which will get access token only after execution.
+func ExecAndThenReportUsage(cc Command) (err error) {
+	if err = cc.Run(); err != nil {
+		return
+	}
+	reportUsage(cc, nil)
+	return
+}
+
 func reportUsage(command Command, channel chan<- bool) {
 	// When the usage reporting is done, signal to the channel.
 	defer signalReportUsageFinished(channel)