Changes In Branch remove-c11-atomics Excluding Merge-Ins
This is equivalent to a diff from 879cdc86ce to fe6d401e68
2020-03-31
| ||
14:30 | Integrated remove-c11-atomics changes check-in: 7ee2e833d2 user: rkeene tags: trunk | |
14:26 | Made socket idle timeout checks more frequent Closed-Leaf check-in: fe6d401e68 user: rkeene tags: remove-c11-atomics | |
14:20 | Log the connect time, which is significant for closed sockets since they have no request time (since no request was made) check-in: 05f8958cc7 user: rkeene tags: remove-c11-atomics | |
13:41 | Merged in trunk check-in: 1c1d95a764 user: rkeene tags: remove-c11-atomics | |
2018-05-03
| ||
20:08 | Added support for not redirecting to index.html check-in: 879cdc86ce user: rkeene tags: trunk | |
2016-09-22
| ||
19:30 | Post-release version increment check-in: f3418e68d2 user: rkeene tags: trunk | |
Modified Makefile from [2fd19df44e] to [8ce95f72a7].
1 | CC = gcc | | | 1 2 3 4 5 6 7 8 9 | CC = gcc CFLAGS = -I. -Wall -W -pthread -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE $(FILED_EXTRA_CFLAGS) LDFLAGS = -pthread $(FILED_EXTRA_LDFLAGS) LIBS = -lpthread $(FILED_EXTRA_LIBS) MIMETYPES = /etc/httpd/mime.types PREFIX = /usr/local prefix = $(PREFIX) bindir = $(prefix)/bin |
︙ | ︙ |
Modified README from [e85e320923] to [dc3dfdd9b3].
︙ | ︙ | |||
51 52 53 54 55 56 57 | 1. Logging (CFLAGS, -DFILED_DONT_LOG=1) It is possible to disable ALL logging from filed. When logging is completely disabled interlocks (mutexes) for the logging pointer are not engaged and the logging functions are not compiled at all. This results in a slightly smaller and faster binary | < < < < < < < < | | | | | < < < < < < < < < < < < < < < | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | 1. Logging (CFLAGS, -DFILED_DONT_LOG=1) It is possible to disable ALL logging from filed. When logging is completely disabled interlocks (mutexes) for the logging pointer are not engaged and the logging functions are not compiled at all. This results in a slightly smaller and faster binary 2. Debugging (CFLAGS, -DFILED_DEBUG=1) This is an internal option and should only be used during development. 3. Differing HTTP semantics (CFLAGS, -DFILED_NONBLOCK_HTTP=1) It is possible that some HTTP clients may not process the HTTP stream being delivered if they cannot write to the HTTP stream itself. This has not been observed yet, but it is possible. If these semantics are needed (and they should not be) then they can be enabled with this flag at the cost of performance. 4. Differing chroot() semantics (CFLAGS, -DFILED_FAKE_CHROOT=1) In some cases it is desirable to mangle paths with a path prefix rather than call chroot() at startup. This is less secure and slower and should be generally avoided -- however it may be necessary to do. In these cases the executable may be compiled with the FILED_FAKE_CHROOT C preprocessor macro defined and instead of calling chroot() all HTTP requests will have the root suffix specified as the argument to the "-r" or "--root" option prepended to them. 5. Differing "index.html" handling (CFLAGS, -DFILED_DONT_REDIRECT_DIRECTORIES=1) Normally "filed" redirects users who request a directory to the index.html file in that directory so that no memory allocations are required; This option lets the server generate the new path. 6. MIME Types (MIMETYPES) For single-file convenience "filed" compiles the mapping of file extensions (the string in the filename following its last dot (".")) into the executable. This mapping comes from a file in the format of type1 type1_extension1 type1_extension2... type2 type2_extension1 type2_extension2... ... However it may not be desirable to include this mapping, or it may be desirable to use your own mapping rather than the default one. This can be done by specifying the MIMETYPES macro to "make". If no mapping is desired, "/dev/null" may be specified. Log Files --------- Because "filed" relies on chroot(2) and setuid(2), log files cannot reliably be re-opened. If you need log rotation then a second process, which can close and re-open log files, must be used. Any process may be used for writing logs but if the process does not support log rotation then it will not provide that benefit. For example, if you wish to write logs to syslogd(8) you can use logger(1), such as: # ./filed --root /www --user nobody --log '|logger -t filed' --daemon |
Modified filed.c from [b6a9efc107] to [7252b16239].
︙ | ︙ | |||
39 40 41 42 43 44 45 | #include <stdarg.h> #include <fcntl.h> #include <stdio.h> #include <errno.h> #include <time.h> #include <pwd.h> | < < < < < < < < < < < < < < < < < < < < < < < < < < | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | #include <stdarg.h> #include <fcntl.h> #include <stdio.h> #include <errno.h> #include <time.h> #include <pwd.h> /* Compile time constants */ #define FILED_VERSION "1.21" #define FILED_SENDFILE_MAX 16777215 #define FILED_MAX_FAILURE_COUNT 30 #define FILED_DEFAULT_TYPE "application/octet-stream" #define FILED_PATH_BUFFER_SIZE 1010 /* Default values */ #define PORT 80 #define THREAD_COUNT 5 #define BIND_ADDR "::" #define CACHE_SIZE 8209 #define LOG_FILE "-" /* Fuzzing Test Code */ #ifdef FILED_TEST_AFL #define FILED_DONT_LOG 1 #define pthread_create(a, x, y, z) afl_pthread_create(a, x, y, z) #define bind(x, y, z) afl_bind(x, y, z) #define socket(x, y, z) 8193 #define listen(x, y) 0 #define accept(x, y, z) afl_accept(x, y, z) #define close(x) { if (strcmp(#x, "random_fd") == 0) { close(x); } else { exit(0); } } #define fclose(x) exit(0) |
︙ | ︙ | |||
204 205 206 207 208 209 210 211 212 213 214 215 216 217 | /* Message buffer for type = MESSAGE */ /* Path buffer for type = TRANSFER */ char buffer[FILED_PATH_BUFFER_SIZE]; /* Items for type = TRANSFER */ int http_code; const char *reason; time_t starttime; time_t endtime; off_t req_offset; off_t req_length; off_t sent_length; off_t file_length; char ip[128]; | > | 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | /* Message buffer for type = MESSAGE */ /* Path buffer for type = TRANSFER */ char buffer[FILED_PATH_BUFFER_SIZE]; /* Items for type = TRANSFER */ int http_code; const char *reason; time_t connecttime; time_t starttime; time_t endtime; off_t req_offset; off_t req_length; off_t sent_length; off_t file_length; char ip[128]; |
︙ | ︙ | |||
486 487 488 489 490 491 492 | break; } if (curr->endtime == ((time_t) -1)) { curr->endtime = now; } | | > | 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 | break; } if (curr->endtime == ((time_t) -1)) { curr->endtime = now; } fprintf(fp, "TRANSFER METHOD=%s PATH=%s SRC=%s:%i CLIENT.TIME.CONNECT=%llu REQUEST.TIME.START=%llu REQUEST.TIME.END=%llu CODE.VALUE=%u CODE.REASON=%s REQUEST.OFFSET=%llu REQUEST.LENGTH=%llu FILE.LENGTH=%llu TRANSFER.LENGTH=%llu", method, curr->buffer, curr->ip, curr->port, (unsigned long long) curr->connecttime, (unsigned long long) curr->starttime, (unsigned long long) curr->endtime, curr->http_code, curr->reason, (unsigned long long) curr->req_offset, (unsigned long long) curr->req_length, (unsigned long long) curr->file_length, (unsigned long long) curr->sent_length |
︙ | ︙ | |||
540 541 542 543 544 545 546 547 548 549 550 551 552 553 | struct filed_log_entry *retval; retval = malloc(sizeof(*retval)); if (initialize) { retval->buffer[0] = '\0'; retval->http_code = -1; retval->starttime = 0; retval->endtime = 0; retval->req_offset = 0; retval->req_length = 0; retval->sent_length = 0; retval->file_length = 0; retval->ip[0] = '\0'; | > | 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 | struct filed_log_entry *retval; retval = malloc(sizeof(*retval)); if (initialize) { retval->buffer[0] = '\0'; retval->http_code = -1; retval->connecttime = 0; retval->starttime = 0; retval->endtime = 0; retval->req_offset = 0; retval->req_length = 0; retval->sent_length = 0; retval->file_length = 0; retval->ip[0] = '\0'; |
︙ | ︙ | |||
633 634 635 636 637 638 639 | #ifdef FILED_DONT_TIMEOUT #define filed_sockettimeout_thread_init() 0 #define filed_sockettimeout_init() 0 #define filed_sockettimeout_accept(x) /**/ #define filed_sockettimeout_processing_start(x) /**/ #define filed_sockettimeout_processing_end(x) /**/ | | | | | > > > | | > | > > > > | | > > > > > > | | | > > | | | > > > > | > > > > | > > | | > > | | > | > > > | | | | | > > | 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 | #ifdef FILED_DONT_TIMEOUT #define filed_sockettimeout_thread_init() 0 #define filed_sockettimeout_init() 0 #define filed_sockettimeout_accept(x) /**/ #define filed_sockettimeout_processing_start(x) /**/ #define filed_sockettimeout_processing_end(x) /**/ #define filed_sockettimeout_close(x, y) /**/ #else time_t filed_sockettimeout_time; struct { time_t expiration_time; pthread_t thread_id; enum { filed_sockettimeout_valid, filed_sockettimeout_invalid, } valid; } *filed_sockettimeout_sockstatus; long filed_sockettimeout_sockstatus_length; int filed_sockettimeout_devnull_fd; pthread_mutex_t filed_sockettimeout_mutex = PTHREAD_MUTEX_INITIALIZER; static int filed_sockettimeout_sockfd_in_range(int sockfd) { if (sockfd < 3) { return(0); } if (sockfd > filed_sockettimeout_sockstatus_length) { return(0); } return(1); } static void filed_sockettimeout_expire(int sockfd, int length, int lockheld) { time_t now, expire; if (!lockheld) { pthread_mutex_lock(&filed_sockettimeout_mutex); } now = filed_sockettimeout_time; expire = now + length; filed_sockettimeout_sockstatus[sockfd].expiration_time = expire; if (!lockheld) { pthread_mutex_unlock(&filed_sockettimeout_mutex); } return; } static void filed_sockettimeout_accept(int sockfd) { if (!filed_sockettimeout_sockfd_in_range(sockfd)) { return; } pthread_mutex_lock(&filed_sockettimeout_mutex); filed_sockettimeout_expire(sockfd, 60, 1); filed_sockettimeout_sockstatus[sockfd].thread_id = pthread_self(); filed_sockettimeout_sockstatus[sockfd].valid = filed_sockettimeout_valid; pthread_mutex_unlock(&filed_sockettimeout_mutex); return; } static void filed_sockettimeout_processing_start(int sockfd) { if (!filed_sockettimeout_sockfd_in_range(sockfd)) { return; } filed_sockettimeout_expire(sockfd, 86400, 0); return; } static void filed_sockettimeout_processing_end(int sockfd) { if (!filed_sockettimeout_sockfd_in_range(sockfd)) { return; } filed_sockettimeout_expire(sockfd, 60, 0); return; } static void filed_sockettimeout_close(int sockfd, int lockheld) { if (!filed_sockettimeout_sockfd_in_range(sockfd)) { return; } if (!lockheld) { pthread_mutex_lock(&filed_sockettimeout_mutex); } filed_sockettimeout_sockstatus[sockfd].valid = filed_sockettimeout_invalid; if (!lockheld) { pthread_mutex_unlock(&filed_sockettimeout_mutex); } return; } static void *filed_sockettimeout_thread(void *arg) { struct timespec sleep_time; time_t now, expiration_time; pthread_t thread_id; long idx; int count; int valid; int time_interval = 30; int check_period = 90; while (1) { for (count = 0; count < (check_period / time_interval); count++) { sleep_time.tv_sec = time_interval; sleep_time.tv_nsec = 0; nanosleep(&sleep_time, NULL); pthread_mutex_lock(&filed_sockettimeout_mutex); now = time(NULL); filed_sockettimeout_time = now; pthread_mutex_unlock(&filed_sockettimeout_mutex); } pthread_mutex_lock(&filed_sockettimeout_mutex); for (idx = 0; idx < filed_sockettimeout_sockstatus_length; idx++) { valid = filed_sockettimeout_sockstatus[idx].valid; if (valid != filed_sockettimeout_valid) { continue; } expiration_time = filed_sockettimeout_sockstatus[idx].expiration_time; thread_id = filed_sockettimeout_sockstatus[idx].thread_id; if (expiration_time > now) { continue; } filed_sockettimeout_close(idx, 1); dup2(filed_sockettimeout_devnull_fd, idx); pthread_kill(thread_id, SIGPIPE); } pthread_mutex_unlock(&filed_sockettimeout_mutex); } return(NULL); /* NOTREACH: We don't actually take any arguments */ arg = arg; } |
︙ | ︙ | |||
776 777 778 779 780 781 782 | long maxfd, idx; maxfd = sysconf(_SC_OPEN_MAX); if (maxfd <= 0) { maxfd = 4096; } | > | | < | 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 | long maxfd, idx; maxfd = sysconf(_SC_OPEN_MAX); if (maxfd <= 0) { maxfd = 4096; } filed_sockettimeout_sockstatus_length = maxfd; filed_sockettimeout_sockstatus = malloc(sizeof(*filed_sockettimeout_sockstatus) * filed_sockettimeout_sockstatus_length); if (filed_sockettimeout_sockstatus == NULL) { return(-1); } for (idx = 0; idx < maxfd; idx++) { filed_sockettimeout_sockstatus[idx].valid = filed_sockettimeout_invalid; } filed_sockettimeout_devnull_fd = open("/dev/null", O_RDWR); if (filed_sockettimeout_devnull_fd < 0) { return(-1); } return(0); } |
︙ | ︙ | |||
1199 1200 1201 1202 1203 1204 1205 | /** reason must point to a globally allocated value **/ log->reason = reason; log->http_code = error_number; filed_log_entry(log); /* Close connection */ | | | 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 | /** reason must point to a globally allocated value **/ log->reason = reason; log->http_code = error_number; filed_log_entry(log); /* Close connection */ filed_sockettimeout_close(fileno(fp), 0); fclose(fp); return; } /* Return a redirect to index.html */ |
︙ | ︙ | |||
1224 1225 1226 1227 1228 1229 1230 | /* Log redirect */ log->reason = "redirect"; log->http_code = http_code; filed_log_entry(log); /* Close connection */ | | | 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 | /* Log redirect */ log->reason = "redirect"; log->http_code = http_code; filed_log_entry(log); /* Close connection */ filed_sockettimeout_close(fileno(fp), 0); fclose(fp); return; /* Currently unused: path */ path = path; |
︙ | ︙ | |||
1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 | size_t sendfile_size; off_t sendfile_offset, sendfile_sent, sendfile_len; char *path; char *date_current, date_current_b[64]; int http_code; FILE *fp; /* Determine current time */ date_current = filed_format_time(date_current_b, sizeof(date_current_b), time(NULL)); /* Open socket as ANSI I/O for ease of use */ fp = fdopen(fd, "w+b"); if (fp == NULL) { | > > > | | 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 | size_t sendfile_size; off_t sendfile_offset, sendfile_sent, sendfile_len; char *path; char *date_current, date_current_b[64]; int http_code; FILE *fp; /* Indicate the connection start time */ log->connecttime = time(NULL); /* Determine current time */ date_current = filed_format_time(date_current_b, sizeof(date_current_b), time(NULL)); /* Open socket as ANSI I/O for ease of use */ fp = fdopen(fd, "w+b"); if (fp == NULL) { filed_sockettimeout_close(fd, 0); close(fd); log->buffer[0] = '\0'; log->http_code = -1; log->reason = "fdopen_failed"; |
︙ | ︙ | |||
1457 1458 1459 1460 1461 1462 1463 | log->sent_length = sendfile_sent; filed_log_entry(log); close(fileinfo->fd); if (request->headers.connection != FILED_CONNECTION_KEEP_ALIVE) { | | | 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 | log->sent_length = sendfile_sent; filed_log_entry(log); close(fileinfo->fd); if (request->headers.connection != FILED_CONNECTION_KEEP_ALIVE) { filed_sockettimeout_close(fd, 0); fclose(fp); return(FILED_CONNECTION_CLOSE); } filed_sockettimeout_processing_end(fd); |
︙ | ︙ |