@matheusbsbs / matheus-bagliano / commits / 050ef3655c

remote-curl: rewrite base url from info/refs redirects

For efficiency and security reasons, an earlier commit in this series taught http_get_* to re-write the base url based on redirections we saw while making a specific request. This commit wires that option into the info/refs request, meaning that a redirect from http://example.com/foo.git/info/refs to https://example.com/bar.git/info/refs will behave as if "https://example.com/bar.git" had been provided to git in the first place. The tests bear some explanation. We introduce two new hierearchies into the httpd test config: 1. Requests to /smart-redir-limited will work only for the initial info/refs request, but not any subsequent requests. As a result, we can confirm whether the client is re-rooting its requests after the initial contact, since otherwise it will fail (it will ask for "repo.git/git-upload-pack", which is not redirected). 2. Requests to smart-redir-auth will redirect, and require auth after the redirection. Since we are using the redirected base for further requests, we also update the credential struct, in order not to mislead the user (or credential helpers) about which credential is needed. We can therefore check the GIT_ASKPASS prompts to make sure we are prompting for the new location. Because we have neither multiple servers nor https support in our test setup, we can only redirect between paths, meaning we need to turn on credential.useHttpPath to see the difference. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

Jeff King committed Sep 28, 2013 at 04:35 UTC 050ef3655c8ea1dc7a2b3b843ca7c45dd94d9c88

4 files changed +19 -1

remote-curl.c

@@ -188,6 +188,7 @@ static struct discovery* discover_refs(const char *service, int for_push)

188 struct strbuf type = STRBUF_INIT;

189 struct strbuf buffer = STRBUF_INIT;

190 struct strbuf refs_url = STRBUF_INIT;

191 + struct strbuf effective_url = STRBUF_INIT;

192 struct discovery *last = last_discovery;

193 int http_ret, maybe_smart = 0;

194 struct http_get_options options;

@@ -209,6 +210,8 @@ static struct discovery* discover_refs(const char *service, int for_push)

210

211 memset(&options, 0, sizeof(options));

212 options.content_type = &type;

213 + options.effective_url = &effective_url;

214 + options.base_url = &url;

215 options.no_cache = 1;

216 options.keep_error = 1;

217

@@ -268,6 +271,7 @@ static struct discovery* discover_refs(const char *service, int for_push)

271 strbuf_release(&refs_url);

272 strbuf_release(&exp);

273 strbuf_release(&type);

274 + strbuf_release(&effective_url);

275 strbuf_release(&buffer);

276 last_discovery = last;

277 return last;

t/lib-httpd.sh

+2 -1

@@ -187,7 +187,8 @@ set_askpass() {

187 }

188

189 expect_askpass() {

190 - dest=$HTTPD_DEST

190 + dest=$HTTPD_DEST${3+/$3}

191 +

192 {

193 case "$1" in

194 none)

t/lib-httpd/apache.conf

@@ -102,6 +102,8 @@ ScriptAlias /broken_smart/ broken-smart-http.sh/

102 RewriteEngine on

103 RewriteRule ^/smart-redir-perm/(.*)$ /smart/$1 [R=301]

104 RewriteRule ^/smart-redir-temp/(.*)$ /smart/$1 [R=302]

105 +RewriteRule ^/smart-redir-auth/(.*)$ /auth/smart/$1 [R=301]

106 +RewriteRule ^/smart-redir-limited/(.*)/info/refs$ /smart/$1/info/refs [R=301]

107

108 <IfDefine SSL>

109 LoadModule ssl_module modules/mod_ssl.so

t/t5551-http-fetch.sh

+11

@@ -113,6 +113,10 @@ test_expect_success 'follow redirects (302)' '

113 git clone $HTTPD_URL/smart-redir-temp/repo.git --quiet repo-t

114 '

115

116 +test_expect_success 'redirects re-root further requests' '

117 + git clone $HTTPD_URL/smart-redir-limited/repo.git repo-redir-limited

118 +'

119 +

120 test_expect_success 'clone from password-protected repository' '

121 echo two >expect &&

122 set_askpass user@host &&

@@ -146,6 +150,13 @@ test_expect_success 'no-op half-auth fetch does not require a password' '

150 expect_askpass none

151 '

152

153 +test_expect_success 'redirects send auth to new location' '

154 + set_askpass user@host &&

155 + git -c credential.useHttpPath=true \

156 + clone $HTTPD_URL/smart-redir-auth/repo.git repo-redir-auth &&

157 + expect_askpass both user@host auth/smart/repo.git

158 +'

159 +

160 test_expect_success 'disable dumb http on server' '

161 git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \

162 config http.getanyfile false