From 9fb4156b13e4d70a17a045c6e9580d03bee0d5a6 Mon Sep 17 00:00:00 2001 From: Eyal Delarea Date: Thu, 21 Nov 2024 12:22:40 +0200 Subject: [PATCH 1/2] Nuget - Add `allowInsecureConnections` flag for package sources (#1302) --- artifactory/commands/dotnet/dotnetcommand.go | 33 +++++++++++-------- .../commands/dotnet/dotnetcommand_test.go | 19 ++++++----- go.mod | 2 +- go.sum | 4 +-- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/artifactory/commands/dotnet/dotnetcommand.go b/artifactory/commands/dotnet/dotnetcommand.go index 3f83a14d4..fd83131b5 100644 --- a/artifactory/commands/dotnet/dotnetcommand.go +++ b/artifactory/commands/dotnet/dotnetcommand.go @@ -30,14 +30,16 @@ The initial error is: ) type DotnetCommand struct { - toolchainType dotnet.ToolchainType - subCommand string - argAndFlags []string - repoName string - solutionPath string - useNugetV2 bool - buildConfiguration *commonBuild.BuildConfiguration - serverDetails *config.ServerDetails + toolchainType dotnet.ToolchainType + subCommand string + argAndFlags []string + repoName string + solutionPath string + useNugetV2 bool + // By default, package sources are required to use HTTPS. This option allows sources to use HTTP. + allowInsecureConnections bool + buildConfiguration *commonBuild.BuildConfiguration + serverDetails *config.ServerDetails } func (dc *DotnetCommand) SetServerDetails(serverDetails *config.ServerDetails) *DotnetCommand { @@ -70,6 +72,11 @@ func (dc *DotnetCommand) SetUseNugetV2(useNugetV2 bool) *DotnetCommand { return dc } +func (dc *DotnetCommand) SetAllowInsecureConnections(allowInsecureConnections bool) *DotnetCommand { + dc.allowInsecureConnections = allowInsecureConnections + return dc +} + func (dc *DotnetCommand) SetArgAndFlags(argAndFlags []string) *DotnetCommand { dc.argAndFlags = argAndFlags return dc @@ -242,7 +249,7 @@ func (dc *DotnetCommand) prepareConfigFileIfNeeded() (cleanup func() error, err return fileutils.RemoveTempDir(tempDirPath) } - configFile, err := InitNewConfig(tempDirPath, dc.repoName, dc.serverDetails, dc.useNugetV2) + configFile, err := InitNewConfig(tempDirPath, dc.repoName, dc.serverDetails, dc.useNugetV2, dc.allowInsecureConnections) if err == nil { dc.argAndFlags = append(dc.argAndFlags, dc.GetToolchain().GetTypeFlagPrefix()+"configfile", configFile.Name()) } @@ -269,7 +276,7 @@ func getFlagValueIfExists(cmdFlag string, argAndFlags []string) (string, error) } // InitNewConfig is used when neither of the flags were provided, and we need to init our own config. -func InitNewConfig(configDirPath, repoName string, server *config.ServerDetails, useNugetV2 bool) (configFile *os.File, err error) { +func InitNewConfig(configDirPath, repoName string, server *config.ServerDetails, useNugetV2, allowInsecureConnections bool) (configFile *os.File, err error) { // Initializing a new NuGet config file that NuGet will use into a temp file configFile, err = os.CreateTemp(configDirPath, configFilePattern) if errorutils.CheckError(err) != nil { @@ -283,12 +290,12 @@ func InitNewConfig(configDirPath, repoName string, server *config.ServerDetails, // We would prefer to write the NuGet configuration using the `nuget add source` command, // but the NuGet configuration utility doesn't currently allow setting protocolVersion. // Until that is supported, the templated method must be used. - err = addSourceToNugetTemplate(configFile, server, useNugetV2, repoName) + err = addSourceToNugetTemplate(configFile, server, useNugetV2, repoName, allowInsecureConnections) return } // Adds a source to the nuget config template -func addSourceToNugetTemplate(configFile *os.File, server *config.ServerDetails, useNugetV2 bool, repoName string) error { +func addSourceToNugetTemplate(configFile *os.File, server *config.ServerDetails, useNugetV2 bool, repoName string, allowInsecureConnections bool) error { sourceUrl, user, password, err := GetSourceDetails(server, repoName, useNugetV2) if err != nil { return err @@ -301,7 +308,7 @@ func addSourceToNugetTemplate(configFile *os.File, server *config.ServerDetails, } // Format the templates - _, err = fmt.Fprintf(configFile, dotnet.ConfigFileFormat, sourceUrl, protoVer, user, password) + _, err = fmt.Fprintf(configFile, dotnet.ConfigFileFormat, sourceUrl, protoVer, allowInsecureConnections, user, password) return err } diff --git a/artifactory/commands/dotnet/dotnetcommand_test.go b/artifactory/commands/dotnet/dotnetcommand_test.go index e2aa89f99..3123cab0a 100644 --- a/artifactory/commands/dotnet/dotnetcommand_test.go +++ b/artifactory/commands/dotnet/dotnetcommand_test.go @@ -74,7 +74,7 @@ func TestInitNewConfig(t *testing.T) { User: "user", Password: "pass", } - configFile, err := InitNewConfig(tmpDir, repoName, server, false) + configFile, err := InitNewConfig(tmpDir, repoName, server, false, true) assert.NoError(t, err) f, err := os.Open(configFile.Name()) assert.NoError(t, err) @@ -87,7 +87,7 @@ func TestInitNewConfig(t *testing.T) { assert.Equal(t, ` - + @@ -98,7 +98,7 @@ func TestInitNewConfig(t *testing.T) { `, string(buf[:n])) server.Password = "" server.AccessToken = "abc123" - configFile, err = InitNewConfig(tmpDir, repoName, server, true) + configFile, err = InitNewConfig(tmpDir, repoName, server, true, false) assert.NoError(t, err) updatedConfigFile, err := os.Open(configFile.Name()) assert.NoError(t, err) @@ -111,7 +111,7 @@ func TestInitNewConfig(t *testing.T) { assert.Equal(t, ` - + @@ -164,11 +164,12 @@ func testPrepareDotnetBuildInfoModule(t *testing.T, subCommand string, flags []s }() module := createNewDotnetModule(t, tmpDir) cmd := DotnetCommand{ - toolchainType: dotnet.DotnetCore, - subCommand: subCommand, - argAndFlags: flags, - buildConfiguration: buildUtils.NewBuildConfiguration("", "", "mod", ""), - serverDetails: &config.ServerDetails{ArtifactoryUrl: "https://my-instance.jfrog.io"}, + toolchainType: dotnet.DotnetCore, + subCommand: subCommand, + argAndFlags: flags, + buildConfiguration: buildUtils.NewBuildConfiguration("", "", "mod", ""), + serverDetails: &config.ServerDetails{ArtifactoryUrl: "https://my-instance.jfrog.io"}, + allowInsecureConnections: true, } callbackFunc, err := cmd.prepareDotnetBuildInfoModule(module) if !assert.NoError(t, err) { diff --git a/go.mod b/go.mod index 88b7368e4..b186c18ea 100644 --- a/go.mod +++ b/go.mod @@ -98,6 +98,6 @@ require ( // replace github.com/jfrog/jfrog-client-go => github.com/eyalbe4/jfrog-client-go v1.28.1-0.20241103083749-45c13ff7fe16 -// replace github.com/jfrog/build-info-go => github.com/galusben/build-info-go v0.0.0-20240930113238-ac3b31030284 +replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20241121100855-e7a75ceee2bd // replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.3.3-0.20231223133729-ef57bd08cedc diff --git a/go.sum b/go.sum index 26c80cd3a..b93e2e890 100644 --- a/go.sum +++ b/go.sum @@ -89,8 +89,8 @@ github.com/jedib0t/go-pretty/v6 v6.6.1 h1:iJ65Xjb680rHcikRj6DSIbzCex2huitmc7bDtx github.com/jedib0t/go-pretty/v6 v6.6.1/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E= github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI= github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw= -github.com/jfrog/build-info-go v1.10.5 h1:cW03JlPlKv7RMUU896uLUxyLWXAmCgR5Y5QX0fwgz0Q= -github.com/jfrog/build-info-go v1.10.5/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE= +github.com/jfrog/build-info-go v1.8.9-0.20241121100855-e7a75ceee2bd h1:PzxnJ1mjHIL4bAC4RPm87WnJ1TZXFBicyOhtIHRQH6g= +github.com/jfrog/build-info-go v1.8.9-0.20241121100855-e7a75ceee2bd/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE= github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s= github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4= github.com/jfrog/jfrog-client-go v1.48.0 h1:hx5B7+Wnobmzq4aFVZtALtbEVDFcjpn0Wb4q2m6H4KU= From 04daeb8132c3152d70218cc0b2957213ba451e67 Mon Sep 17 00:00:00 2001 From: Eyal Delarea Date: Thu, 21 Nov 2024 18:31:58 +0200 Subject: [PATCH 2/2] FIx Nuget & DotNet tests (#1305) --- artifactory/commands/dotnet/dotnetcommand.go | 3 ++- artifactory/commands/dotnet/dotnetcommand_test.go | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/artifactory/commands/dotnet/dotnetcommand.go b/artifactory/commands/dotnet/dotnetcommand.go index fd83131b5..57cd73d4f 100644 --- a/artifactory/commands/dotnet/dotnetcommand.go +++ b/artifactory/commands/dotnet/dotnetcommand.go @@ -19,7 +19,8 @@ import ( ) const ( - SourceName = "JFrogArtifactory" + // SourceName should match the one in the config file template. + SourceName = "JFrogCli" configFilePattern = "jfrog.cli.nuget." dotnetTestError = `the command failed with an error. diff --git a/artifactory/commands/dotnet/dotnetcommand_test.go b/artifactory/commands/dotnet/dotnetcommand_test.go index 3123cab0a..f64af2bbd 100644 --- a/artifactory/commands/dotnet/dotnetcommand_test.go +++ b/artifactory/commands/dotnet/dotnetcommand_test.go @@ -98,7 +98,7 @@ func TestInitNewConfig(t *testing.T) { `, string(buf[:n])) server.Password = "" server.AccessToken = "abc123" - configFile, err = InitNewConfig(tmpDir, repoName, server, true, false) + configFile, err = InitNewConfig(tmpDir, repoName, server, true, true) assert.NoError(t, err) updatedConfigFile, err := os.Open(configFile.Name()) assert.NoError(t, err) @@ -111,7 +111,7 @@ func TestInitNewConfig(t *testing.T) { assert.Equal(t, ` - +