From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/networking/ftpgetput.c | 476 ++++++++++------------ 1 file changed, 216 insertions(+), 260 deletions(-) (limited to 'release/src/router/busybox/networking/ftpgetput.c') diff --git a/release/src/router/busybox/networking/ftpgetput.c b/release/src/router/busybox/networking/ftpgetput.c index 41f45414..d39b73eb 100644 --- a/release/src/router/busybox/networking/ftpgetput.c +++ b/release/src/router/busybox/networking/ftpgetput.c @@ -1,183 +1,208 @@ /* vi: set sw=4 ts=4: */ /* - * ftpget - * + * ftpget + * * Mini implementation of FTP to retrieve a remote file. * * Copyright (C) 2002 Jeff Angielski, The PTR Group - * Copyright (C) 2002 Glenn McGrath + * Copyright (C) 2002 Glenn McGrath * * Based on wget.c by Chip Rosenthal Covad Communications * * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "busybox.h" - -typedef struct ftp_host_info_s { - char *host; - char *port; - char *user; - char *password; -} ftp_host_info_t; - -static char verbose_flag; -static char do_continue = 0; - -static ftp_host_info_t *ftp_init(void) +#include "libbb.h" + +struct globals { + const char *user; + const char *password; + struct len_and_sockaddr *lsa; + FILE *control_stream; + int verbose_flag; + int do_continue; + char buf[1]; /* actually [BUFSZ] */ +}; +#define G (*(struct globals*)&bb_common_bufsiz1) +enum { BUFSZ = COMMON_BUFSIZE - offsetof(struct globals, buf) }; +struct BUG_G_too_big { + char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; +}; +#define user (G.user ) +#define password (G.password ) +#define lsa (G.lsa ) +#define control_stream (G.control_stream) +#define verbose_flag (G.verbose_flag ) +#define do_continue (G.do_continue ) +#define buf (G.buf ) +#define INIT_G() do { } while (0) + + +static void ftp_die(const char *msg) NORETURN; +static void ftp_die(const char *msg) { - ftp_host_info_t *host; + char *cp = buf; /* buf holds peer's response */ + + /* Guard against garbage from remote server */ + while (*cp >= ' ' && *cp < '\x7f') + cp++; + *cp = '\0'; + bb_error_msg_and_die("unexpected server response%s%s: %s", + (msg ? " to " : ""), (msg ? msg : ""), buf); +} + +static int ftpcmd(const char *s1, const char *s2) +{ + unsigned n; - host = xcalloc(1, sizeof(ftp_host_info_t)); + if (verbose_flag) { + bb_error_msg("cmd %s %s", s1, s2); + } - /* Set the default port */ - if (getservbyname("ftp", "tcp")) { - host->port = "ftp"; - } else { - host->port = "21"; + if (s1) { + fprintf(control_stream, (s2 ? "%s %s\r\n" : "%s %s\r\n"+3), + s1, s2); + fflush(control_stream); } - host->user = "anonymous"; - host->password = "busybox@"; - return(host); + do { + strcpy(buf, "EOF"); + if (fgets(buf, BUFSZ - 2, control_stream) == NULL) { + ftp_die(NULL); + } + } while (!isdigit(buf[0]) || buf[3] != ' '); + + buf[3] = '\0'; + n = xatou(buf); + buf[3] = ' '; + return n; } -static int ftpcmd(const char *s1, const char *s2, FILE *stream, char *buf) +static void ftp_login(void) { - if (verbose_flag) { - bb_error_msg("cmd %s%s", s1, s2); + /* Connect to the command socket */ + control_stream = fdopen(xconnect_stream(lsa), "r+"); + if (control_stream == NULL) { + /* fdopen failed - extremely unlikely */ + bb_perror_nomsg_and_die(); } - if (s1) { - if (s2) { - fprintf(stream, "%s%s\n", s1, s2); - } else { - fprintf(stream, "%s\n", s1); - } + if (ftpcmd(NULL, NULL) != 220) { + ftp_die(NULL); } - do { - if (fgets(buf, 510, stream) == NULL) { - bb_perror_msg_and_die("fgets()"); + /* Login to the server */ + switch (ftpcmd("USER", user)) { + case 230: + break; + case 331: + if (ftpcmd("PASS", password) != 230) { + ftp_die("PASS"); } - } while (! isdigit(buf[0]) || buf[3] != ' '); + break; + default: + ftp_die("USER"); + } - return atoi(buf); + ftpcmd("TYPE I", NULL); } -static int xconnect_ftpdata(const char *target_host, const char *buf) +static int xconnect_ftpdata(void) { char *buf_ptr; - char data_port[6]; - unsigned short port_num; + unsigned port_num; + +/* +TODO: PASV command will not work for IPv6. RFC2428 describes +IPv6-capable "extended PASV" - EPSV. + +"EPSV [protocol]" asks server to bind to and listen on a data port +in specified protocol. Protocol is 1 for IPv4, 2 for IPv6. +If not specified, defaults to "same as used for control connection". +If server understood you, it should answer "229 (|||port|)" +where "|" are literal pipe chars and "port" is ASCII decimal port#. + +There is also an IPv6-capable replacement for PORT (EPRT), +but we don't need that. + +NB: PASV may still work for some servers even over IPv6. +For example, vsftp happily answers +"227 Entering Passive Mode (0,0,0,0,n,n)" and proceeds as usual. + +TODO2: need to stop ignoring IP address in PASV response. +*/ + + if (ftpcmd("PASV", NULL) != 227) { + ftp_die("PASV"); + } + + /* Response is "NNN garbageN1,N2,N3,N4,P1,P2[)garbage] + * Server's IP is N1.N2.N3.N4 (we ignore it) + * Server's port for data connection is P1*256+P2 */ + buf_ptr = strrchr(buf, ')'); + if (buf_ptr) *buf_ptr = '\0'; buf_ptr = strrchr(buf, ','); *buf_ptr = '\0'; - port_num = atoi(buf_ptr + 1); + port_num = xatoul_range(buf_ptr + 1, 0, 255); buf_ptr = strrchr(buf, ','); *buf_ptr = '\0'; - port_num += atoi(buf_ptr + 1) * 256; + port_num += xatoul_range(buf_ptr + 1, 0, 255) * 256; - sprintf(data_port, "%d", port_num); - return(xconnect(target_host, data_port)); + set_nport(lsa, htons(port_num)); + return xconnect_stream(lsa); } -static FILE *ftp_login(ftp_host_info_t *server) +static int pump_data_and_QUIT(int from, int to) { - FILE *control_stream; - char buf[512]; - int control_fd; - - /* Connect to the command socket */ - control_fd = xconnect(server->host, server->port); - control_stream = fdopen(control_fd, "r+"); - if (control_stream == NULL) { - bb_perror_msg_and_die("Couldnt open control stream"); + /* copy the file */ + if (bb_copyfd_eof(from, to) == -1) { + /* error msg is already printed by bb_copyfd_eof */ + return EXIT_FAILURE; } - if (ftpcmd(NULL, NULL, control_stream, buf) != 220) { - bb_error_msg_and_die("%s", buf + 4); - } + /* close data connection */ + close(from); /* don't know which one is that, so we close both */ + close(to); - /* Login to the server */ - switch (ftpcmd("USER ", server->user, control_stream, buf)) { - case 230: - break; - case 331: - if (ftpcmd("PASS ", server->password, control_stream, buf) != 230) { - bb_error_msg_and_die("PASS error: %s", buf + 4); - } - break; - default: - bb_error_msg_and_die("USER error: %s", buf + 4); + /* does server confirm that transfer is finished? */ + if (ftpcmd(NULL, NULL) != 226) { + ftp_die(NULL); } + ftpcmd("QUIT", NULL); - ftpcmd("TYPE I", NULL, control_stream, buf); - - return(control_stream); + return EXIT_SUCCESS; } -#ifdef CONFIG_FTPGET -static int ftp_recieve(FILE *control_stream, const char *host, const char *local_path, char *server_path) +#if !ENABLE_FTPGET +int ftp_receive(const char *local_path, char *server_path); +#else +static +int ftp_receive(const char *local_path, char *server_path) { - char *filename; - char *local_file; - char buf[512]; - off_t filesize = 0; int fd_data; - int fd_local; + int fd_local = -1; off_t beg_range = 0; - filename = bb_get_last_path_component(server_path); - local_file = concat_path_file(local_path, filename); + /* connect to the data socket */ + fd_data = xconnect_ftpdata(); - /* Connect to the data socket */ - if (ftpcmd("PASV", NULL, control_stream, buf) != 227) { - bb_error_msg_and_die("PASV error: %s", buf + 4); + if (ftpcmd("SIZE", server_path) != 213) { + do_continue = 0; } - fd_data = xconnect_ftpdata(host, buf); - if (ftpcmd("SIZE ", server_path, control_stream, buf) == 213) { - filesize = atol(buf + 4); + if (LONE_DASH(local_path)) { + fd_local = STDOUT_FILENO; + do_continue = 0; } if (do_continue) { struct stat sbuf; - if (lstat(local_file, &sbuf) < 0) { - bb_perror_msg_and_die("fstat()"); + /* lstat would be wrong here! */ + if (stat(local_path, &sbuf) < 0) { + bb_perror_msg_and_die("stat"); } if (sbuf.st_size > 0) { beg_range = sbuf.st_size; @@ -187,183 +212,114 @@ static int ftp_recieve(FILE *control_stream, const char *host, const char *local } if (do_continue) { - sprintf(buf, "REST %ld", (long)beg_range); - if (ftpcmd(buf, NULL, control_stream, buf) != 350) { + sprintf(buf, "REST %"OFF_FMT"d", beg_range); + if (ftpcmd(buf, NULL) != 350) { do_continue = 0; - } else { - filesize -= beg_range; } } - if (ftpcmd("RETR ", server_path, control_stream, buf) > 150) { - bb_error_msg_and_die("RETR error: %s", buf + 4); - } - - /* only make a local file if we know that one exists on the remote server */ - if (do_continue) { - fd_local = bb_xopen(local_file, O_APPEND | O_WRONLY); - } else { - fd_local = bb_xopen(local_file, O_CREAT | O_TRUNC | O_WRONLY); + if (ftpcmd("RETR", server_path) > 150) { + ftp_die("RETR"); } - /* Copy the file */ - if (bb_copyfd(fd_data, fd_local, filesize) == -1) { - exit(EXIT_FAILURE); + /* create local file _after_ we know that remote file exists */ + if (fd_local == -1) { + fd_local = xopen(local_path, + do_continue ? (O_APPEND | O_WRONLY) + : (O_CREAT | O_TRUNC | O_WRONLY) + ); } - /* close it all down */ - close(fd_data); - if (ftpcmd(NULL, NULL, control_stream, buf) != 226) { - bb_error_msg_and_die("ftp error: %s", buf + 4); - } - ftpcmd("QUIT", NULL, control_stream, buf); - - return(EXIT_SUCCESS); + return pump_data_and_QUIT(fd_data, fd_local); } #endif -#ifdef CONFIG_FTPPUT -static int ftp_send(FILE *control_stream, const char *host, const char *server_path, char *local_path) +#if !ENABLE_FTPPUT +int ftp_send(const char *server_path, char *local_path); +#else +static +int ftp_send(const char *server_path, char *local_path) { - struct stat sbuf; - char buf[512]; int fd_data; int fd_local; int response; - /* Connect to the data socket */ - if (ftpcmd("PASV", NULL, control_stream, buf) != 227) { - bb_error_msg_and_die("PASV error: %s", buf + 4); - } - fd_data = xconnect_ftpdata(host, buf); - - if (ftpcmd("CWD ", server_path, control_stream, buf) != 250) { - bb_error_msg_and_die("CWD error: %s", buf + 4); - } + /* connect to the data socket */ + fd_data = xconnect_ftpdata(); /* get the local file */ - fd_local = bb_xopen(local_path, O_RDONLY); - fstat(fd_local, &sbuf); - - sprintf(buf, "ALLO %lu", (unsigned long)sbuf.st_size); - response = ftpcmd(buf, NULL, control_stream, buf); - switch (response) { - case 200: - case 202: - break; - default: - close(fd_local); - bb_error_msg_and_die("ALLO error: %s", buf + 4); - break; - } + fd_local = STDIN_FILENO; + if (NOT_LONE_DASH(local_path)) + fd_local = xopen(local_path, O_RDONLY); - response = ftpcmd("STOR ", local_path, control_stream, buf); + response = ftpcmd("STOR", server_path); switch (response) { case 125: case 150: break; default: - close(fd_local); - bb_error_msg_and_die("STOR error: %s", buf + 4); - } - - /* transfer the file */ - if (bb_copyfd(fd_local, fd_data, 0) == -1) { - exit(EXIT_FAILURE); + ftp_die("STOR"); } - /* close it all down */ - close(fd_data); - if (ftpcmd(NULL, NULL, control_stream, buf) != 226) { - bb_error_msg_and_die("error: %s", buf + 4); - } - ftpcmd("QUIT", NULL, control_stream, buf); - - return(EXIT_SUCCESS); + return pump_data_and_QUIT(fd_local, fd_data); } #endif -int ftpgetput_main(int argc, char **argv) -{ - /* content-length of the file */ - int option_index = -1; - int opt; +#if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS +static const char ftpgetput_longopts[] ALIGN1 = + "continue\0" Required_argument "c" + "verbose\0" No_argument "v" + "username\0" Required_argument "u" + "password\0" Required_argument "p" + "port\0" Required_argument "P" + ; +#endif +int ftpgetput_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int ftpgetput_main(int argc UNUSED_PARAM, char **argv) +{ + unsigned opt; + const char *port = "ftp"; /* socket to ftp server */ - FILE *control_stream; - - /* continue a prev transfer (-c) */ - ftp_host_info_t *server; - - int (*ftp_action)(FILE *, const char *, const char *, char *) = NULL; - struct option long_options[] = { - {"username", 1, NULL, 'u'}, - {"password", 1, NULL, 'p'}, - {"port", 1, NULL, 'P'}, - {"continue", 1, NULL, 'c'}, - {"verbose", 0, NULL, 'v'}, - {0, 0, 0, 0} - }; +#if ENABLE_FTPPUT && !ENABLE_FTPGET +# define ftp_action ftp_send +#elif ENABLE_FTPGET && !ENABLE_FTPPUT +# define ftp_action ftp_receive +#else + int (*ftp_action)(const char *, char *) = ftp_send; -#ifdef CONFIG_FTPPUT - if (bb_applet_name[3] == 'p') { - ftp_action = ftp_send; - } -#endif -#ifdef CONFIG_FTPGET - if (bb_applet_name[3] == 'g') { - ftp_action = ftp_recieve; + /* Check to see if the command is ftpget or ftput */ + if (applet_name[3] == 'g') { + ftp_action = ftp_receive; } #endif + INIT_G(); /* Set default values */ - server = ftp_init(); - verbose_flag = 0; - - /* - * Decipher the command line - */ - while ((opt = getopt_long(argc, argv, "u:p:P:cv", long_options, &option_index)) != EOF) { - switch(opt) { - case 'c': - do_continue = 1; - break; - case 'u': - server->user = optarg; - break; - case 'p': - server->password = optarg; - break; - case 'P': - server->port = optarg; - break; - case 'v': - verbose_flag = 1; - break; - default: - bb_show_usage(); - } - } + user = "anonymous"; + password = "busybox@"; /* - * Process the non-option command line arguments + * Decipher the command line */ - if (argc - optind != 3) { - bb_show_usage(); +#if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS + applet_long_options = ftpgetput_longopts; +#endif + opt_complementary = "=3:vv:cc"; /* must have 3 params; -v and -c count */ + opt = getopt32(argv, "cvu:p:P:", &user, &password, &port, + &verbose_flag, &do_continue); + argv += optind; + + /* We want to do exactly _one_ DNS lookup, since some + * sites (i.e. ftp.us.debian.org) use round-robin DNS + * and we want to connect to only one IP... */ + lsa = xhost2sockaddr(argv[0], bb_lookup_port(port, "tcp", 21)); + if (verbose_flag) { + printf("Connecting to %s (%s)\n", argv[0], + xmalloc_sockaddr2dotted(&lsa->u.sa)); } - /* Connect/Setup/Configure the FTP session */ - server->host = argv[optind]; - control_stream = ftp_login(server); - - return(ftp_action(control_stream, argv[optind], argv[optind + 1], argv[optind + 2])); + ftp_login(); + return ftp_action(argv[1], argv[2]); } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ -- cgit v1.2.3-54-g00ecf