config: Ensure address has trailing slash

jsok · Aug 12, 2019 · 22851ae · 22851ae
1 parent 3d38341
commit 22851ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/backend.go b/backend.go
@@ -3,6 +3,7 @@ package artifactory
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -55,7 +56,8 @@ func (b *backend) rtClient(ctx context.Context, s logical.Storage) (*rtHttpClien
 	}
 
 	rtDetails := rtAuth.NewArtifactoryDetails()
-	rtDetails.SetUrl(config.Address)
+	// Ensure trailing slash, rtClient assumes this when building URLs
+	rtDetails.SetUrl(strings.TrimSuffix(config.Address, "/") + "/")
 	rtDetails.SetApiKey(config.ApiKey)
 	rtDetails.SetUser(config.Username)
 	rtDetails.SetPassword(config.Password)

diff --git a/path_config_test.go b/path_config_test.go
@@ -83,7 +83,7 @@ func TestConfig_WriteIdempotent(t *testing.T) {
 	b, storage := newBackend(t)
 
 	data := map[string]interface{}{
-		"address": "https://example.com/artifactory",
+		"address": "https://example.com/artifactory/",
 		"api_key": "abc123",
 	}