254 Commits

Author	SHA1	Message	Date
Laurent Bercot	0ef478f01b	httpd: fix address family for reverse proxy client socket ... When httpd proxies a request to another server, it first creates an AF_INET socket, then resolves the server name to a sockaddr, then connects to it. This fails if the server name resolves to an IPv6 address. This patch ensures that the socket is created with the correct address family (AF_INET6 if the server resolves to an IPv6 address and AF_INET otherwise). Signed-off-by: Laurent Bercot <ska-dietlibc@skarnet.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-01-08 15:14:38 +01:00
Denys Vlasenko	47367e1d50	Convert all networking/* applets to "new style" applet definitions ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-11-23 09:05:14 +01:00
Denys Vlasenko	9f8eb1ee76	httpd: explain why we use sprintf and why it should be fine ... While at it, fix a pathological case where it is not fine: -r REALM with some 8-kbyte long REALM would overflow the buffer. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-11-22 02:23:35 +01:00
Denys Vlasenko	9de2e5a222	*: hopefully all setup_common_bufsiz() are in place ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-04-21 18:38:51 +02:00
Denys Vlasenko	e6a2f4cc5a	libbb: make bb_common_bufsiz1 1 kbyte, add capability to use bss tail for it ... The config item is FEATURE_USE_BSS_TAIL. When it is off (default): function old new delta read_config 210 228 +18 doCommands 2279 2294 +15 ipneigh_list_or_flush 763 772 +9 ipaddr_list_or_flush 1256 1261 +5 display_process_list 1301 1306 +5 conspy_main 1378 1383 +5 do_lzo_compress 352 355 +3 do_lzo_decompress 565 567 +2 push 46 44 -2 inetd_main 2136 2134 -2 uevent_main 421 418 -3 addLines 97 92 -5 bb_common_bufsiz1 8193 1024 -7169 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 8/5 up/down: 62/-7181) Total: -7119 bytes text data bss dec hex filename 829850 4086 9080 843016 cdd08 busybox_old 829901 4086 1904 835891 cc133 busybox_unstripped FEATURE_USE_BSS_TAIL=y: read_config 210 228 +18 doCommands 2279 2294 +15 ipneigh_list_or_flush 763 772 +9 ipaddr_list_or_flush 1256 1261 +5 display_process_list 1301 1306 +5 conspy_main 1378 1383 +5 do_lzo_compress 352 355 +3 do_lzo_decompress 565 567 +2 inetd_main 2136 2134 -2 bb_common_bufsiz1 8193 - -8193 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 8/1 up/down: 62/-8195) Total: -8133 bytes text data bss dec hex filename 829850 4086 9080 843016 cdd08 busybox_old 829911 4086 880 834877 cbd3d busybox_unstripped FIXME: setup_common_bufsiz() calls are missing. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-04-21 17:39:11 +02:00
Denys Vlasenko	59f8475924	httpd: fix heap buffer overflow. Closes 8426 ... function old new delta send_headers 654 677 +23 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-10-23 11:49:04 +02:00
Denys Vlasenko	7f3a2a2256	join some common strings, -400 bytes ... function old new delta print_intel_cstates 499 511 +12 file_insert 355 364 +9 dpkg_main 2944 2940 -4 ifenslave_main 645 640 -5 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/2 up/down: 21/-9) Total: 12 bytes text data bss dec hex filename 937564 932 17676 956172 e970c busybox_old 937164 932 17676 955772 e957c busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-10-08 11:24:44 +02:00
Denys Vlasenko	c52cbea2bb	libbb: add setsockopt_foo helpers ... function old new delta setsockopt_int - 23 +23 do_load 918 934 +16 setsockopt_SOL_SOCKET_int - 14 +14 setsockopt_keepalive - 10 +10 setsockopt_SOL_SOCKET_1 - 10 +10 buffer_fill_and_print 169 178 +9 setsockopt_1 - 8 +8 nfsmount 3560 3566 +6 redirect 1277 1282 +5 tcpudpsvd_main 1782 1786 +4 d6_send_kernel_packet 272 275 +3 i2cget_main 380 382 +2 ed_main 2544 2545 +1 scan_recursive 380 378 -2 nbdclient_main 492 490 -2 hash_find 235 233 -2 cmdputs 334 332 -2 parse_command 1443 1440 -3 static.two 4 - -4 ntpd_main 1039 1035 -4 const_int_1 4 - -4 const_IPTOS_LOWDELAY 4 - -4 RCVBUF 4 - -4 ntp_init 474 469 -5 change_listen_mode 316 310 -6 uevent_main 416 409 -7 arping_main 1697 1690 -7 telnet_main 1612 1603 -9 socket_want_pktinfo 42 33 -9 setsockopt_reuseaddr 21 10 -11 setsockopt_broadcast 21 10 -11 httpd_main 772 757 -15 get_remote_transfer_fd 109 94 -15 make_new_session 503 487 -16 ftpd_main 2177 2160 -17 read_bunzip 1896 1866 -30 common_traceroute_main 4099 4058 -41 common_ping_main 1836 1783 -53 ------------------------------------------------------------------------------ (add/remove: 5/4 grow/shrink: 8/21 up/down: 111/-283) Total: -172 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-08-24 20:00:17 +02:00
Denys Vlasenko	8dff01d06a	libbb: introduce and use is_prefixed_with() ... function old new delta is_prefixed_with - 18 +18 complete_username 78 77 -1 man_main 737 735 -2 fsck_device 429 427 -2 unpack_ar_archive 80 76 -4 strip_unsafe_prefix 105 101 -4 singlemount 1054 1050 -4 rtc_adjtime_is_utc 90 86 -4 resolve_mount_spec 88 84 -4 parse_one_line 1029 1025 -4 parse_conf 1460 1456 -4 may_wakeup 83 79 -4 loadkmap_main 219 215 -4 get_irqs_from_stat 103 99 -4 get_header_cpio 913 909 -4 findfs_main 79 75 -4 fbsplash_main 1230 1226 -4 load_crontab 776 771 -5 expand_vars_to_list 1151 1146 -5 date_main 881 876 -5 skip_dev_pfx 30 24 -6 make_device 2199 2193 -6 complete_cmd_dir_file 773 767 -6 run_applet_and_exit 715 708 -7 uudecode_main 321 313 -8 pwdx_main 197 189 -8 execute 568 560 -8 i2cdetect_main 1186 1176 -10 procps_scan 1242 1230 -12 procps_read_smaps 1017 1005 -12 process_module 746 734 -12 patch_main 1903 1891 -12 nfsmount 3572 3560 -12 stack_machine 126 112 -14 process_timer_stats 449 435 -14 match_fstype 111 97 -14 do_ipaddr 1344 1330 -14 open_list_and_close 359 343 -16 get_header_tar 1795 1779 -16 prepend_new_eth_table 340 323 -17 fsck_main 1811 1794 -17 find_iface_state 56 38 -18 dnsd_main 1321 1303 -18 base_device 179 158 -21 find_keyword 104 82 -22 handle_incoming_and_exit 2785 2762 -23 parse_and_put_prompt 774 746 -28 modinfo 347 317 -30 find_action 204 171 -33 update_passwd 1470 1436 -34 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/49 up/down: 18/-540) Total: -522 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-03-12 17:48:34 +01:00
Bartosz Golaszewski	8d75d794ea	libbb: use sendfile() to copy data between file descriptors ... Busybox already uses sendfile in httpd. This patch proposes to use it globally to copy data between file descriptors. It speeds up the copying on slow systems a lot - below are the times needed to copy a 450Mb file with and without this option enabled on a BeagleBone Black: sendfile: user 0m0.000s sys 0m8.170s read/write 4k: user 0m0.470s sys 0m16.300s function old new delta bb_full_fd_action 394 474 +80 Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-11-27 23:31:58 +01:00
Denys Vlasenko	a6ed6a3148	httpd: make sire pfd[TO_CGI].revents is cleared before poll() ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-09-18 12:08:41 +02:00
Denys Vlasenko	fbe250db76	httpd: treat errors from stdin correctly. ... Fron bug report: If a CGI or proxied connection is rudely aborted (SIG_{KILL,BUS,SEGV}) then httpd will spin madly the poll loop in: networking/httpd.c:1080 cgi_io_loop_and_exit() Upon investigation I found that pfd[0].revents == 0x0018 (POLLHUP|POLLERR), which leads to empty read, but the pfd[0].fd (STDIN_FILENO) is left open, and in the FD list given to poll() which immediately returns to once again inform the loop of (POLLHUP|POLLERR) condition of pfd[0].fd. This continues until pfd[FROM_CGI].revents != 0 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-09-11 14:59:21 +02:00
Denys Vlasenko	982e87f2fb	Whitespace fixes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-07-30 11:52:58 +02:00
Denys Vlasenko	85daa67bc2	httpd: don't allow tabs and multiple spaces in request string ... HTTP standard doesn't allow it and no sane clients should ever use it. function old new delta handle_incoming_and_exit 2795 2785 -10 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-03-25 23:27:00 +01:00
Denys Vlasenko	6967578728	whitespace fixes. no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-14 01:34:48 +01:00
Pascal Bellard	70fc8c17e2	su: do not change to home dir unless -l ... Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-06-12 13:21:02 +02:00
Denys Vlasenko	8cab66730a	fix build breakage found by randconfig ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-04-20 14:48:00 +02:00
Rob Walker	7a4269329f	httpd: emit correct content length on range requests past the end. Closes 4952 ... Signed-off-by: Rob Walker <rwalker@codeaurora.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-04-03 08:09:28 +02:00
Denys Vlasenko	8cce1b3ad8	httpd: make byte ranges which start at 0 work too. Closes 4766 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-02-19 17:18:45 +01:00
Denys Vlasenko	ef43beac63	httpd: fix sendfile of files larger than 2 Gb. Closes 4754 ... When built with "sendfile" support, httpd was unable to send large files (>2 GB) in one single connection, terminating it before the full file has been sent. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-02-04 21:37:17 +01:00
Denys Vlasenko	35def51c97	httpd: fix MD5-encrypted-in-httpd.conf password logic ... function old new delta check_user_passwd 467 492 +25 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-02-01 02:42:54 +01:00
Denys Vlasenko	03419aa037	httpd: don't drop/abuse QUERY_STRING when /cgi-bin/index.cgi is used ... Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-12-19 12:30:34 +01:00
Denys Vlasenko	f282c6b657	libbb: remove is_directory's argument which is always NULL ... function old new delta send_cgi_and_exit 892 890 -2 ln_main 447 445 -2 handle_incoming_and_exit 2784 2780 -4 is_directory 66 59 -7 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/6 up/down: 2/-19) Total: -15 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-12-18 03:27:46 +01:00
Denys Vlasenko	f85bd1a7a7	httpd: remove redundant NULL assignment and save one strrchr. -8 bytes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-12-18 03:22:36 +01:00
Denys Vlasenko	b05cd6b7a7	httpd: fix /../ sanitization (had one extra semicolon). rewrote it ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-12-16 01:37:02 +01:00
Pascal Bellard	0fa3e5f6f9	httpd: small fixes to previous change ... Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-11-29 20:54:30 +01:00
Pascal Bellard	7291755439	httpd: make it possible to use system passwords for auth ... function old new delta check_user_passwd 320 467 +147 httpd_main 760 757 -3 Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-11-29 13:51:11 +01:00
Denys Vlasenko	d2277e262f	nommu: fix cases where we mangle argv[0][0] ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-11-22 17:19:26 +01:00
Denys Vlasenko	dd1061b6a7	wget: URL-decode user:password before base64-encoding it into auth hdr. Closes 3625. ... function old new delta percent_decode_in_place - 152 +152 parse_url 304 317 +13 handle_incoming_and_exit 2795 2798 +3 httpd_main 763 760 -3 decodeString 152 - -152 ------------------------------------------------------------------------------ (add/remove: 2/1 grow/shrink: 2/1 up/down: 168/-155) Total: 13 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-09-11 21:04:02 +02:00
Denys Vlasenko	66426760be	*: remove "Options:" string from help texts ... function old new delta packed_usage 28706 28623 -83 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-06-05 03:58:28 +02:00
Denys Vlasenko	12a432715f	adduser: safe username passing to passwd/addgroup ... passwd: support creating SHA passwords random code shrink function old new delta crypt_make_pw_salt - 87 +87 adduser_main 883 904 +21 ... crypt_make_salt 99 89 -10 chpasswd_main 329 312 -17 packed_usage 28731 28691 -40 passwd_main 1070 1000 -70 cryptpw_main 310 224 -86 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 4/12 up/down: 154/-288) Total: -134 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-05-13 03:19:01 +02:00
Pere Orga	5bc8c005a8	move remaining help text from include/usage.src.h ... Signed-off-by: Pere Orga <gotrunks@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-04-11 03:29:49 +02:00
Denys Vlasenko	d277f55ebd	http: document index.cgi usage. no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-04-10 03:08:22 +02:00
Peter Korsgaard	95755181b8	httpd: don't send error messages with gzip encoding ... If CONFIG_FEATURE_HTTPD_GZIP is enabled and request contained 'Accept-Encoding: gzip', then errors were sent with 'Content-Encoding: gzip' even though they aren't. Fix it by clearing content_gzip before sending the headers. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-03-27 23:26:33 +02:00
Denys Vlasenko	8030a14849	httpd: send correct mtime for .gz files ... Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>	2011-01-11 17:59:45 +01:00
Denys Vlasenko	fb132e4737	whitespace cleanup ... Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>	2010-10-29 11:46:52 +02:00
Denys Vlasenko	0ef64bdb40	*: make GNU licensing statement forms more regular ... This change retains "or later" state! No licensing _changes_ here, only form is adjusted (article, space between "GPL" and "v2" and so on). Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-08-16 20:14:46 +02:00
Peter Korsgaard	e5dbd56d77	httpd: simplified "gzip" test ... function old new delta handle_incoming_and_exit 2830 2807 -23 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-07-26 02:08:35 +02:00
Peter Korsgaard	7a2ba329b9	httpd: optional support for gzip-compressed pages ... function old new delta send_file_and_exit 662 761 +99 handle_incoming_and_exit 2756 2830 +74 send_headers 603 654 +51 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/0 up/down: 224/0) Total: 224 bytes Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-07-25 03:20:53 +02:00
Denys Vlasenko	535ce1df5c	httpd: cosmetic fixes, no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-07-25 03:20:25 +02:00
Denys Vlasenko	31c3dad851	remove recently added erroneous _and_die() ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-06-27 16:57:55 +02:00
Denys Vlasenko	41ddd9f606	*: make exec failure message more consistent ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-06-25 01:46:53 +02:00
Denys Vlasenko	8fc9e6a15d	httpd: fix proxy mode bug (annoying but harmless), better help text ... function old new delta cgi_io_loop_and_exit 594 635 +41 packed_usage 26815 26841 +26 handle_incoming_and_exit 2745 2739 -6 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-04-02 10:40:58 +02:00
Denys Vlasenko	88aa558e5c	*: do not check for POLLIN/POLLOUT only, just in case it's POLHUP/POLERR ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-02 15:02:45 +01:00
Bernhard Reutner-Fischer	ca228fb16d	reuse a few strings ... text data bss dec hex filename 839040 453 6828 846321 ce9f1 busybox_old 839019 453 6828 846300 ce9dc busybox_unstripped Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-02-26 10:09:31 +01:00
Denys Vlasenko	cb23d93c68	*: add/remove safe_, it seems we had a few incorrect uses ... function old new delta chat_main 1359 1361 +2 microcom_main 712 713 +1 ifplugd_main 1109 1110 +1 arpping 465 466 +1 acpid_main 440 441 +1 script_main 1069 1067 -2 cgi_io_loop_and_exit 594 591 -3 telnet_main 1475 1469 -6 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 5/3 up/down: 6/-11) Total: -5 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-01-12 12:29:55 +01:00
Denys Vlasenko	dbc6a7a8fd	httpd -m: output salted MD5 hash. By (forrest AT hifulltech.com) ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-12-16 02:28:50 +01:00
Denys Vlasenko	a3aa3e3095	wget: check for close success; fix chunked; do not bother to send QUIT to ftp ... Also, random fixes to use %u for unsigned quantities. -14 bytes in wget. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-12-11 12:36:10 +01:00
Denys Vlasenko	33d8d08f78	httpd: shrink mime type matching code (suggested by Bernhard) ... function old new delta static.suffixTable 100 231 +131 send_file_and_exit 625 658 +33 handle_incoming_and_exit 2749 2745 -4 send_cgi_and_exit 936 901 -35 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/2 up/down: 164/-39) Total: 125 bytes text data bss dec hex filename 824631 458 6956 832045 cb22d busybox_old 824550 458 6956 831964 cb1dc busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-09-10 01:46:02 +02:00
Denys Vlasenko	108b8c5367	httpd: fix bug 601 "I:index.php does not run interpreter on DIR/ url" ... function old new delta parse_conf 1462 1485 +23 index_html - 11 +11 handle_incoming_and_exit 2762 2749 -13 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 1/1 up/down: 34/-13) Total: 21 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-09-08 21:17:49 +02:00