emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ftpd: added -A option to disable all authentication, closes 10921

Browse Source 
function                                             old     new   delta
packed_usage                                       32745   32777     +32
ftpd_main                                           2162    2156      -6
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 32/-6)              Total: 26 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2018-04-07 14:02:21 +02:00
parent 32c3e3a44c
commit 8edaaced16
1 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
networking/ftpd.c
View File

@@ -57,7 +57,7 @@
//usage: "[-wvS]"IF_FEATURE_FTPD_AUTHENTICATION(" [-a USER]")" [-t N] [-T N] [DIR]" //usage: "[-wvS]"IF_FEATURE_FTPD_AUTHENTICATION(" [-a USER]")" [-t N] [-T N] [DIR]"
//usage:#define ftpd_full_usage "\n\n" //usage:#define ftpd_full_usage "\n\n"
//usage: IF_NOT_FEATURE_FTPD_AUTHENTICATION( //usage: IF_NOT_FEATURE_FTPD_AUTHENTICATION(
//usage: "Anonymous FTP server. Accesses by clients occur under ftpd's UID.\n" //usage: "Anonymous FTP server. Client access occurs under ftpd's UID.\n"
//usage: ) //usage: )
//usage: IF_FEATURE_FTPD_AUTHENTICATION( //usage: IF_FEATURE_FTPD_AUTHENTICATION(
//usage: "FTP server. " //usage: "FTP server. "
@@ -66,9 +66,11 @@
//usage: "Should be used as inetd service, inetd.conf line:\n" //usage: "Should be used as inetd service, inetd.conf line:\n"
//usage: " 21 stream tcp nowait root ftpd ftpd /files/to/serve\n" //usage: " 21 stream tcp nowait root ftpd ftpd /files/to/serve\n"
//usage: "Can be run from tcpsvd:\n" //usage: "Can be run from tcpsvd:\n"
//usage: " tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n" //usage: " tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve"
//usage: "\n"
//usage: "\n -w Allow upload" //usage: "\n -w Allow upload"
//usage: IF_FEATURE_FTPD_AUTHENTICATION( //usage: IF_FEATURE_FTPD_AUTHENTICATION(
//usage: "\n -A No login required, client access occurs under ftpd's UID"
//usage: "\n -a USER Enable 'anonymous' login and map it to USER" //usage: "\n -a USER Enable 'anonymous' login and map it to USER"
//usage: ) //usage: )
//usage: "\n -v Log errors to stderr. -vv: verbose log" //usage: "\n -v Log errors to stderr. -vv: verbose log"
@@ -1157,9 +1159,12 @@ enum {
OPT_1 = (1 << 1), OPT_1 = (1 << 1),
OPT_A = (1 << 2), OPT_A = (1 << 2),
#endif #endif
OPT_v = (1 << ((!BB_MMU) * 3 + 0)), BIT_v = (!BB_MMU) * 3,
OPT_S = (1 << ((!BB_MMU) * 3 + 1)), OPT_v = (1 << (BIT_v + 0)),
OPT_w = (1 << ((!BB_MMU) * 3 + 2)) * ENABLE_FEATURE_FTPD_WRITE, OPT_S = (1 << (BIT_v + 1)),
OPT_w = (1 << (BIT_v + 2)) * ENABLE_FEATURE_FTPD_WRITE,
BIT_A = BIT_v + 2 + ENABLE_FEATURE_FTPD_WRITE,
OPT_A = (1 << (BIT_A + 0)) * ENABLE_FEATURE_FTPD_AUTHENTICATION,
}; };
int ftpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ftpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -1180,14 +1185,16 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
G.timeout = 2 * 60; G.timeout = 2 * 60;
#if BB_MMU #if BB_MMU
opts = getopt32(argv, "^" "vS" opts = getopt32(argv, "^" "vS"
IF_FEATURE_FTPD_WRITE("w") "t:+T:+" IF_FEATURE_FTPD_AUTHENTICATION("a:") IF_FEATURE_FTPD_WRITE("w") IF_FEATURE_FTPD_AUTHENTICATION("A")
"t:+T:+" IF_FEATURE_FTPD_AUTHENTICATION("a:")
"\0" "vv:SS", "\0" "vv:SS",
&G.timeout, &abs_timeout, IF_FEATURE_FTPD_AUTHENTICATION(&anon_opt,) &G.timeout, &abs_timeout, IF_FEATURE_FTPD_AUTHENTICATION(&anon_opt,)
&G.verbose, &verbose_S &G.verbose, &verbose_S
); );
#else #else
opts = getopt32(argv, "^" "l1AvS" opts = getopt32(argv, "^" "l1AvS"
IF_FEATURE_FTPD_WRITE("w") "t:+T:+" IF_FEATURE_FTPD_AUTHENTICATION("a:") IF_FEATURE_FTPD_WRITE("w") IF_FEATURE_FTPD_AUTHENTICATION("A")
"t:+T:+" IF_FEATURE_FTPD_AUTHENTICATION("a:")
"\0" "vv:SS", "\0" "vv:SS",
&G.timeout, &abs_timeout, IF_FEATURE_FTPD_AUTHENTICATION(&anon_opt,) &G.timeout, &abs_timeout, IF_FEATURE_FTPD_AUTHENTICATION(&anon_opt,)
&G.verbose, &verbose_S &G.verbose, &verbose_S
@@ -1254,30 +1261,32 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
signal(SIGALRM, timeout_handler); signal(SIGALRM, timeout_handler);
#if ENABLE_FEATURE_FTPD_AUTHENTICATION #if ENABLE_FEATURE_FTPD_AUTHENTICATION
while (1) { if (!(opts & OPT_A)) {
uint32_t cmdval = cmdio_get_cmd_and_arg(); while (1) {
if (cmdval == const_USER) { uint32_t cmdval = cmdio_get_cmd_and_arg();
if (anon_opt && strcmp(G.ftp_arg, "anonymous") == 0) { if (cmdval == const_USER) {
pw = getpwnam(anon_opt); if (anon_opt && strcmp(G.ftp_arg, "anonymous") == 0) {
if (pw) pw = getpwnam(anon_opt);
break; /* does not even ask for password */ if (pw)
break; /* does not even ask for password */
}
pw = getpwnam(G.ftp_arg);
cmdio_write_raw(STR(FTP_GIVEPWORD)" Specify password\r\n");
} else if (cmdval == const_PASS) {
if (check_password(pw, G.ftp_arg) > 0) {
break; /* login success */
}
cmdio_write_raw(STR(FTP_LOGINERR)" Login failed\r\n");
pw = NULL;
} else if (cmdval == const_QUIT) {
WRITE_OK(FTP_GOODBYE);
return 0;
} else {
cmdio_write_raw(STR(FTP_LOGINERR)" Login with USER+PASS\r\n");
} }
pw = getpwnam(G.ftp_arg);
cmdio_write_raw(STR(FTP_GIVEPWORD)" Specify password\r\n");
} else if (cmdval == const_PASS) {
if (check_password(pw, G.ftp_arg) > 0) {
break; /* login success */
}
cmdio_write_raw(STR(FTP_LOGINERR)" Login failed\r\n");
pw = NULL;
} else if (cmdval == const_QUIT) {
WRITE_OK(FTP_GOODBYE);
return 0;
} else {
cmdio_write_raw(STR(FTP_LOGINERR)" Login with USER+PASS\r\n");
} }
WRITE_OK(FTP_LOGINOK);
} }
WRITE_OK(FTP_LOGINOK);
#endif #endif
/* Do this after auth, else /etc/passwd is not accessible */ /* Do this after auth, else /etc/passwd is not accessible */
@@ -1309,7 +1318,9 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
} }
#if ENABLE_FEATURE_FTPD_AUTHENTICATION #if ENABLE_FEATURE_FTPD_AUTHENTICATION
change_identity(pw); if (pw)
change_identity(pw);
/* else: -A is in effect */
#endif #endif
/* RFC-959 Section 5.1 /* RFC-959 Section 5.1