Merge pull request #43 from cyberark/fix-space-escapes

Fix escaping of variable spaces

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+# [0.5.1]
+
+* Fix path generation of variables with spaces
 * Modify configuration loading to skip options that check home dirs if there is
   an error retrieving the home dir
 

VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

_setup.sh

@@ -48,9 +48,9 @@ if ! oss_only; then
   exec_on cuke-master conjur host create --as-group security_admin bob
   exec_on cuke-master conjur variable create existent-variable-with-undefined-value
 
-
   vars=(
     'existent-variable-with-defined-value'
+    'a/ b/c'
     'myapp-01'
     'alice@devops'
     'prod/aws/db-password'
@@ -61,6 +61,7 @@ if ! oss_only; then
 
   secrets=(
     'existent-variable-defined-value'
+    'a/ b/c'
     'these'
     'are'
     'all'

conjurapi/router_v4.go

@@ -114,7 +114,7 @@ func (r RouterV4) variableURL(variableID string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return fmt.Sprintf("%s/variables/%s/value", r.Config.ApplianceURL, url.QueryEscape(id)), nil
+	return fmt.Sprintf("%s/variables/%s/value", r.Config.ApplianceURL, url.PathEscape(id)), nil
 }
 
 func (r RouterV4) batchVariableURL(variableIDs []string) string {

conjurapi/router_v5.go

@@ -167,7 +167,7 @@ func (r RouterV5) variableURL(variableID string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return makeRouterURL(r.secretsURL(account), kind, url.QueryEscape(id)).String(), nil
+	return makeRouterURL(r.secretsURL(account), kind, url.PathEscape(id)).String(), nil
 }
 
 func (r RouterV5) batchVariableURL(variableIDs []string) string {

conjurapi/variable_test.go

@@ -92,6 +92,7 @@ func TestClient_RetrieveSecret(t *testing.T) {
 				"research+development": "secret",
 				"sales&marketing":      "strings!",
 				"onemore":              "{\"json\": \"object\"}",
+				"a/ b /c":              "somevalue",
 			}
 
 			policy := ""
@@ -251,6 +252,19 @@ func TestClient_RetrieveSecret(t *testing.T) {
 				So(string(obtainedSecretValue), ShouldEqual, secretValue)
 			})
 
+			Convey("Returns space-pathed existent variable's defined value", func() {
+				variableIdentifier := "a/ b/c"
+				secretValue := "a/ b/c"
+
+				conjur, err := NewClientFromKey(*config, authn.LoginPair{login, apiKey})
+				So(err, ShouldBeNil)
+
+				obtainedSecretValue, err := conjur.RetrieveSecret(variableIdentifier)
+				So(err, ShouldBeNil)
+
+				So(string(obtainedSecretValue), ShouldEqual, secretValue)
+			})
+
 			Convey("Returns 404 on existent variable with undefined value", func() {
 				variableIdentifier := "existent-variable-with-undefined-value"