Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 673 lines (572 sloc) 15.066 kb
731043f Add compat/unsetenv.c .
Jason Riedy authored
1 #include "git-compat-util.h"
f719259 Factor out the ssh connection stuff from send-pack.c
Linus Torvalds authored
2 #include "cache.h"
41cb748 Move "get_ack()" to common git_connect functions
Linus Torvalds authored
3 #include "pkt-line.h"
b10d0ec [PATCH] Use sq_quote() to properly quote the parameter to call shell.
Junio C Hamano authored
4 #include "quote.h"
6abf5c0 Squelch compiler warnings from connect.c
Junio C Hamano authored
5 #include "refs.h"
15a1c01 Shawn O. Pearce Use run_command for proxy connections
spearce authored
6 #include "run-command.h"
6b62816 Move refspec parser from connect.c and cache.h to remote.{c,h}
Daniel Barkalow authored
7 #include "remote.h"
9d2e942 Jeff King decode file:// and ssh:// URLs
peff authored
8 #include "url.h"
f719259 Factor out the ssh connection stuff from send-pack.c
Linus Torvalds authored
9
96f1e58 remove unnecessary initializations
David Rientjes authored
10 static char *server_capabilities;
211b5f9 dscho Support receiving server capabilities
dscho authored
11
2718ff0 Improve git-peek-remote
Linus Torvalds authored
12 static int check_ref(const char *name, int len, unsigned int flags)
13 {
14 if (!flags)
15 return 1;
16
c41e20b Andy Whitcroft send-pack: remove remote reference limit
awhitcroft authored
17 if (len < 5 || memcmp(name, "refs/", 5))
2718ff0 Improve git-peek-remote
Linus Torvalds authored
18 return 0;
19
20 /* Skip the "refs/" part */
21 name += 5;
22 len -= 5;
23
24 /* REF_NORMAL means that we don't want the magic fake tag refs */
8d9c501 Michael Haggerty Change check_ref_format() to take a flags argument
mhagger authored
25 if ((flags & REF_NORMAL) && check_refname_format(name, 0))
2718ff0 Improve git-peek-remote
Linus Torvalds authored
26 return 0;
27
28 /* REF_HEADS means that we want regular branch heads */
29 if ((flags & REF_HEADS) && !memcmp(name, "heads/", 6))
30 return 1;
31
32 /* REF_TAGS means that we want tags */
33 if ((flags & REF_TAGS) && !memcmp(name, "tags/", 5))
34 return 1;
35
36 /* All type bits clear means that we are ok with anything */
37 return !(flags & ~REF_NORMAL);
38 }
39
4577370 Miscellaneous const changes and utilities
Daniel Barkalow authored
40 int check_ref_type(const struct ref *ref, int flags)
41 {
42 return check_ref(ref->name, strlen(ref->name), flags);
43 }
44
40c155f Junio C Hamano push: prepare sender to receive extended ref information from the receiv...
gitster authored
45 static void add_extra_have(struct extra_have_objects *extra, unsigned char *sha1)
46 {
47 ALLOC_GROW(extra->array, extra->nr + 1, extra->alloc);
48 hashcpy(&(extra->array[extra->nr][0]), sha1);
49 extra->nr++;
50 }
51
46284dd remove the impression of unexpectedness when access is denied
Heiko Voigt authored
52 static void die_initial_contact(int got_at_least_one_head)
53 {
54 if (got_at_least_one_head)
55 die("The remote end hung up upon initial contact");
56 else
57 die("Could not read from remote repository.\n\n"
58 "Please make sure you have the correct access rights\n"
59 "and the repository exists.");
60 }
61
d1c133f Merge three separate "fetch refs" functions
Linus Torvalds authored
62 /*
63 * Read all the refs from the other end
64 */
1a7141f Ignore funny refname sent from remote
Junio C Hamano authored
65 struct ref **get_remote_heads(int in, struct ref **list,
40c155f Junio C Hamano push: prepare sender to receive extended ref information from the receiv...
gitster authored
66 unsigned int flags,
67 struct extra_have_objects *extra_have)
d1c133f Merge three separate "fetch refs" functions
Linus Torvalds authored
68 {
46284dd remove the impression of unexpectedness when access is denied
Heiko Voigt authored
69 int got_at_least_one_head = 0;
70
d1c133f Merge three separate "fetch refs" functions
Linus Torvalds authored
71 *list = NULL;
72 for (;;) {
73 struct ref *ref;
74 unsigned char old_sha1[20];
75 static char buffer[1000];
76 char *name;
211b5f9 dscho Support receiving server capabilities
dscho authored
77 int len, name_len;
d1c133f Merge three separate "fetch refs" functions
Linus Torvalds authored
78
46284dd remove the impression of unexpectedness when access is denied
Heiko Voigt authored
79 len = packet_read(in, buffer, sizeof(buffer));
80 if (len < 0)
81 die_initial_contact(got_at_least_one_head);
82
d1c133f Merge three separate "fetch refs" functions
Linus Torvalds authored
83 if (!len)
84 break;
85 if (buffer[len-1] == '\n')
86 buffer[--len] = 0;
87
a807328 connect.c: add a way for git-daemon to pass an error back to client
Tom Preston-Werner authored
88 if (len > 4 && !prefixcmp(buffer, "ERR "))
89 die("remote error: %s", buffer + 4);
90
d1c133f Merge three separate "fetch refs" functions
Linus Torvalds authored
91 if (len < 42 || get_sha1_hex(buffer, old_sha1) || buffer[40] != ' ')
92 die("protocol error: expected sha/ref, got '%s'", buffer);
93 name = buffer + 41;
1a7141f Ignore funny refname sent from remote
Junio C Hamano authored
94
211b5f9 dscho Support receiving server capabilities
dscho authored
95 name_len = strlen(name);
96 if (len != name_len + 41) {
8e0f700 Avoid unnecessary "if-before-free" tests.
Jim Meyering authored
97 free(server_capabilities);
9befac4 Shawn O. Pearce Replace uses of strdup with xstrdup.
spearce authored
98 server_capabilities = xstrdup(name + name_len + 1);
211b5f9 dscho Support receiving server capabilities
dscho authored
99 }
100
40c155f Junio C Hamano push: prepare sender to receive extended ref information from the receiv...
gitster authored
101 if (extra_have &&
102 name_len == 5 && !memcmp(".have", name, 5)) {
103 add_extra_have(extra_have, old_sha1);
104 continue;
105 }
106
2718ff0 Improve git-peek-remote
Linus Torvalds authored
107 if (!check_ref(name, name_len, flags))
cfee10a send-pack/receive-pack: allow errors to be reported back to pusher.
Junio C Hamano authored
108 continue;
59c69c0 make alloc_ref_from_str() the new alloc_ref()
René Scharfe authored
109 ref = alloc_ref(buffer + 41);
e702496 Shawn O. Pearce Convert memcpy(a,b,20) to hashcpy(a,b).
spearce authored
110 hashcpy(ref->old_sha1, old_sha1);
d1c133f Merge three separate "fetch refs" functions
Linus Torvalds authored
111 *list = ref;
112 list = &ref->next;
46284dd remove the impression of unexpectedness when access is denied
Heiko Voigt authored
113 got_at_least_one_head = 1;
d1c133f Merge three separate "fetch refs" functions
Linus Torvalds authored
114 }
115 return list;
116 }
117
9442710 Jeff King parse_feature_request: make it easier to see feature values
peff authored
118 const char *parse_feature_value(const char *feature_list, const char *feature, int *lenp)
f47182c Junio C Hamano server_supports(): parse feature list more carefully
gitster authored
119 {
120 int len;
121
122 if (!feature_list)
123 return NULL;
124
125 len = strlen(feature);
126 while (*feature_list) {
127 const char *found = strstr(feature_list, feature);
128 if (!found)
129 return NULL;
9442710 Jeff King parse_feature_request: make it easier to see feature values
peff authored
130 if (feature_list == found || isspace(found[-1])) {
131 const char *value = found + len;
132 /* feature with no value (e.g., "thin-pack") */
133 if (!*value || isspace(*value)) {
134 if (lenp)
135 *lenp = 0;
136 return value;
137 }
138 /* feature with a value (e.g., "agent=git/1.2.3") */
139 else if (*value == '=') {
140 value++;
141 if (lenp)
142 *lenp = strcspn(value, " \t\n");
143 return value;
144 }
145 /*
146 * otherwise we matched a substring of another feature;
147 * keep looking
148 */
149 }
f47182c Junio C Hamano server_supports(): parse feature list more carefully
gitster authored
150 feature_list = found + 1;
151 }
152 return NULL;
211b5f9 dscho Support receiving server capabilities
dscho authored
153 }
154
9442710 Jeff King parse_feature_request: make it easier to see feature values
peff authored
155 int parse_feature_request(const char *feature_list, const char *feature)
156 {
157 return !!parse_feature_value(feature_list, feature, NULL);
158 }
159
160 const char *server_feature_value(const char *feature, int *len)
161 {
162 return parse_feature_value(server_capabilities, feature, len);
163 }
164
165 int server_supports(const char *feature)
166 {
167 return !!server_feature_value(feature, NULL);
168 }
169
2386d65 Add first cut at "git protocol" connect logic.
Linus Torvalds authored
170 enum protocol {
171 PROTO_LOCAL = 1,
172 PROTO_SSH,
4b05548 enums: omit trailing comma for portability
Gary V. Vaughan authored
173 PROTO_GIT
2386d65 Add first cut at "git protocol" connect logic.
Linus Torvalds authored
174 };
175
176 static enum protocol get_protocol(const char *name)
177 {
178 if (!strcmp(name, "ssh"))
179 return PROTO_SSH;
180 if (!strcmp(name, "git"))
181 return PROTO_GIT;
c05186c Support git+ssh:// and ssh+git:// URL
Linus Torvalds authored
182 if (!strcmp(name, "git+ssh"))
183 return PROTO_SSH;
184 if (!strcmp(name, "ssh+git"))
185 return PROTO_SSH;
72a4f4b Linus Torvalds connect: accept file:// URL scheme
torvalds authored
186 if (!strcmp(name, "file"))
187 return PROTO_LOCAL;
2386d65 Add first cut at "git protocol" connect logic.
Linus Torvalds authored
188 die("I don't handle protocol '%s'", name);
189 }
190
5ba8844 [PATCH] GIT: Try all addresses for given remote name
YOSHIFUJI Hideaki authored
191 #define STR_(s) # s
192 #define STR(s) STR_(s)
2386d65 Add first cut at "git protocol" connect logic.
Linus Torvalds authored
193
72a534d Michael Lukashov connect.c: move duplicated code to a new function 'get_host_and_port'
michaellukashov authored
194 static void get_host_and_port(char **host, const char **port)
195 {
196 char *colon, *end;
197
198 if (*host[0] == '[') {
199 end = strchr(*host + 1, ']');
200 if (end) {
201 *end = 0;
202 end++;
203 (*host)++;
204 } else
205 end = *host;
206 } else
207 end = *host;
208 colon = strchr(end, ':');
209
210 if (colon) {
211 *colon = 0;
212 *port = colon + 1;
213 }
214 }
215
e47a858 enable SO_KEEPALIVE for connected TCP sockets
Eric Wong authored
216 static void enable_keepalive(int sockfd)
217 {
218 int ka = 1;
219
220 if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0)
221 fprintf(stderr, "unable to set SO_KEEPALIVE on socket: %s\n",
222 strerror(errno));
223 }
224
49744d6 Call it NO_IPV6 rather than hard-coding __CYGWIN__
hpa authored
225 #ifndef NO_IPV6
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
226
ba50532 Alex Riesen Verbose connect messages to show the IP addresses used
raalkml authored
227 static const char *ai_name(const struct addrinfo *ai)
228 {
785a985 Benjamin Kramer connect: replace inet_ntop with getnameinfo
d0k authored
229 static char addr[NI_MAXHOST];
230 if (getnameinfo(ai->ai_addr, ai->ai_addrlen, addr, sizeof(addr), NULL, 0,
231 NI_NUMERICHOST) != 0)
ba50532 Alex Riesen Verbose connect messages to show the IP addresses used
raalkml authored
232 strcpy(addr, "(unknown)");
785a985 Benjamin Kramer connect: replace inet_ntop with getnameinfo
d0k authored
233
ba50532 Alex Riesen Verbose connect messages to show the IP addresses used
raalkml authored
234 return addr;
235 }
236
5ad312b Refactor git_tcp_connect() functions a little.
Jon Loeliger authored
237 /*
238 * Returns a connected socket() fd, or else die()s.
239 */
7841ce7 connect: display connection progress
Michael S. Tsirkin authored
240 static int git_tcp_connect_sock(char *host, int flags)
2386d65 Add first cut at "git protocol" connect logic.
Linus Torvalds authored
241 {
63a995b Dave Zarzycki Do not log unless all connect() attempts fail
davezarzycki authored
242 struct strbuf error_message = STRBUF_INIT;
243 int sockfd = -1;
554fe20 tihirvon Make some strings const
tihirvon authored
244 const char *port = STR(DEFAULT_GIT_PORT);
5ba8844 [PATCH] GIT: Try all addresses for given remote name
YOSHIFUJI Hideaki authored
245 struct addrinfo hints, *ai0, *ai;
246 int gai;
ba50532 Alex Riesen Verbose connect messages to show the IP addresses used
raalkml authored
247 int cnt = 0;
5ba8844 [PATCH] GIT: Try all addresses for given remote name
YOSHIFUJI Hideaki authored
248
72a534d Michael Lukashov connect.c: move duplicated code to a new function 'get_host_and_port'
michaellukashov authored
249 get_host_and_port(&host, &port);
250 if (!*port)
251 port = "<none>";
5ba8844 [PATCH] GIT: Try all addresses for given remote name
YOSHIFUJI Hideaki authored
252
253 memset(&hints, 0, sizeof(hints));
254 hints.ai_socktype = SOCK_STREAM;
255 hints.ai_protocol = IPPROTO_TCP;
256
7841ce7 connect: display connection progress
Michael S. Tsirkin authored
257 if (flags & CONNECT_VERBOSE)
258 fprintf(stderr, "Looking up %s ... ", host);
259
5ba8844 [PATCH] GIT: Try all addresses for given remote name
YOSHIFUJI Hideaki authored
260 gai = getaddrinfo(host, port, &hints, &ai);
261 if (gai)
608d48b Linus Torvalds Fix "getaddrinfo()" buglet
torvalds authored
262 die("Unable to look up %s (port %s) (%s)", host, port, gai_strerror(gai));
5ba8844 [PATCH] GIT: Try all addresses for given remote name
YOSHIFUJI Hideaki authored
263
7841ce7 connect: display connection progress
Michael S. Tsirkin authored
264 if (flags & CONNECT_VERBOSE)
265 fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port);
266
e08afec Erik Faye-Lund connect: correctly number ipv6 network adapter
kusma authored
267 for (ai0 = ai; ai; ai = ai->ai_next, cnt++) {
5ad312b Refactor git_tcp_connect() functions a little.
Jon Loeliger authored
268 sockfd = socket(ai->ai_family,
269 ai->ai_socktype, ai->ai_protocol);
63a995b Dave Zarzycki Do not log unless all connect() attempts fail
davezarzycki authored
270 if ((sockfd < 0) ||
271 (connect(sockfd, ai->ai_addr, ai->ai_addrlen) < 0)) {
272 strbuf_addf(&error_message, "%s[%d: %s]: errno=%s\n",
273 host, cnt, ai_name(ai), strerror(errno));
274 if (0 <= sockfd)
275 close(sockfd);
5ba8844 [PATCH] GIT: Try all addresses for given remote name
YOSHIFUJI Hideaki authored
276 sockfd = -1;
277 continue;
2386d65 Add first cut at "git protocol" connect logic.
Linus Torvalds authored
278 }
ba50532 Alex Riesen Verbose connect messages to show the IP addresses used
raalkml authored
279 if (flags & CONNECT_VERBOSE)
280 fprintf(stderr, "%s ", ai_name(ai));
5ba8844 [PATCH] GIT: Try all addresses for given remote name
YOSHIFUJI Hideaki authored
281 break;
2386d65 Add first cut at "git protocol" connect logic.
Linus Torvalds authored
282 }
283
5ba8844 [PATCH] GIT: Try all addresses for given remote name
YOSHIFUJI Hideaki authored
284 freeaddrinfo(ai0);
2386d65 Add first cut at "git protocol" connect logic.
Linus Torvalds authored
285
286 if (sockfd < 0)
63a995b Dave Zarzycki Do not log unless all connect() attempts fail
davezarzycki authored
287 die("unable to connect to %s:\n%s", host, error_message.buf);
5ba8844 [PATCH] GIT: Try all addresses for given remote name
YOSHIFUJI Hideaki authored
288
e47a858 enable SO_KEEPALIVE for connected TCP sockets
Eric Wong authored
289 enable_keepalive(sockfd);
290
7841ce7 connect: display connection progress
Michael S. Tsirkin authored
291 if (flags & CONNECT_VERBOSE)
292 fprintf(stderr, "done.\n");
293
63a995b Dave Zarzycki Do not log unless all connect() attempts fail
davezarzycki authored
294 strbuf_release(&error_message);
295
5ad312b Refactor git_tcp_connect() functions a little.
Jon Loeliger authored
296 return sockfd;
2386d65 Add first cut at "git protocol" connect logic.
Linus Torvalds authored
297 }
298
49744d6 Call it NO_IPV6 rather than hard-coding __CYGWIN__
hpa authored
299 #else /* NO_IPV6 */
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
300
5ad312b Refactor git_tcp_connect() functions a little.
Jon Loeliger authored
301 /*
302 * Returns a connected socket() fd, or else die()s.
303 */
7841ce7 connect: display connection progress
Michael S. Tsirkin authored
304 static int git_tcp_connect_sock(char *host, int flags)
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
305 {
7203a2d Erik Faye-Lund connect: only log if all attempts failed (ipv4)
kusma authored
306 struct strbuf error_message = STRBUF_INIT;
307 int sockfd = -1;
72a534d Michael Lukashov connect.c: move duplicated code to a new function 'get_host_and_port'
michaellukashov authored
308 const char *port = STR(DEFAULT_GIT_PORT);
309 char *ep;
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
310 struct hostent *he;
311 struct sockaddr_in sa;
312 char **ap;
313 unsigned int nport;
ba50532 Alex Riesen Verbose connect messages to show the IP addresses used
raalkml authored
314 int cnt;
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
315
72a534d Michael Lukashov connect.c: move duplicated code to a new function 'get_host_and_port'
michaellukashov authored
316 get_host_and_port(&host, &port);
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
317
7841ce7 connect: display connection progress
Michael S. Tsirkin authored
318 if (flags & CONNECT_VERBOSE)
319 fprintf(stderr, "Looking up %s ... ", host);
320
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
321 he = gethostbyname(host);
322 if (!he)
323 die("Unable to look up %s (%s)", host, hstrerror(h_errno));
324 nport = strtoul(port, &ep, 10);
325 if ( ep == port || *ep ) {
326 /* Not numeric */
327 struct servent *se = getservbyname(port,"tcp");
328 if ( !se )
d753070 Alexander Potashev remove trailing LF in die() messages
aspotashev authored
329 die("Unknown port %s", port);
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
330 nport = se->s_port;
331 }
332
7841ce7 connect: display connection progress
Michael S. Tsirkin authored
333 if (flags & CONNECT_VERBOSE)
334 fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port);
335
ba50532 Alex Riesen Verbose connect messages to show the IP addresses used
raalkml authored
336 for (cnt = 0, ap = he->h_addr_list; *ap; ap++, cnt++) {
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
337 memset(&sa, 0, sizeof sa);
338 sa.sin_family = he->h_addrtype;
6573faf NO_IPV6 support for git daemon
Peter Anvin authored
339 sa.sin_port = htons(nport);
c616421 Fixed git:// IPv4 address problem when compiled with -DNO_IPV6.
Paul Serice authored
340 memcpy(&sa.sin_addr, *ap, he->h_length);
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
341
7203a2d Erik Faye-Lund connect: only log if all attempts failed (ipv4)
kusma authored
342 sockfd = socket(he->h_addrtype, SOCK_STREAM, 0);
343 if ((sockfd < 0) ||
344 connect(sockfd, (struct sockaddr *)&sa, sizeof sa) < 0) {
345 strbuf_addf(&error_message, "%s[%d: %s]: errno=%s\n",
ba50532 Alex Riesen Verbose connect messages to show the IP addresses used
raalkml authored
346 host,
347 cnt,
348 inet_ntoa(*(struct in_addr *)&sa.sin_addr),
7203a2d Erik Faye-Lund connect: only log if all attempts failed (ipv4)
kusma authored
349 strerror(errno));
350 if (0 <= sockfd)
351 close(sockfd);
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
352 sockfd = -1;
353 continue;
354 }
ba50532 Alex Riesen Verbose connect messages to show the IP addresses used
raalkml authored
355 if (flags & CONNECT_VERBOSE)
356 fprintf(stderr, "%s ",
357 inet_ntoa(*(struct in_addr *)&sa.sin_addr));
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
358 break;
359 }
360
361 if (sockfd < 0)
7203a2d Erik Faye-Lund connect: only log if all attempts failed (ipv4)
kusma authored
362 die("unable to connect to %s:\n%s", host, error_message.buf);
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
363
e47a858 enable SO_KEEPALIVE for connected TCP sockets
Eric Wong authored
364 enable_keepalive(sockfd);
365
7841ce7 connect: display connection progress
Michael S. Tsirkin authored
366 if (flags & CONNECT_VERBOSE)
367 fprintf(stderr, "done.\n");
368
5ad312b Refactor git_tcp_connect() functions a little.
Jon Loeliger authored
369 return sockfd;
370 }
371
372 #endif /* NO_IPV6 */
373
374
7841ce7 connect: display connection progress
Michael S. Tsirkin authored
375 static void git_tcp_connect(int fd[2], char *host, int flags)
5ad312b Refactor git_tcp_connect() functions a little.
Jon Loeliger authored
376 {
7841ce7 connect: display connection progress
Michael S. Tsirkin authored
377 int sockfd = git_tcp_connect_sock(host, flags);
5ad312b Refactor git_tcp_connect() functions a little.
Jon Loeliger authored
378
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
379 fd[0] = sockfd;
ec587fd Make sure git_connect() always give two file descriptors.
Junio C Hamano authored
380 fd[1] = dup(sockfd);
4c505f7 Cygwin doesn't support IPv6 or getaddrinfo()
hpa authored
381 }
382
383
96f1e58 remove unnecessary initializations
David Rientjes authored
384 static char *git_proxy_command;
f801477 proxy-command support for git://
Paul Collins authored
385
ef90d6d dscho Provide git_config with a callback-data parameter
dscho authored
386 static int git_proxy_command_options(const char *var, const char *value,
387 void *cb)
f801477 proxy-command support for git://
Paul Collins authored
388 {
e814bc4 git-proxy updates.
Junio C Hamano authored
389 if (!strcmp(var, "core.gitproxy")) {
c3df856 GIT: Fix compilation error in connect.c
YOSHIFUJI Hideaki / 吉藤英明 authored
390 const char *for_pos;
391 int matchlen = -1;
392 int hostlen;
15112c9 Erik Faye-Lund connect.c: remove a few globals by using git_config callback data
kusma authored
393 const char *rhost_name = cb;
394 int rhost_len = strlen(rhost_name);
c3df856 GIT: Fix compilation error in connect.c
YOSHIFUJI Hideaki / 吉藤英明 authored
395
e814bc4 git-proxy updates.
Junio C Hamano authored
396 if (git_proxy_command)
f801477 proxy-command support for git://
Paul Collins authored
397 return 0;
c64b9ad Junio C Hamano connect.c: guard config parser from value=NULL
gitster authored
398 if (!value)
399 return config_error_nonbool(var);
e814bc4 git-proxy updates.
Junio C Hamano authored
400 /* [core]
401 * ;# matches www.kernel.org as well
402 * gitproxy = netcatter-1 for kernel.org
403 * gitproxy = netcatter-2 for sample.xz
404 * gitproxy = netcatter-default
405 */
c3df856 GIT: Fix compilation error in connect.c
YOSHIFUJI Hideaki / 吉藤英明 authored
406 for_pos = strstr(value, " for ");
e814bc4 git-proxy updates.
Junio C Hamano authored
407 if (!for_pos)
408 /* matches everybody */
409 matchlen = strlen(value);
410 else {
411 hostlen = strlen(for_pos + 5);
412 if (rhost_len < hostlen)
413 matchlen = -1;
414 else if (!strncmp(for_pos + 5,
415 rhost_name + rhost_len - hostlen,
416 hostlen) &&
417 ((rhost_len == hostlen) ||
418 rhost_name[rhost_len - hostlen -1] == '.'))
419 matchlen = for_pos - value;
420 else
421 matchlen = -1;
422 }
423 if (0 <= matchlen) {
424 /* core.gitproxy = none for kernel.org */
a6080a0 Junio C Hamano War on whitespace
gitster authored
425 if (matchlen == 4 &&
e814bc4 git-proxy updates.
Junio C Hamano authored
426 !memcmp(value, "none", 4))
427 matchlen = 0;
182af83 Pierre Habouzit Use xmemdupz() in many places.
MadCoder authored
428 git_proxy_command = xmemdupz(value, matchlen);
f801477 proxy-command support for git://
Paul Collins authored
429 }
e814bc4 git-proxy updates.
Junio C Hamano authored
430 return 0;
f801477 proxy-command support for git://
Paul Collins authored
431 }
432
ef90d6d dscho Provide git_config with a callback-data parameter
dscho authored
433 return git_default_config(var, value, cb);
f801477 proxy-command support for git://
Paul Collins authored
434 }
435
e814bc4 git-proxy updates.
Junio C Hamano authored
436 static int git_use_proxy(const char *host)
f801477 proxy-command support for git://
Paul Collins authored
437 {
438 git_proxy_command = getenv("GIT_PROXY_COMMAND");
15112c9 Erik Faye-Lund connect.c: remove a few globals by using git_config callback data
kusma authored
439 git_config(git_proxy_command_options, (void*)host);
e814bc4 git-proxy updates.
Junio C Hamano authored
440 return (git_proxy_command && *git_proxy_command);
f801477 proxy-command support for git://
Paul Collins authored
441 }
442
5cbf824 Jeff King connect: treat generic proxy processes like ssh processes
peff authored
443 static struct child_process *git_proxy_connect(int fd[2], char *host)
f801477 proxy-command support for git://
Paul Collins authored
444 {
554fe20 tihirvon Make some strings const
tihirvon authored
445 const char *port = STR(DEFAULT_GIT_PORT);
5cbf824 Jeff King connect: treat generic proxy processes like ssh processes
peff authored
446 const char **argv;
447 struct child_process *proxy;
f801477 proxy-command support for git://
Paul Collins authored
448
72a534d Michael Lukashov connect.c: move duplicated code to a new function 'get_host_and_port'
michaellukashov authored
449 get_host_and_port(&host, &port);
f801477 proxy-command support for git://
Paul Collins authored
450
5cbf824 Jeff King connect: treat generic proxy processes like ssh processes
peff authored
451 argv = xmalloc(sizeof(*argv) * 4);
15a1c01 Shawn O. Pearce Use run_command for proxy connections
spearce authored
452 argv[0] = git_proxy_command;
453 argv[1] = host;
454 argv[2] = port;
455 argv[3] = NULL;
5cbf824 Jeff King connect: treat generic proxy processes like ssh processes
peff authored
456 proxy = xcalloc(1, sizeof(*proxy));
457 proxy->argv = argv;
458 proxy->in = -1;
459 proxy->out = -1;
460 if (start_command(proxy))
15a1c01 Shawn O. Pearce Use run_command for proxy connections
spearce authored
461 die("cannot start proxy %s", argv[0]);
5cbf824 Jeff King connect: treat generic proxy processes like ssh processes
peff authored
462 fd[0] = proxy->out; /* read from proxy stdout */
463 fd[1] = proxy->in; /* write to proxy stdin */
464 return proxy;
f801477 proxy-command support for git://
Paul Collins authored
465 }
466
0f503d7 Christian Couder Fix a memory leak in "connect.c" and die if command too long.
chriscool authored
467 #define MAX_CMD_LEN 1024
468
2af202b Linus Torvalds Fix various sparse warnings in the git source code
torvalds authored
469 static char *get_port(char *host)
2e77666 Luben Tuikov URL: allow port specification in ssh:// URLs
ltuikov authored
470 {
471 char *end;
472 char *p = strchr(host, ':');
473
474 if (p) {
8f14825 connect.c: stricter port validation, silence compiler warning
René Scharfe authored
475 long port = strtol(p + 1, &end, 10);
476 if (end != p + 1 && *end == '\0' && 0 <= port && port < 65536) {
2e77666 Luben Tuikov URL: allow port specification in ssh:// URLs
ltuikov authored
477 *p = '\0';
478 return p+1;
479 }
480 }
481
482 return NULL;
483 }
484
fb32c91 dscho Fix "git clone" for git:// protocol
dscho authored
485 static struct child_process no_fork;
486
f719259 Factor out the ssh connection stuff from send-pack.c
Linus Torvalds authored
487 /*
fb32c91 dscho Fix "git clone" for git:// protocol
dscho authored
488 * This returns a dummy child_process if the transport protocol does not
489 * need fork(2), or a struct child_process object if it does. Once done,
490 * finish the connection with finish_connect() with the value returned from
491 * this function (it is safe to call finish_connect() with NULL to support
492 * the former case).
f42a5c4 connect.c: finish_connect(): allow null pid parameter
Franck Bui-Huu authored
493 *
fb32c91 dscho Fix "git clone" for git:// protocol
dscho authored
494 * If it returns, the connect is successful; it just dies on errors (this
495 * will hopefully be changed in a libification effort, to return NULL when
496 * the connection failed).
f719259 Factor out the ssh connection stuff from send-pack.c
Linus Torvalds authored
497 */
4577370 Miscellaneous const changes and utilities
Daniel Barkalow authored
498 struct child_process *git_connect(int fd[2], const char *url_orig,
98158e9 Change git_connect() to return a struct child_process instead of a pid_t...
Johannes Sixt authored
499 const char *prog, int flags)
f719259 Factor out the ssh connection stuff from send-pack.c
Linus Torvalds authored
500 {
9d2e942 Jeff King decode file:// and ssh:// URLs
peff authored
501 char *url;
8e76bf3 Benjamin Kramer Remove unused assignments
d0k authored
502 char *host, *path;
356bece GIT: Support [address] in URLs
YOSHIFUJI Hideaki / 吉藤英明 authored
503 char *end;
504 int c;
5cbf824 Jeff King connect: treat generic proxy processes like ssh processes
peff authored
505 struct child_process *conn = &no_fork;
faea9cc Client side support for user-relative paths.
Andreas Ericsson authored
506 enum protocol protocol = PROTO_LOCAL;
da2a95b cleanups: Fix potential bugs in connect.c
Serge E. Hallyn authored
507 int free_path = 0;
2e77666 Luben Tuikov URL: allow port specification in ssh:// URLs
ltuikov authored
508 char *port = NULL;
f364cb8 Use start_command() in git_connect() instead of explicit fork/exec.
Johannes Sixt authored
509 const char **arg;
510 struct strbuf cmd;
faea9cc Client side support for user-relative paths.
Andreas Ericsson authored
511
f0b7367 Restore SIGCHLD to SIG_DFL where we care about waitpid().
Junio C Hamano authored
512 /* Without this we cannot rely on waitpid() to tell
513 * what happened to our children.
514 */
515 signal(SIGCHLD, SIG_DFL);
516
9d2e942 Jeff King decode file:// and ssh:// URLs
peff authored
517 if (is_url(url_orig))
518 url = url_decode(url_orig);
519 else
520 url = xstrdup(url_orig);
521
faea9cc Client side support for user-relative paths.
Andreas Ericsson authored
522 host = strstr(url, "://");
eeefa7c Brian Gianforcaro Style fixes, add a space after if/for/while.
bgianfo authored
523 if (host) {
faea9cc Client side support for user-relative paths.
Andreas Ericsson authored
524 *host = '\0';
525 protocol = get_protocol(url);
526 host += 3;
356bece GIT: Support [address] in URLs
YOSHIFUJI Hideaki / 吉藤英明 authored
527 c = '/';
528 } else {
f719259 Factor out the ssh connection stuff from send-pack.c
Linus Torvalds authored
529 host = url;
356bece GIT: Support [address] in URLs
YOSHIFUJI Hideaki / 吉藤英明 authored
530 c = ':';
531 }
532
9aa5053 Allow use of []-wrapped addresses in git://
Ilari Liusvaara authored
533 /*
534 * Don't do destructive transforms with git:// as that
9517e6b Junio C Hamano Typofixes outside documentation area
gitster authored
535 * protocol code does '[]' unwrapping of its own.
9aa5053 Allow use of []-wrapped addresses in git://
Ilari Liusvaara authored
536 */
356bece GIT: Support [address] in URLs
YOSHIFUJI Hideaki / 吉藤英明 authored
537 if (host[0] == '[') {
538 end = strchr(host + 1, ']');
539 if (end) {
9aa5053 Allow use of []-wrapped addresses in git://
Ilari Liusvaara authored
540 if (protocol != PROTO_GIT) {
541 *end = 0;
542 host++;
543 }
356bece GIT: Support [address] in URLs
YOSHIFUJI Hideaki / 吉藤英明 authored
544 end++;
545 } else
546 end = host;
547 } else
548 end = host;
549
550 path = strchr(end, c);
be50181 Windows: Disambiguate DOS style paths from SSH URLs.
Johannes Sixt authored
551 if (path && !has_dos_drive_prefix(end)) {
72a4f4b Linus Torvalds connect: accept file:// URL scheme
torvalds authored
552 if (c == ':') {
faea9cc Client side support for user-relative paths.
Andreas Ericsson authored
553 protocol = PROTO_SSH;
356bece GIT: Support [address] in URLs
YOSHIFUJI Hideaki / 吉藤英明 authored
554 *path++ = '\0';
72a4f4b Linus Torvalds connect: accept file:// URL scheme
torvalds authored
555 }
556 } else
557 path = end;
2386d65 Add first cut at "git protocol" connect logic.
Linus Torvalds authored
558
faea9cc Client side support for user-relative paths.
Andreas Ericsson authored
559 if (!path || !*path)
560 die("No path specified. See 'man git-pull' for valid url syntax");
561
562 /*
563 * null-terminate hostname and point path to ~ for URL's like this:
564 * ssh://host.xz/~user/repo
565 */
566 if (protocol != PROTO_LOCAL && host != url) {
567 char *ptr = path;
568 if (path[1] == '~')
569 path++;
da2a95b cleanups: Fix potential bugs in connect.c
Serge E. Hallyn authored
570 else {
9befac4 Shawn O. Pearce Replace uses of strdup with xstrdup.
spearce authored
571 path = xstrdup(ptr);
da2a95b cleanups: Fix potential bugs in connect.c
Serge E. Hallyn authored
572 free_path = 1;
573 }
faea9cc Client side support for user-relative paths.
Andreas Ericsson authored
574
575 *ptr = '\0';
576 }
577
2e77666 Luben Tuikov URL: allow port specification in ssh:// URLs
ltuikov authored
578 /*
579 * Add support for ssh port: ssh://host.xy:<port>/...
580 */
581 if (protocol == PROTO_SSH && host != url)
7acf438 git: Wrong parsing of ssh urls with IPv6 literals ignores port
René Scharfe authored
582 port = get_port(end);
2e77666 Luben Tuikov URL: allow port specification in ssh:// URLs
ltuikov authored
583
f801477 proxy-command support for git://
Paul Collins authored
584 if (protocol == PROTO_GIT) {
5ad312b Refactor git_tcp_connect() functions a little.
Jon Loeliger authored
585 /* These underlying connection commands die() if they
586 * cannot connect.
587 */
9befac4 Shawn O. Pearce Replace uses of strdup with xstrdup.
spearce authored
588 char *target_host = xstrdup(host);
e814bc4 git-proxy updates.
Junio C Hamano authored
589 if (git_use_proxy(host))
5cbf824 Jeff King connect: treat generic proxy processes like ssh processes
peff authored
590 conn = git_proxy_connect(fd, host);
da2a95b cleanups: Fix potential bugs in connect.c
Serge E. Hallyn authored
591 else
7841ce7 connect: display connection progress
Michael S. Tsirkin authored
592 git_tcp_connect(fd, host, flags);
5ad312b Refactor git_tcp_connect() functions a little.
Jon Loeliger authored
593 /*
594 * Separate original protocol components prog and path
73bb33a Shawn O. Pearce daemon: Strictly parse the "extra arg" part of the command
spearce authored
595 * from extended host header with a NUL byte.
596 *
597 * Note: Do not add any other headers here! Doing so
598 * will cause older git-daemon servers to crash.
5ad312b Refactor git_tcp_connect() functions a little.
Jon Loeliger authored
599 */
600 packet_write(fd[1],
601 "%s %s%chost=%s%c",
602 prog, path, 0,
603 target_host, 0);
604 free(target_host);
4577370 Miscellaneous const changes and utilities
Daniel Barkalow authored
605 free(url);
da2a95b cleanups: Fix potential bugs in connect.c
Serge E. Hallyn authored
606 if (free_path)
607 free(path);
5cbf824 Jeff King connect: treat generic proxy processes like ssh processes
peff authored
608 return conn;
f801477 proxy-command support for git://
Paul Collins authored
609 }
2386d65 Add first cut at "git protocol" connect logic.
Linus Torvalds authored
610
98158e9 Change git_connect() to return a struct child_process instead of a pid_t...
Johannes Sixt authored
611 conn = xcalloc(1, sizeof(*conn));
2e77666 Luben Tuikov URL: allow port specification in ssh:// URLs
ltuikov authored
612
f364cb8 Use start_command() in git_connect() instead of explicit fork/exec.
Johannes Sixt authored
613 strbuf_init(&cmd, MAX_CMD_LEN);
614 strbuf_addstr(&cmd, prog);
615 strbuf_addch(&cmd, ' ');
616 sq_quote_buf(&cmd, path);
617 if (cmd.len >= MAX_CMD_LEN)
618 die("command line too long");
619
620 conn->in = conn->out = -1;
36ad53f connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
Edward Z. Yang authored
621 conn->argv = arg = xcalloc(7, sizeof(*arg));
f364cb8 Use start_command() in git_connect() instead of explicit fork/exec.
Johannes Sixt authored
622 if (protocol == PROTO_SSH) {
623 const char *ssh = getenv("GIT_SSH");
36ad53f connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
Edward Z. Yang authored
624 int putty = ssh && strcasestr(ssh, "plink");
f364cb8 Use start_command() in git_connect() instead of explicit fork/exec.
Johannes Sixt authored
625 if (!ssh) ssh = "ssh";
626
627 *arg++ = ssh;
36ad53f connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
Edward Z. Yang authored
628 if (putty && !strcasestr(ssh, "tortoiseplink"))
629 *arg++ = "-batch";
f364cb8 Use start_command() in git_connect() instead of explicit fork/exec.
Johannes Sixt authored
630 if (port) {
36ad53f connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
Edward Z. Yang authored
631 /* P is for PuTTY, p is for OpenSSH */
632 *arg++ = putty ? "-P" : "-p";
f364cb8 Use start_command() in git_connect() instead of explicit fork/exec.
Johannes Sixt authored
633 *arg++ = port;
4852f72 Use GIT_SSH environment to specify alternate ssh binary.
Martin Sivak authored
634 }
f364cb8 Use start_command() in git_connect() instead of explicit fork/exec.
Johannes Sixt authored
635 *arg++ = host;
636 }
637 else {
48a7c1c Oblomov Refactor list of of repo-local env vars
Oblomov authored
638 /* remove repo-local variables from the environment */
639 conn->env = local_repo_env;
4cfb2a4 git_connect: use use_shell instead of explicit "sh", "-c"
Johannes Sixt authored
640 conn->use_shell = 1;
016fb48 Matt local push/pull env cleanup
mejd authored
641 }
f364cb8 Use start_command() in git_connect() instead of explicit fork/exec.
Johannes Sixt authored
642 *arg++ = cmd.buf;
643 *arg = NULL;
644
645 if (start_command(conn))
646 die("unable to fork");
647
648 fd[0] = conn->out; /* read from child's stdout */
649 fd[1] = conn->in; /* write to child's stdin */
650 strbuf_release(&cmd);
4577370 Miscellaneous const changes and utilities
Daniel Barkalow authored
651 free(url);
da2a95b cleanups: Fix potential bugs in connect.c
Serge E. Hallyn authored
652 if (free_path)
653 free(path);
98158e9 Change git_connect() to return a struct child_process instead of a pid_t...
Johannes Sixt authored
654 return conn;
f719259 Factor out the ssh connection stuff from send-pack.c
Linus Torvalds authored
655 }
656
7ffe853 Jeff King connect: let callers know if connection is a socket
peff authored
657 int git_connection_is_socket(struct child_process *conn)
658 {
659 return conn == &no_fork;
660 }
661
98158e9 Change git_connect() to return a struct child_process instead of a pid_t...
Johannes Sixt authored
662 int finish_connect(struct child_process *conn)
f719259 Factor out the ssh connection stuff from send-pack.c
Linus Torvalds authored
663 {
f364cb8 Use start_command() in git_connect() instead of explicit fork/exec.
Johannes Sixt authored
664 int code;
7ffe853 Jeff King connect: let callers know if connection is a socket
peff authored
665 if (!conn || git_connection_is_socket(conn))
f42a5c4 connect.c: finish_connect(): allow null pid parameter
Franck Bui-Huu authored
666 return 0;
667
f364cb8 Use start_command() in git_connect() instead of explicit fork/exec.
Johannes Sixt authored
668 code = finish_command(conn);
669 free(conn->argv);
98158e9 Change git_connect() to return a struct child_process instead of a pid_t...
Johannes Sixt authored
670 free(conn);
f364cb8 Use start_command() in git_connect() instead of explicit fork/exec.
Johannes Sixt authored
671 return code;
f719259 Factor out the ssh connection stuff from send-pack.c
Linus Torvalds authored
672 }
Something went wrong with that request. Please try again.