proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-12 03:28:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Streamline url-parsing logic.

Browse Source
This commit is contained in:
Ben Straub 2013-11-01 15:29:25 -07:00
parent 567649f2ad
commit 7e0359084e
2 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/netops.c
View File

@ -668,47 +668,47 @@ int gitno_extract_url_parts(
const char *url, const char *url,
const char *default_port) const char *default_port)
{ {
char *colon, *slash, *at, *end; char *colon, *slash, *at;
const char *start;
/* /*
* ==> [user[:pass]@]hostname.tld[:port]/resource * ==> [user[:pass]@]hostname.tld[:port]/resource
*/ */
colon = strchr(url, ':'); /* Check for user and maybe password */
slash = strchr(url, '/');
at = strchr(url, '@'); at = strchr(url, '@');
if (at) {
colon = strchr(url, ':');
if (colon && colon < at) {
/* user:pass */
*username = git__substrdup(url, colon-url);
*password = git__substrdup(colon+1, at-colon-1);
GITERR_CHECK_ALLOC(*password);
} else {
*username = git__substrdup(url, at-url);
}
GITERR_CHECK_ALLOC(*username);
url = at + 1;
}
/* Validate URL format. Colons shouldn't be in the path part. */
slash = strchr(url, '/');
colon = strchr(url, ':');
if (!slash || if (!slash ||
(colon && (slash < colon))) { (colon && (slash < colon))) {
giterr_set(GITERR_NET, "Malformed URL"); giterr_set(GITERR_NET, "Malformed URL");
return GIT_EINVALIDSPEC; return GIT_EINVALIDSPEC;
} }
start = url; /* Check for hostname and maybe port */
if (at && at < slash) { if (colon) {
start = at+1; *host = git__substrdup(url, colon-url);
*username = git__substrdup(url, at - url);
}
if (colon && colon < at) {
git__free(*username);
*username = git__substrdup(url, colon-url);
*password = git__substrdup(colon+1, at-colon-1);
colon = strchr(at, ':');
}
if (colon == NULL) {
*port = git__strdup(default_port);
} else {
*port = git__substrdup(colon+1, slash-colon-1); *port = git__substrdup(colon+1, slash-colon-1);
} else {
*host = git__substrdup(url, slash-url);
*port = git__strdup(default_port);
} }
GITERR_CHECK_ALLOC(*port);
end = colon == NULL ? slash : colon;
*host = git__substrdup(start, end - start);
GITERR_CHECK_ALLOC(*host); GITERR_CHECK_ALLOC(*host);
GITERR_CHECK_ALLOC(*port);
return 0; return 0;
} }

10
tests-clar/network/urlparse.c
View File

@ -38,6 +38,16 @@ void test_network_urlparse__bad_url(void)
GIT_EINVALIDSPEC); GIT_EINVALIDSPEC);
} }
void test_network_urlparse__weird_url(void)
{
cl_git_pass(gitno_extract_url_parts(&host, &port, &user, &pass,
"arrbee:my/bad:password@github.com:1111/strange/words.git", "1"));
cl_assert_equal_s(host, "github.com");
cl_assert_equal_s(port, "1111");
cl_assert_equal_s(user, "arrbee");
cl_assert_equal_s(pass, "my/bad:password");
}
void test_network_urlparse__user(void) void test_network_urlparse__user(void)
{ {
cl_git_pass(gitno_extract_url_parts(&host, &port, &user, &pass, cl_git_pass(gitno_extract_url_parts(&host, &port, &user, &pass,