diff options
Diffstat (limited to 'lib/libfetch/ftp.c')
| -rw-r--r-- | lib/libfetch/ftp.c | 357 |
1 files changed, 295 insertions, 62 deletions
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c index 0f45bfadafd7..c9aec194fe75 100644 --- a/lib/libfetch/ftp.c +++ b/lib/libfetch/ftp.c @@ -62,6 +62,7 @@ #include <ctype.h> #include <errno.h> +#include <netdb.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -82,10 +83,13 @@ #define FTP_FILE_STATUS 213 #define FTP_SERVICE_READY 220 #define FTP_PASSIVE_MODE 227 +#define FTP_LPASSIVE_MODE 228 +#define FTP_EPASSIVE_MODE 229 #define FTP_LOGGED_IN 230 #define FTP_FILE_ACTION_OK 250 #define FTP_NEED_PASSWORD 331 #define FTP_NEED_ACCOUNT 332 +#define FTP_FILE_OK 350 #define FTP_SYNTAX_ERROR 500 static char ENDL[2] = "\r\n"; @@ -98,25 +102,56 @@ static size_t lr_size, lr_length; static int last_code; #define isftpreply(foo) (isdigit(foo[0]) && isdigit(foo[1]) \ - && isdigit(foo[2]) && foo[3] == ' ') + && isdigit(foo[2]) \ + && (foo[3] == ' ' || foo[3] == '\0')) #define isftpinfo(foo) (isdigit(foo[0]) && isdigit(foo[1]) \ && isdigit(foo[2]) && foo[3] == '-') +/* translate IPv4 mapped IPv6 address to IPv4 address */ +static void +unmappedaddr(struct sockaddr_in6 *sin6) +{ + struct sockaddr_in *sin4; + u_int32_t addr; + int port; + + if (sin6->sin6_family != AF_INET6 || + !IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) + return; + sin4 = (struct sockaddr_in *)sin6; + addr = *(u_int32_t *)&sin6->sin6_addr.s6_addr[12]; + port = sin6->sin6_port; + memset(sin4, 0, sizeof(struct sockaddr_in)); + sin4->sin_addr.s_addr = addr; + sin4->sin_port = port; + sin4->sin_family = AF_INET; + sin4->sin_len = sizeof(struct sockaddr_in); +} + /* * Get server response */ static int _ftp_chkerr(int cd) { - do { - if (_fetch_getln(cd, &last_reply, &lr_size, &lr_length) == -1) { - _fetch_syserr(); - return -1; - } + if (_fetch_getln(cd, &last_reply, &lr_size, &lr_length) == -1) { + _fetch_syserr(); + return -1; + } #ifndef NDEBUG - _fetch_info("got reply '%.*s'", lr_length - 2, last_reply); + _fetch_info("got reply '%.*s'", lr_length - 2, last_reply); #endif - } while (isftpinfo(last_reply)); + if (isftpinfo(last_reply)) { + while (!isftpreply(last_reply)) { + if (_fetch_getln(cd, &last_reply, &lr_size, &lr_length) == -1) { + _fetch_syserr(); + return -1; + } +#ifndef NDEBUG + _fetch_info("got reply '%.*s'", lr_length - 2, last_reply); +#endif + } + } while (lr_length && isspace(last_reply[lr_length-1])) lr_length--; @@ -160,7 +195,7 @@ _ftp_cmd(int cd, char *fmt, ...) iov[0].iov_base = msg; iov[0].iov_len = strlen(msg); iov[1].iov_base = ENDL; - iov[1].iov_len = sizeof(ENDL); + iov[1].iov_len = sizeof ENDL; r = writev(cd, iov, 2); free(msg); if (r == -1) { @@ -175,9 +210,12 @@ _ftp_cmd(int cd, char *fmt, ...) * Transfer file */ static FILE * -_ftp_transfer(int cd, char *oper, char *file, char *mode, char *flags) +_ftp_transfer(int cd, char *oper, char *file, + char *mode, off_t offset, char *flags) { - struct sockaddr_in sin; + struct sockaddr_storage sin; + struct sockaddr_in6 *sin6; + struct sockaddr_in *sin4; int pasv, high, verbose; int e, sd = -1; socklen_t l; @@ -189,6 +227,10 @@ _ftp_transfer(int cd, char *oper, char *file, char *mode, char *flags) high = (flags && strchr(flags, 'h')); verbose = (flags && strchr(flags, 'v')); + /* passive mode */ + if (!pasv && (s = getenv("FTP_PASSIVE_MODE")) != NULL) + pasv = (strncasecmp(s, "no", 2) != 0); + /* change directory */ if (((s = strrchr(file, '/')) != NULL) && (s != file)) { *s = 0; @@ -213,48 +255,121 @@ _ftp_transfer(int cd, char *oper, char *file, char *mode, char *flags) /* s now points to file name */ + /* find our own address, bind, and listen */ + l = sizeof sin; + if (getsockname(cd, (struct sockaddr *)&sin, &l) == -1) + goto sysouch; + if (sin.ss_family == AF_INET6) + unmappedaddr((struct sockaddr_in6 *)&sin); + /* open data socket */ - if ((sd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) { + if ((sd = socket(sin.ss_family, SOCK_STREAM, IPPROTO_TCP)) == -1) { _fetch_syserr(); return NULL; } if (pasv) { - u_char addr[6]; + u_char addr[64]; char *ln, *p; int i; + int port; /* send PASV command */ if (verbose) _fetch_info("setting passive mode"); - if ((e = _ftp_cmd(cd, "PASV")) != FTP_PASSIVE_MODE) + switch (sin.ss_family) { + case AF_INET: + if ((e = _ftp_cmd(cd, "PASV")) != FTP_PASSIVE_MODE) + goto ouch; + break; + case AF_INET6: + if ((e = _ftp_cmd(cd, "EPSV")) != FTP_EPASSIVE_MODE) { + if (e == -1) + goto ouch; + if ((e = _ftp_cmd(cd, "LPSV")) != FTP_LPASSIVE_MODE) + goto ouch; + } + break; + default: + e = 999; /* XXX: error code should be prepared */ goto ouch; + } /* * Find address and port number. The reply to the PASV command * is IMHO the one and only weak point in the FTP protocol. */ ln = last_reply; - for (p = ln + 3; !isdigit(*p); p++) + for (p = ln + 3; *p && *p != '('; p++) /* nothing */ ; - for (p--, i = 0; i < 6; i++) { - p++; /* skip the comma */ - addr[i] = strtol(p, &p, 10); + if (!*p) { + e = 999; + goto ouch; + } + p++; + switch (e) { + case FTP_PASSIVE_MODE: + case FTP_LPASSIVE_MODE: + l = (e == FTP_PASSIVE_MODE ? 6 : 21); + for (i = 0; *p && i < l; i++, p++) + addr[i] = strtol(p, &p, 10); + if (i < l) { + e = 999; + goto ouch; + } + break; + case FTP_EPASSIVE_MODE: + if (sscanf(p, "%c%c%c%d%c", &addr[0], &addr[1], &addr[2], + &port, &addr[3]) != 5 || + addr[0] != addr[1] || + addr[0] != addr[2] || addr[0] != addr[3]) { + e = 999; + goto ouch; + } + break; } + /* seek to required offset */ + if (offset) + if (_ftp_cmd(cd, "REST %lu", (u_long)offset) != FTP_FILE_OK) + goto sysouch; + /* construct sockaddr for data socket */ - l = sizeof(sin); + l = sizeof sin; if (getpeername(cd, (struct sockaddr *)&sin, &l) == -1) goto sysouch; - bcopy(addr, (char *)&sin.sin_addr, 4); - bcopy(addr + 4, (char *)&sin.sin_port, 2); + if (sin.ss_family == AF_INET6) + unmappedaddr((struct sockaddr_in6 *)&sin); + switch (sin.ss_family) { + case AF_INET6: + sin6 = (struct sockaddr_in6 *)&sin; + if (e == FTP_EPASSIVE_MODE) + sin6->sin6_port = htons(port); + else { + bcopy(addr + 2, (char *)&sin6->sin6_addr, 16); + bcopy(addr + 19, (char *)&sin6->sin6_port, 2); + } + break; + case AF_INET: + sin4 = (struct sockaddr_in *)&sin; + if (e == FTP_EPASSIVE_MODE) + sin4->sin_port = htons(port); + else { + bcopy(addr, (char *)&sin4->sin_addr, 4); + bcopy(addr + 4, (char *)&sin4->sin_port, 2); + } + break; + default: + e = 999; /* XXX: error code should be prepared */ + break; + } /* connect to data port */ if (verbose) _fetch_info("opening data connection"); - if (connect(sd, (struct sockaddr *)&sin, sizeof(sin)) == -1) + if (connect(sd, (struct sockaddr *)&sin, sin.ss_len) == -1) goto sysouch; - + /* make the server initiate the transfer */ if (verbose) _fetch_info("initiating transfer"); @@ -266,19 +381,30 @@ _ftp_transfer(int cd, char *oper, char *file, char *mode, char *flags) u_int32_t a; u_short p; int arg, d; + char *ap; + char hname[INET6_ADDRSTRLEN]; - /* find our own address, bind, and listen */ - l = sizeof(sin); - if (getsockname(cd, (struct sockaddr *)&sin, &l) == -1) - goto sysouch; - sin.sin_port = 0; - arg = high ? IP_PORTRANGE_HIGH : IP_PORTRANGE_DEFAULT; - if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE, - (char *)&arg, sizeof(arg)) == -1) - goto sysouch; + switch (sin.ss_family) { + case AF_INET6: + ((struct sockaddr_in6 *)&sin)->sin6_port = 0; +#ifdef IPV6_PORTRANGE + arg = high ? IPV6_PORTRANGE_HIGH : IPV6_PORTRANGE_DEFAULT; + if (setsockopt(sd, IPPROTO_IPV6, IPV6_PORTRANGE, + (char *)&arg, sizeof(arg)) == -1) + goto sysouch; +#endif + break; + case AF_INET: + ((struct sockaddr_in *)&sin)->sin_port = 0; + arg = high ? IP_PORTRANGE_HIGH : IP_PORTRANGE_DEFAULT; + if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE, + (char *)&arg, sizeof arg) == -1) + goto sysouch; + break; + } if (verbose) _fetch_info("binding data socket"); - if (bind(sd, (struct sockaddr *)&sin, l) == -1) + if (bind(sd, (struct sockaddr *)&sin, sin.ss_len) == -1) goto sysouch; if (listen(sd, 1) == -1) goto sysouch; @@ -286,12 +412,46 @@ _ftp_transfer(int cd, char *oper, char *file, char *mode, char *flags) /* find what port we're on and tell the server */ if (getsockname(sd, (struct sockaddr *)&sin, &l) == -1) goto sysouch; - a = ntohl(sin.sin_addr.s_addr); - p = ntohs(sin.sin_port); - e = _ftp_cmd(cd, "PORT %d,%d,%d,%d,%d,%d", - (a >> 24) & 0xff, (a >> 16) & 0xff, - (a >> 8) & 0xff, a & 0xff, - (p >> 8) & 0xff, p & 0xff); + switch (sin.ss_family) { + case AF_INET: + sin4 = (struct sockaddr_in *)&sin; + a = ntohl(sin4->sin_addr.s_addr); + p = ntohs(sin4->sin_port); + e = _ftp_cmd(cd, "PORT %d,%d,%d,%d,%d,%d", + (a >> 24) & 0xff, (a >> 16) & 0xff, + (a >> 8) & 0xff, a & 0xff, + (p >> 8) & 0xff, p & 0xff); + break; + case AF_INET6: +#define UC(b) (((int)b)&0xff) + e = -1; + sin6 = (struct sockaddr_in6 *)&sin; + if (getnameinfo((struct sockaddr *)&sin, sin.ss_len, + hname, sizeof(hname), + NULL, 0, NI_NUMERICHOST) == 0) { + e = _ftp_cmd(cd, "EPRT |%d|%s|%d|", 2, hname, + htons(sin6->sin6_port)); + if (e == -1) + goto ouch; + } + if (e != FTP_OK) { + ap = (char *)&sin6->sin6_addr; + e = _ftp_cmd(cd, + "LPRT %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d", + 6, 16, + UC(ap[0]), UC(ap[1]), UC(ap[2]), UC(ap[3]), + UC(ap[4]), UC(ap[5]), UC(ap[6]), UC(ap[7]), + UC(ap[8]), UC(ap[9]), UC(ap[10]), UC(ap[11]), + UC(ap[12]), UC(ap[13]), UC(ap[14]), UC(ap[15]), + 2, + (ntohs(sin6->sin6_port) >> 8) & 0xff, + ntohs(sin6->sin6_port) & 0xff); + } + break; + default: + e = 999; /* XXX: error code should be prepared */ + goto ouch; + } if (e != FTP_OK) goto ouch; @@ -315,13 +475,15 @@ _ftp_transfer(int cd, char *oper, char *file, char *mode, char *flags) sysouch: _fetch_syserr(); - close(sd); + if (sd >= 0) + close(sd); return NULL; ouch: if (e != -1) _ftp_seterr(e); - close(sd); + if (sd >= 0) + close(sd); return NULL; } @@ -331,26 +493,66 @@ ouch: static int _ftp_connect(char *host, int port, char *user, char *pwd, char *flags) { - int cd, e, pp = FTP_DEFAULT_PORT, direct, verbose; + int cd, e, pp = 0, direct, verbose; +#ifdef INET6 + int af = AF_UNSPEC; +#else + int af = AF_INET; +#endif char *p, *q; + const char *logname; + char localhost[MAXHOSTNAMELEN]; + char pbuf[MAXHOSTNAMELEN + MAXLOGNAME + 1]; direct = (flags && strchr(flags, 'd')); verbose = (flags && strchr(flags, 'v')); - + if ((flags && strchr(flags, '4'))) + af = AF_INET; + else if ((flags && strchr(flags, '6'))) + af = AF_INET6; + /* check for proxy */ if (!direct && (p = getenv("FTP_PROXY")) != NULL) { - if ((q = strchr(p, ':')) != NULL) { - /* XXX check that it's a valid number */ + char c = 0; + +#ifdef INET6 + if (*p != '[' || (q = strchr(p + 1, ']')) == NULL || + (*++q != '\0' && *q != ':')) +#endif + q = strchr(p, ':'); + if (q != NULL && *q == ':') { + if (strspn(q+1, "0123456789") != strlen(q+1) || strlen(q+1) > 5) { + /* XXX we should emit some kind of warning */ + } pp = atoi(q+1); + if (pp < 1 || pp > 65535) { + /* XXX we should emit some kind of warning */ + } } - if (q) + if (!pp) { + struct servent *se; + + if ((se = getservbyname("ftp", "tcp")) != NULL) + pp = ntohs(se->s_port); + else + pp = FTP_DEFAULT_PORT; + } + if (q) { +#ifdef INET6 + if (q > p && *p == '[' && *(q - 1) == ']') { + p++; + q--; + } +#endif + c = *q; *q = 0; - cd = _fetch_connect(p, pp, verbose); + } + cd = _fetch_connect(p, pp, af, verbose); if (q) - *q = ':'; + *q = c; } else { /* no proxy, go straight to target */ - cd = _fetch_connect(host, port, verbose); + cd = _fetch_connect(host, port, af, verbose); p = NULL; } @@ -373,7 +575,14 @@ _ftp_connect(char *host, int port, char *user, char *pwd, char *flags) /* did the server request a password? */ if (e == FTP_NEED_PASSWORD) { if (!pwd || !*pwd) - pwd = FTP_ANONYMOUS_PASSWORD; + pwd = getenv("FTP_PASSWORD"); + if (!pwd || !*pwd) { + if ((logname = getlogin()) == 0) + logname = FTP_ANONYMOUS_PASSWORD; + gethostname(localhost, sizeof localhost); + snprintf(pbuf, sizeof pbuf, "%s@%s", logname, localhost); + pwd = pbuf; + } e = _ftp_cmd(cd, "PASS %s", pwd); } @@ -437,8 +646,14 @@ _ftp_cached_connect(struct url *url, char *flags) cd = -1; /* set default port */ - if (!url->port) - url->port = FTP_DEFAULT_PORT; + if (!url->port) { + struct servent *se; + + if ((se = getservbyname("ftp", "tcp")) != NULL) + url->port = ntohs(se->s_port); + else + url->port = FTP_DEFAULT_PORT; + } /* try to use previously cached connection */ if (_ftp_isconnected(url)) { @@ -455,7 +670,7 @@ _ftp_cached_connect(struct url *url, char *flags) if (cached_socket) _ftp_disconnect(cached_socket); cached_socket = cd; - memcpy(&cached_host, url, sizeof(struct url)); + memcpy(&cached_host, url, sizeof *url); } return cd; @@ -474,7 +689,7 @@ fetchGetFTP(struct url *url, char *flags) return NULL; /* initiate the transfer */ - return _ftp_transfer(cd, "RETR", url->doc, "r", flags); + return _ftp_transfer(cd, "RETR", url->doc, "r", url->offset, flags); } /* @@ -491,7 +706,7 @@ fetchPutFTP(struct url *url, char *flags) /* initiate the transfer */ return _ftp_transfer(cd, (flags && strchr(flags, 'a')) ? "APPE" : "STOR", - url->doc, "w", flags); + url->doc, "w", url->offset, flags); } /* @@ -505,6 +720,9 @@ fetchStatFTP(struct url *url, struct url_stat *us, char *flags) time_t t; int e, cd; + us->size = -1; + us->atime = us->mtime = 0; + /* connect to server */ if ((cd = _ftp_cached_connect(url, flags)) == NULL) return -1; @@ -534,25 +752,40 @@ fetchStatFTP(struct url *url, struct url_stat *us, char *flags) _ftp_seterr(999); return -1; } + DEBUG(fprintf(stderr, "size: [\033[1m%lld\033[m]\n", us->size)); if ((e = _ftp_cmd(cd, "MDTM %s", s)) != FTP_FILE_STATUS) goto ouch; for (ln = last_reply + 4; *ln && isspace(*ln); ln++) /* nothing */ ; - sscanf(ln, "%04d%02d%02d%02d%02d%02d", - &tm.tm_year, &tm.tm_mon, &tm.tm_mday, - &tm.tm_hour, &tm.tm_min, &tm.tm_sec); - /* XXX should check the return value from sscanf */ + e = 999; + switch (strspn(ln, "0123456789")) { + case 14: + break; + case 15: + ln++; + ln[0] = '2'; + ln[1] = '0'; + break; + default: + goto ouch; + } + if (sscanf(ln, "%04d%02d%02d%02d%02d%02d", + &tm.tm_year, &tm.tm_mon, &tm.tm_mday, + &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) + goto ouch; tm.tm_mon--; tm.tm_year -= 1900; tm.tm_isdst = -1; - t = mktime(&tm); + t = timegm(&tm); if (t == (time_t)-1) t = time(NULL); - else - t += tm.tm_gmtoff; us->mtime = t; us->atime = t; + DEBUG(fprintf(stderr, "last modified: [\033[1m%04d-%02d-%02d " + "%02d:%02d:%02d\033[m]\n", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec)); return 0; ouch: |
