Merge branch 'bc/wildcard-credential'

gitster · gitster · commit fd65fc3960a9 · 2020-05-05T14:54:26.000-07:00
Update the parser used for credential.&lt;URL&gt;.&lt;variable&gt;
configuration, to handle &lt;URL&gt;s with '/' in them correctly.

* bc/wildcard-credential:
  credential: fix matching URLs with multiple levels in path
diff --git a/credential.c b/credential.c
@@ -136,14 +136,14 @@ static void credential_format(struct credential *c, struct strbuf *out)
 		return;
 	strbuf_addf(out, "%s://", c->protocol);
 	if (c->username && *c->username) {
-		strbuf_add_percentencode(out, c->username);
+		strbuf_add_percentencode(out, c->username, STRBUF_ENCODE_SLASH);
 		strbuf_addch(out, '@');
 	}
 	if (c->host)
 		strbuf_addstr(out, c->host);
 	if (c->path) {
 		strbuf_addch(out, '/');
-		strbuf_add_percentencode(out, c->path);
+		strbuf_add_percentencode(out, c->path, 0);
 	}
 }
 
diff --git a/strbuf.c b/strbuf.c
@@ -479,15 +479,17 @@ void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src)
 	}
 }
 
-#define URL_UNSAFE_CHARS " <>\"%{}|\\^`:/?#[]@!$&'()*+,;="
+#define URL_UNSAFE_CHARS " <>\"%{}|\\^`:?#[]@!$&'()*+,;="
 
-void strbuf_add_percentencode(struct strbuf *dst, const char *src)
+void strbuf_add_percentencode(struct strbuf *dst, const char *src, int flags)
 {
 	size_t i, len = strlen(src);
 
 	for (i = 0; i < len; i++) {
 		unsigned char ch = src[i];
-		if (ch <= 0x1F || ch >= 0x7F || strchr(URL_UNSAFE_CHARS, ch))
+		if (ch <= 0x1F || ch >= 0x7F ||
+		    (ch == '/' && (flags & STRBUF_ENCODE_SLASH)) ||
+		    strchr(URL_UNSAFE_CHARS, ch))
 			strbuf_addf(dst, "%%%02X", (unsigned char)ch);
 		else
 			strbuf_addch(dst, ch);
diff --git a/strbuf.h b/strbuf.h
@@ -378,11 +378,16 @@ size_t strbuf_expand_dict_cb(struct strbuf *sb,
  */
 void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src);
 
+#define STRBUF_ENCODE_SLASH 1
+
 /**
  * Append the contents of a string to a strbuf, percent-encoding any characters
  * that are needed to be encoded for a URL.
+ *
+ * If STRBUF_ENCODE_SLASH is set in flags, percent-encode slashes.  Otherwise,
+ * slashes are not percent-encoded.
  */
-void strbuf_add_percentencode(struct strbuf *dst, const char *src);
+void strbuf_add_percentencode(struct strbuf *dst, const char *src, int flags);
 
 /**
  * Append the given byte size as a human-readable string (i.e. 12.23 KiB,
diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh
@@ -366,6 +366,51 @@ test_expect_success 'match percent-encoded values' '
 	EOF
 '
 
+test_expect_success 'match percent-encoded UTF-8 values in path' '
+	test_config credential.https://example.com.useHttpPath true &&
+	test_config credential.https://example.com/perú.git.helper "$HELPER" &&
+	check fill <<-\EOF
+	url=https://example.com/per%C3%BA.git
+	--
+	protocol=https
+	host=example.com
+	path=perú.git
+	username=foo
+	password=bar
+	--
+	EOF
+'
+
+test_expect_success 'match percent-encoded values in username' '
+	test_config credential.https://user%2fname@example.com/foo/bar.git.helper "$HELPER" &&
+	check fill <<-\EOF
+	url=https://user%2fname@example.com/foo/bar.git
+	--
+	protocol=https
+	host=example.com
+	username=foo
+	password=bar
+	--
+	EOF
+'
+
+test_expect_success 'fetch with multiple path components' '
+	test_unconfig credential.helper &&
+	test_config credential.https://example.com/foo/repo.git.helper "verbatim foo bar" &&
+	check fill <<-\EOF
+	url=https://example.com/foo/repo.git
+	--
+	protocol=https
+	host=example.com
+	username=foo
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.com
+	EOF
+'
+
 test_expect_success 'pull username from config' '
 	test_config credential.https://example.com.username foo &&
 	check fill <<-\EOF

Original file line number	Diff line number	Diff line change
`@@ -136,14 +136,14 @@ static void credential_format(struct credential c, struct strbuf out)`
`136`	`136`	`return;`
`137`	`137`	`strbuf_addf(out, "%s://", c->protocol);`
`138`	`138`	`if (c->username && *c->username) {`
`139`		`- strbuf_add_percentencode(out, c->username);`
	`139`	`+ strbuf_add_percentencode(out, c->username, STRBUF_ENCODE_SLASH);`
`140`	`140`	`strbuf_addch(out, '@');`
`141`	`141`	`}`
`142`	`142`	`if (c->host)`
`143`	`143`	`strbuf_addstr(out, c->host);`
`144`	`144`	`if (c->path) {`
`145`	`145`	`strbuf_addch(out, '/');`
`146`		`- strbuf_add_percentencode(out, c->path);`
	`146`	`+ strbuf_add_percentencode(out, c->path, 0);`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -479,15 +479,17 @@ void strbuf_addbuf_percentquote(struct strbuf dst, const struct strbuf src)`
`479`	`479`	`}`
`480`	`480`	`}`
`481`	`481`
`482`		-#define URL_UNSAFE_CHARS " <>\"%{}\|\\^`:/?#[]@!$&'()*+,;="
	`482`	+#define URL_UNSAFE_CHARS " <>\"%{}\|\\^`:?#[]@!$&'()*+,;="
`483`	`483`
`484`		`-void strbuf_add_percentencode(struct strbuf dst, const char src)`
	`484`	`+void strbuf_add_percentencode(struct strbuf dst, const char src, int flags)`
`485`	`485`	`{`
`486`	`486`	`size_t i, len = strlen(src);`
`487`	`487`
`488`	`488`	`for (i = 0; i < len; i++) {`
`489`	`489`	`unsigned char ch = src[i];`
`490`		`- if (ch <= 0x1F \|\| ch >= 0x7F \|\| strchr(URL_UNSAFE_CHARS, ch))`
	`490`	`+ if (ch <= 0x1F \|\| ch >= 0x7F \|\|`
	`491`	`+ (ch == '/' && (flags & STRBUF_ENCODE_SLASH)) \|\|`
	`492`	`+ strchr(URL_UNSAFE_CHARS, ch))`
`491`	`493`	`strbuf_addf(dst, "%%%02X", (unsigned char)ch);`
`492`	`494`	`else`
`493`	`495`	`strbuf_addch(dst, ch);`