Now that nothing besides CONNECT_DIAG_URL is using hostandport, we can
have parse_connect_url() itself do the host and port splitting.
This still leaves "user@" part of the host, if there is one, which will
be addressed in a subsequent change. This however does add /some/
handling of the "user@" part of the host, in order to pick the port
properly.
Signed-off-by: Mike Hommey <mh@xxxxxxxxxxxx>
---
connect.c | 47 ++++++++++++++++++++++++++++-------------------
t/t5500-fetch-pack.sh | 32 +++++++++++++++++++++-----------
2 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/connect.c b/connect.c
index 3d7bd8e..de7419e 100644
--- a/connect.c
+++ b/connect.c
@@ -589,10 +589,11 @@ static char *get_port(char *host)
* The caller must free() the returned strings.
*/
static enum protocol parse_connect_url(const char *url_orig, char **ret_host,
- char **ret_path)
+ char **ret_port, char **ret_path)
{
char *url;
char *host, *path;
+ const char *port = NULL;
char *end;
int separator = '/';
enum protocol protocol = PROTO_LOCAL;
@@ -647,7 +648,27 @@ static enum protocol parse_connect_url(const char *url_orig, char **ret_host,
path = xstrdup(path);
*end = '\0';
+ get_host_and_port(&host, &port);
+
+ if (*host && !port) {
+ /*
+ * get_host_and_port does not return a port in the
+ * [host:port]:path case. In that case, it is called with
+ * "[host:port]" and returns "host:port" and NULL.
+ * To support this undocumented legacy we still need to split
+ * the port.
+ * "host:port" may also look like "user@host:port". As the
+ * `user` portion tends to be less strict than `host:port`,
+ * we first put it out of the equation: since a hostname
+ * cannot contain a '@', we start from the last '@' in the
+ * string.
+ */
+ char *end_user = strrchr(host, '@');
+ port = get_port(end_user ? end_user : host);
+ }
+
*ret_host = xstrdup(host);
+ *ret_port = port ? xstrdup(port) : NULL;
*ret_path = path;
free(url);
return protocol;
@@ -669,8 +690,7 @@ static struct child_process no_fork = CHILD_PROCESS_INIT;
struct child_process *git_connect(int fd[2], const char *url,
const char *prog, int flags)
{
- char *hostandport, *path, *host;
- const char *port = NULL;
+ char *host, *port, *path;
struct child_process *conn = &no_fork;
enum protocol protocol;
struct strbuf cmd = STRBUF_INIT;
@@ -680,13 +700,12 @@ struct child_process *git_connect(int fd[2], const char *url,
*/
signal(SIGCHLD, SIG_DFL);
- protocol = parse_connect_url(url, &hostandport, &path);
- host = xstrdup(hostandport);
- get_host_and_port(&host, &port);
+ protocol = parse_connect_url(url, &host, &port, &path);
if ((flags & CONNECT_DIAG_URL) && (protocol != PROTO_SSH)) {
printf("Diag: url=%s\n", url ? url : "NULL");
printf("Diag: protocol=%s\n", prot_name(protocol));
- printf("Diag: hostandport=%s\n", hostandport ? hostandport : "NULL");
+ printf("Diag: userandhost=%s\n", host ? host : "NULL");
+ printf("Diag: port=%s\n", port ? port : "NONE");
printf("Diag: path=%s\n", path ? path : "NULL");
conn = NULL;
} else if (protocol == PROTO_GIT) {
@@ -754,16 +773,6 @@ struct child_process *git_connect(int fd[2], const char *url,
int putty = 0, tortoiseplink = 0;
transport_check_allowed("ssh");
- /*
- * get_host_and_port does not return a port in the
- * [host:port]:path case. In that case, it is called
- * with "[host:port]" and returns "host:port" and NULL.
- * To support this undocumented legacy we still need
- * to split the port.
- */
- if (!port)
- port = get_port(host);
-
if (flags & CONNECT_DIAG_URL) {
printf("Diag: url=%s\n", url ? url : "NULL");
printf("Diag: protocol=%s\n", prot_name(protocol));
@@ -771,8 +780,8 @@ struct child_process *git_connect(int fd[2], const char *url,
printf("Diag: port=%s\n", port ? port : "NONE");
printf("Diag: path=%s\n", path ? path : "NULL");
- free(hostandport);
free(host);
+ free(port);
free(path);
free(conn);
return NULL;
@@ -831,8 +840,8 @@ struct child_process *git_connect(int fd[2], const char *url,
fd[1] = conn->in; /* write to child's stdin */
strbuf_release(&cmd);
}
- free(hostandport);
free(host);
+ free(port);
free(path);
return conn;
}
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 91a69fc..739c6b1 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -553,7 +553,7 @@ check_prot_path () {
Diag: protocol=$2
Diag: path=$3
EOF
- git fetch-pack --diag-url "$1" | grep -v hostandport= >actual &&
+ git fetch-pack --diag-url "$1" | egrep -v '(host|port)=' >actual &&
test_cmp expected actual
}
@@ -562,22 +562,17 @@ check_prot_host_port_path () {
case "$2" in
*ssh*)
pp=ssh
- uah=userandhost
- ehost=$(echo $3 | tr -d "[]")
- diagport="Diag: port=$4"
;;
*)
- pp=$p
- uah=hostandport
- ehost=$(echo $3$4 | sed -e "s/22$/:22/" -e "s/NONE//")
- diagport=""
+ pp=$2
;;
esac
+ ehost=$(echo $3 | tr -d "[]")
cat >exp <<-EOF &&
Diag: url=$1
Diag: protocol=$pp
- Diag: $uah=$ehost
- $diagport
+ Diag: userandhost=$ehost
+ Diag: port=$4
Diag: path=$5
EOF
grep -v "^$" exp >expected
@@ -585,7 +580,7 @@ check_prot_host_port_path () {
test_cmp expected actual
}
-for r in repo re:po re/po
+for r in repo re:po re/po re@po
do
# git or ssh with scheme
for p in "ssh+git" "git+ssh" git ssh
@@ -608,6 +603,9 @@ do
test_expect_success "fetch-pack --diag-url $p://$h:22/$r" '
check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
'
+ test_expect_success "fetch-pack --diag-url $p://$h:22/$r" '
+ check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+ '
done
done
# file with scheme
@@ -644,6 +642,18 @@ do
check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
'
done
+ #ssh without scheme with port
+ p=ssh
+ for h in host user@host
+ do
+ test_expect_success "fetch-pack --diag-url [$h:22]:$r" '
+ check_prot_host_port_path [$h:22]:$r $p $h 22 "$r"
+ '
+ # Do "/~" -> "~" conversion
+ test_expect_success "fetch-pack --diag-url [$h:22]:/~$r" '
+ check_prot_host_port_path [$h:22]:/~$r $p $h 22 "~$r"
+ '
+ done
done
test_expect_success MINGW 'fetch-pack --diag-url file://c:/repo' '
--
2.8.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html