Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch ipshun Excluding Merge-Ins
This is equivalent to a diff from ca06363eed to e36144c40d
2022-03-26
| ||
11:56 | Merge the --ipshun enhancements into trunk. ... (check-in: d50f931efa user: drh tags: trunk) | |
11:55 | Make the banishment time interval a #define so that it can be easily changed. The default value is increased to 5 minutes. Allow %-escaped "." and "/" to pass through so that we can more easily detect the common "/../" attacks on the request-URI. ... (Closed-Leaf check-in: e36144c40d user: drh tags: ipshun) | |
2022-03-24
| ||
20:13 | Typo fix in 'termporarily blocked' message. ... (check-in: 10f650e552 user: stephan tags: ipshun) | |
17:51 | Add the "--ipshun DIR" command-line option. When supplied, althttpd refuses to service requests coming from IP addresses that have corresponding files in DIR, at least for a while. This is an experimental additional defense against hostile robots. ... (check-in: e99c39954c user: drh tags: ipshun) | |
2022-03-23
| ||
19:09 | Rearrange the command-line argument parsing so that the most commonly used options are checked first (for performance). Restructure the code to make individual cases easier to #ifdef out. ... (check-in: ca06363eed user: drh tags: trunk) | |
2022-03-22
| ||
14:12 | More precise error messages for over-sized requests. ... (check-in: 6ceb6a5e7d user: drh tags: trunk) | |
Changes to althttpd.c.
︙ | |||
100 101 102 103 104 105 106 107 108 109 110 111 112 113 | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 | + + + + + + + + + + + | ** processing any HTTP requests. ** ** --logfile FILE Append a single-line, CSV-format, log file entry to FILE ** for each HTTP request. FILE should be a full pathname. ** The FILE name is interpreted inside the chroot jail. The ** FILE name is expanded using strftime() if it contains ** at least one '%' and is not too long. ** ** --ipshun DIR If the remote IP address is also the name of a file ** in DIR that has size N bytes and where either N is zero ** or the m-time of the file is less than N time-units ago ** then that IP address is being shunned and no requests ** are processed. The time-unit is a compile-time option ** (BANISH_TIME) that defaults to 300 seconds. If this ** happens, the client gets a 503 Service Unavailable ** reply. Furthermore, althttpd will create ip-shunning ** files following a 404 Not Found error if the request ** URI is an obvious hack attempt. ** ** --https BOOLEAN Indicates that input is coming over SSL and is being ** decoded upstream, perhaps by stunnel. This option ** does *not* activate built-in TLS support. Use --cert ** for that. ** ** --family ipv4 Only accept input from IPV4 or IPV6, respectively. |
︙ | |||
273 274 275 276 277 278 279 280 281 282 283 284 285 286 | 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 | + | #include <stdarg.h> #include <time.h> #include <sys/times.h> #include <netdb.h> #include <errno.h> #include <sys/resource.h> #include <signal.h> #include <dirent.h> #ifdef linux #include <sys/sendfile.h> #endif #include <assert.h> /* ** Configure the server by setting the following macros and recompiling. |
︙ | |||
294 295 296 297 298 299 300 301 302 303 304 305 306 307 | 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 | + + + + | #ifndef MAX_CPU #define MAX_CPU 30 /* Max CPU cycles in seconds */ #endif #ifndef ALTHTTPD_VERSION #define ALTHTTPD_VERSION "2.0" #endif #ifndef BANISH_TIME #define BANISH_TIME 300 /* How long to banish for abuse (sec) */ #endif #ifndef SERVER_SOFTWARE # define SERVER_SOFTWARE "althttpd " ALTHTTPD_VERSION #endif #ifndef SERVER_SOFTWARE_TLS # ifdef ENABLE_TLS # define SERVER_SOFTWARE_TLS SERVER_SOFTWARE ", " OPENSSL_VERSION_TEXT |
︙ | |||
352 353 354 355 356 357 358 359 360 361 362 363 364 365 | 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 | + | static char *zHttpScheme = "http";/* HTTP_SCHEME CGI variable */ static char *zHttps = 0; /* HTTPS CGI variable */ static int nIn = 0; /* Number of bytes of input */ static int nOut = 0; /* Number of bytes of output */ static char zReplyStatus[4]; /* Reply status code */ static int statusSent = 0; /* True after status line is sent */ static const char *zLogFile = 0; /* Log to this file */ static const char *zIPShunDir=0; /* Directory containing hostile IP addresses */ static int debugFlag = 0; /* True if being debugged */ static struct timeval beginTime; /* Time when this process starts */ static int closeConnection = 0; /* True to send Connection: close in reply */ static int nRequest = 0; /* Number of requests processed */ static int omitLog = 0; /* Do not make logfile entries if true */ static int useHttps = 0; /* 0=HTTP, 1=external HTTPS (stunnel), ** 2=builtin TLS support */ |
︙ | |||
375 376 377 378 379 380 381 382 383 384 385 386 387 388 | 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 | + + | static char *zScgi = 0; /* Value of the SCGI env variable */ static int rangeStart = 0; /* Start of a Range: request */ static int rangeEnd = 0; /* End of a Range: request */ static int maxCpu = MAX_CPU; /* Maximum CPU time per process */ /* Forward reference */ static void Malfunction(int errNo, const char *zFormat, ...); #ifdef ENABLE_TLS #include <openssl/bio.h> #include <openssl/ssl.h> #include <openssl/err.h> #include <openssl/x509.h> typedef struct TlsServerConn { |
︙ | |||
523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 | 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 | + + + + + + + + + + + + + + + + + + | int rc; va_list va; va_start(va,fmt); rc = althttpd_vprintf(fmt, va); va_end(va); return rc; } static void *tls_new_server(int iSocket); static void tls_close_server(void *pServerArg); static void tls_atexit(void); #else #define althttpd_printf printf #endif /* forward references */ static int tls_init_conn(int iSocket); static void tls_close_conn(void); static void althttpd_fflush(FILE *f); /* ** Flush the buffer then exit. */ static void althttpd_exit(void){ althttpd_fflush(stdout); tls_close_conn(); exit(0); } /* ** Mapping between CGI variable names and values stored in ** global variables. */ static struct { char *zEnvName; char **pzEnvValue; |
︙ | |||
706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 | 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 | + + + + - + + + + + | strcpy(zReplyStatus, "998"); MakeLogEntry(1,100); /* LOG: Malloc() failed */ exit(1); } return p; } /* Forward reference */ static void BlockIPAddress(void); static void ServiceUnavailable(int lineno); /* ** Set the value of environment variable zVar to zValue. */ static void SetEnv(const char *zVar, const char *zValue){ char *z; size_t len; if( zValue==0 ) zValue=""; /* Disable an attempted bashdoor attack */ |
︙ | |||
900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 | 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + | nOut += althttpd_printf("Connection: close\r\n"); }else{ nOut += althttpd_printf("Connection: keep-alive\r\n"); } nOut += DateTag("Date", now); statusSent = 1; } /* ** Check all of the files in the zIPShunDir directory. Unlink any ** files in that directory that have expired. ** ** This routine might be slow if there are a lot of blocker files. ** So it only runs when we are not in a hurry, such as prior to sending ** a 404 Not Found reply. */ static void UnlinkExpiredIPBlockers(void){ DIR *pDir; struct dirent *pFile; size_t nIPShunDir; time_t now; char zFilename[2000]; if( zIPShunDir==0 ) return; if( zIPShunDir[0]!='/' ) return; nIPShunDir = strlen(zIPShunDir); while( nIPShunDir>0 && zIPShunDir[nIPShunDir-1]=='/' ) nIPShunDir--; if( nIPShunDir > sizeof(zFilename)-100 ) return; memcpy(zFilename, zIPShunDir, nIPShunDir); zFilename[nIPShunDir] = 0; pDir = opendir(zFilename); if( pDir==0 ) return; zFilename[nIPShunDir] = '/'; time(&now); while( (pFile = readdir(pDir))!=0 ){ size_t nFile = strlen(pFile->d_name); int rc; struct stat statbuf; if( nIPShunDir+nFile >= sizeof(zFilename)-2 ) continue; if( strstr(pFile->d_name, "..") ) continue; memcpy(zFilename+nIPShunDir+1, pFile->d_name, nFile+1); memset(&statbuf, 0, sizeof(statbuf)); rc = stat(zFilename, &statbuf); if( rc ) continue; if( !S_ISREG(statbuf.st_mode) ) continue; if( statbuf.st_size==0 ) continue; if( statbuf.st_size*5*BANISH_TIME + statbuf.st_mtime > now ) continue; unlink(zFilename); } closedir(pDir); } /* Return true if the request URI contained in zScript[] seems like a ** hack attempt. */ static int LikelyHackAttempt(void){ if( zScript==0 ) return 0; if( zScript[0]==0 ) return 0; if( zScript[0]!='/' ) return 1; if( strstr(zScript, "/../")!=0 ) return 1; if( strstr(zScript, "/./")!=0 ) return 1; if( strstr(zScript, "_SELECT_")!=0 ) return 1; if( strstr(zScript, "_select_")!=0 ) return 1; if( strstr(zScript, "_sleep_")!=0 ) return 1; if( strstr(zScript, "_OR_")!=0 ) return 1; if( strstr(zScript, "_AND_")!=0 ) return 1; if( strstr(zScript, "/etc/passwd")!=0 ) return 1; if( strstr(zScript, "/bin/sh")!=0 ) return 1; if( strstr(zScript, "/.git/")!=0 ) return 1; return 0; } /* ** An abusive HTTP request has been submitted by the IP address zRemoteAddr. ** Block future requests coming from this IP address. ** ** This only happens if the zIPShunDir variable is set, which is only set ** by the --ipshun command-line option. Without that setting, this routine ** is a no-op. ** ** If zIPShunDir is a valid directory, then this routine uses zRemoteAddr ** as the name of a file within that directory. Cases: ** ** + The file already exists and is not an empty file. This will be the ** case if the same IP was recently blocked, but the block has expired, ** and yet the expiration was not so long ago that the blocking file has ** been unlinked. In this case, add one character to the file, which ** will update its mtime (causing it to be active again) and increase ** its expiration timeout. ** ** + The file exists and is empty. This happens if the administrator ** uses "touch" to create the file. An empty blocking file indicates ** a permanent block. Do nothing. ** ** + The file does not exist. Create it anew and make it one byte in size. ** ** The UnlinkExpiredIPBlockers() routine will run from time to time to ** unlink expired blocker files. If the DisallowedRemoteAddr() routine finds ** an expired blocker file corresponding to zRemoteAddr, it might unlink ** that one blocker file if the file has been expired for long enough. */ static void BlockIPAddress(void){ size_t nIPShunDir; size_t nRemoteAddr; int rc; struct stat statbuf; char zFullname[1000]; if( zIPShunDir==0 ) return; if( zRemoteAddr==0 ) return; if( zRemoteAddr[0]==0 ) return; /* If we reach this point, it means that a suspicious request was ** received and we want to activate IP blocking on the remote ** address. */ nIPShunDir = strlen(zIPShunDir); while( nIPShunDir>0 && zIPShunDir[nIPShunDir-1]=='/' ) nIPShunDir--; nRemoteAddr = strlen(zRemoteAddr); if( nIPShunDir + nRemoteAddr + 2 >= sizeof(zFullname) ){ Malfunction(914, /* LOG: buffer overflow */ "buffer overflow"); } memcpy(zFullname, zIPShunDir, nIPShunDir); zFullname[nIPShunDir] = '/'; memcpy(zFullname+nIPShunDir+1, zRemoteAddr, nRemoteAddr+1); rc = stat(zFullname, &statbuf); if( rc!=0 || statbuf.st_size>0 ){ FILE *lock = fopen(zFullname, "a"); if( lock ){ fputc('X', lock); fclose(lock); } } } /* ** Send a service-unavailable reply. */ static void ServiceUnavailable(int lineno){ StartResponse("503 Service Unavailable"); nOut += althttpd_printf( "Content-type: text/plain; charset=utf-8\r\n" "\r\n" "Service to IP address %s temporarily blocked due to abuse\n", zRemoteAddr ); closeConnection = 1; MakeLogEntry(0, lineno); althttpd_exit(); } /* ** Tell the client that there is no such document */ static void NotFound(int lineno){ UnlinkExpiredIPBlockers(); if( LikelyHackAttempt() ){ BlockIPAddress(); ServiceUnavailable(lineno); } StartResponse("404 Not Found"); nOut += althttpd_printf( "Content-type: text/html; charset=utf-8\r\n" "\r\n" "<head><title lineno=\"%d\">Not Found</title></head>\n" "<body><h1>Document Not Found</h1>\n" "The document %s is not available on this server\n" "</body>\n", lineno, zScript); MakeLogEntry(0, lineno); |
︙ | |||
962 963 964 965 966 967 968 969 970 971 972 973 974 975 | 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 | + | "Content-type: text/html; charset=utf-8\r\n" "\r\n" "<head><title>CGI Program Error</title></head>\n" "<body><h1>CGI Program Error</h1>\n" "The CGI program %s generated an error\n" "</body>\n", zScript); MakeLogEntry(0, 120); /* LOG: CGI Error */ althttpd_exit(); exit(0); } /* ** Set the timeout in seconds. 0 means no-timeout. */ static void SetTimeout(int nSec, int lineNum){ |
︙ | |||
1021 1022 1023 1024 1025 1026 1027 | 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 | - + - + | StartResponse("500 CGI Configuration Error"); nOut += althttpd_printf( "Content-type: text/plain; charset=utf-8\r\n" "\r\n" "The CGI program %s is writable by users other than its owner.\n", zRealScript); MakeLogEntry(0, 140); /* LOG: CGI script is writable */ |
︙ | |||
1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 | 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 | + + + + + - + - | ** Return the number of characters converted. An "%XX" -> "_" conversion ** counts as a single character. */ static int sanitizeString(char *z){ int nChange = 0; while( *z ){ if( !allowedInName[*(unsigned char*)z] ){ char cNew = '_'; if( *z=='%' && z[1]!=0 && z[2]!=0 ){ int i; if( z[1]=='2' ){ if( z[2]=='e' || z[2]=='E' ) cNew = '.'; if( z[2]=='f' || z[2]=='F' ) cNew = '/'; } for(i=3; (z[i-2] = z[i])!=0; i++){} } |
︙ | |||
1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 | 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 | + | static void tls_atexit(void){ if( tlsState.sslCon ){ tls_close_server(tlsState.sslCon); tlsState.sslCon = NULL; } } #endif /* ENABLE_TLS */ /* ** Works like fgets(): ** ** Read a single line of input into s[]. Ensure that s[] is zero-terminated. ** The s[] buffer is size bytes and so at most size-1 bytes will be read. ** |
︙ | |||
2133 2134 2135 2136 2137 2138 2139 | 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 | - + | zDir, getcwd(zBuf,999)); } rc = stat(zFallback, &statbuf); if( rc==0 && S_ISREG(statbuf.st_mode) && access(zFallback,R_OK)==0 ){ closeConnection = 1; rc = SendFile(zFallback, (int)strlen(zFallback), &statbuf); free(zFallback); |
︙ | |||
2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 | 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | #ifdef ENABLE_TLS if( tlsState.sslCon ){ tls_close_server(tlsState.sslCon); tlsState.sslCon = NULL; } #endif } /* ** Check to see if zRemoteAddr is disallowed. Return true if it is ** disallowed and false if not. ** ** zRemoteAddr is disallowed if: ** ** * The zIPShunDir variable is not NULL ** ** * zIPShunDir is the name of a directory ** ** * There is a file in zIPShunDir whose name is exactly zRemoteAddr ** and that is N bytes in size. ** ** * N==0 or the mtime of the file is less than N*BANISH_TIME seconds ** ago. ** ** If N>0 and the mtime is greater than N*5*BANISH_TIME seconds ** (25 minutes per byte, by default) old, then the file is deleted. ** ** The size of the file determines how long the embargo is suppose to ** last. A zero-byte file embargos forever. Otherwise, the embargo ** is for BANISH_TIME bytes for each byte in the file. */ static int DisallowedRemoteAddr(void){ char zFullname[1000]; size_t nIPShunDir; size_t nRemoteAddr; int rc; struct stat statbuf; time_t now; if( zIPShunDir==0 ) return 0; if( zRemoteAddr==0 ) return 0; if( zIPShunDir[0]!='/' ){ Malfunction(910, /* LOG: argument to --ipshun should be absolute path */ "The --ipshun directory should have an absolute path"); } nIPShunDir = strlen(zIPShunDir); while( nIPShunDir>0 && zIPShunDir[nIPShunDir-1]=='/' ) nIPShunDir--; nRemoteAddr = strlen(zRemoteAddr); if( nIPShunDir + nRemoteAddr + 2 >= sizeof(zFullname) ){ Malfunction(912, /* LOG: RemoteAddr filename too big */ "RemoteAddr filename too big"); } if( zRemoteAddr[0]==0 || zRemoteAddr[0]=='.' || strchr(zRemoteAddr,'/')!=0 ){ Malfunction(913, /* LOG: RemoteAddr contains suspicious characters */ "RemoteAddr contains suspicious characters"); } memcpy(zFullname, zIPShunDir, nIPShunDir); zFullname[nIPShunDir] = '/'; memcpy(zFullname+nIPShunDir+1, zRemoteAddr, nRemoteAddr+1); memset(&statbuf, 0, sizeof(statbuf)); rc = stat(zFullname, &statbuf); if( rc ) return 0; /* No such file, hence no restrictions */ if( statbuf.st_size==0 ) return 1; /* Permanently banned */ time(&now); if( statbuf.st_size*BANISH_TIME + statbuf.st_mtime >= now ){ return 1; /* Currently under a ban */ } if( statbuf.st_size*5*BANISH_TIME + statbuf.st_mtime < now ){ unlink(zFullname); } return 0; } /* ** This routine processes a single HTTP request on standard input and ** sends the reply to standard output. If the argument is 1 it means ** that we are should close the socket without processing additional ** HTTP requests after the current request finishes. 0 means we are ** allowed to keep the connection open and to process additional requests. |
︙ | |||
2310 2311 2312 2313 2314 2315 2316 | 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 | - + | nOut += althttpd_printf( "Content-type: text/plain; charset=utf-8\r\n" "\r\n" "URI too long\n" ); MakeLogEntry(0, 201); /* LOG: bad protocol in HTTP header */ } |
︙ | |||
2335 2336 2337 2338 2339 2340 2341 | 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 | - + | StartResponse("501 Not Implemented"); nOut += althttpd_printf( "Content-type: text/plain; charset=utf-8\r\n" "\r\n" "The %s method is not implemented on this server.\n", zMethod); MakeLogEntry(0, 220); /* LOG: Unknown request method */ |
︙ | |||
2527 2528 2529 2530 2531 2532 2533 | 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 | - + + + + + + | StartResponse("500 Request too large"); nOut += althttpd_printf( "Content-type: text/plain; charset=utf-8\r\n" "\r\n" "Too much POST data\n" ); MakeLogEntry(0, 270); /* LOG: Request too large */ |
︙ | |||
3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 | 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 | + + + | }else if( strcmp(z, "-pkey")==0 ){ tlsState.zKeyFile = zArg; }else #endif if( strcmp(z,"-user")==0 ){ zPermUser = zArg; }else if( strcmp(z,"-ipshun")==0 ){ zIPShunDir = zArg; }else if( strcmp(z,"-max-age")==0 ){ mxAge = atoi(zArg); }else if( strcmp(z,"-max-cpu")==0 ){ maxCpu = atoi(zArg); }else |
︙ | |||
3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 | 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 | + + + + + + - - - - - + + + + + + | return 0; }else if( strcmp(z, "-datetest")==0 ){ TestParseRfc822Date(); printf("Ok\n"); exit(0); }else if( strcmp(z,"-remote-addr")==0 ){ /* Used for testing purposes only - to simulate a remote IP address when ** input is really coming from a disk file. */ zRemoteAddr = StrDup(zArg); }else { Malfunction(515, /* LOG: unknown command-line argument on launch */ "unknown argument: [%s]\n", z); } argv += 2; argc -= 2; } if( zRoot==0 ){ if( standalone ){ zRoot = "."; }else{ Malfunction(516, /* LOG: --root argument missing */ "no --root specified"); } } /* ** 10 seconds to get started */ if( useTimeout ){ |
︙ | |||
3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 | 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 | + | && strncmp(zRemoteAddr, "::ffff:", 7)==0 && strchr(zRemoteAddr+7, ':')==0 && strchr(zRemoteAddr+7, '.')!=0 ){ zRemoteAddr += 7; } zServerSoftware = useHttps==2 ? SERVER_SOFTWARE_TLS : SERVER_SOFTWARE; /* Process the input stream */ for(i=0; i<100; i++){ ProcessOneRequest(0, httpConnection); } ProcessOneRequest(1, httpConnection); tls_close_conn(); exit(0); |
︙ | |||
3300 3301 3302 3303 3304 3305 3306 3307 | 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 | + + | INSERT INTO xref VALUES(800,'CGI Handler timeout'); INSERT INTO xref VALUES(801,'Timeout request header (1+)'); INSERT INTO xref VALUES(802,'Timeout request header (0)'); INSERT INTO xref VALUES(803,'Timeout POST data'); INSERT INTO xref VALUES(804,'Timeout decode HTTP request'); INSERT INTO xref VALUES(805,'Timeout send static file'); INSERT INTO xref VALUES(806,'Timeout startup'); INSERT INTO xfer VALUES(901,'Prohibited remote IP address'); INSERT INTO xfer VALUES(902,'Bashdoor attack'); #endif /* SQL */ |
Changes to althttpd.md.
︙ | |||
325 326 327 328 329 330 331 332 333 334 335 336 337 338 | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 | + + + + | To defend against mischief, there are restrictions on names of files that althttpd will serve. Within the request URI, all characters other than alphanumerics and ",-./:~" are converted into a single "_". Furthermore, if any path element of the request URI begins with "." or "-" then althttpd always returns a 404 Not Found error. Thus it is safe to put auxiliary files (databases or other content used by CGI, for example) in the document hierarchy as long as the filenames being with "." or "-". When althttpd returns a 404, it tries to determine whether the request is malicous and, if it believes so, it may optionally [temporarily block the client's IP](#ipshun). An exception: Though althttpd normally returns 404 Not Found for any request with a path element beginning with ".", it does allow requests where the URI begins with "/.well-known/". File or directory names below "/.well-known/" are allowed to begin with "." or "-" (but not with ".."). This exception is necessary to allow LetsEncrypt to validate ownership of the website. |
︙ | |||
454 455 456 457 458 459 460 | 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | The filename on the -logfile option may contain time-based characters that are expanded by [strftime()](https://linux.die.net/man/3/strftime). Thus, to cause a new logfile to be used for each day, you might use something like: > -logfile /var/logs/althttpd/httplog-%Y%m%d.csv <a id="ipshun"></a> Client IP Blocking ------------------ If the `--ipshun DIRECTORY` option is included to althttpd and DIRECTORY is an absolute pathname (begins with "/") accessible from within the chroot jail, and if the IP address of the client appears as a file within that directory, then althttpd might return 503 Service Unavailable rather than process the request. * If the file is zero bytes in size, then 503 is always returned. Thus you can "touch" a file that is an IP address name to permanently banish that client. * If the file is N bytes in size, then 503 is returned if the mtime of the file is less than 60*N seconds ago. In other words, the client is banished for one minute per byte in the file. Banishment files are automatically created if althttpd gets a request that would have resulted in a 404 Not Found, and upon examining the REQUEST_URI the request looks suspicious. Any request that include /../ is considered a hack attempt, for example. There are other common vulnerability probes that are also checked. Probably this list of vulnerability probes will grow with experience. The banishment files are automatically unlinked after 5 minutes/byte. Banishment files are initially 1 byte in size. But if a banishment expires and then a new request arrives prior to 5 minutes per byte of block-file size, then the file grows by one byte and the mtime is reset. |
Changes to static-ssl.mk.
︙ | |||
23 24 25 26 27 28 29 30 31 | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | + - + | fi manifest.uuid: manifest OPENSSLDIR = /home/drh/fossil/release-build/compat/openssl OPENSSLLIB = -L$(OPENSSLDIR) -lssl -lcrypto -ldl CPPFLAGS += -I$(OPENSSLDIR)/include -DENABLE_TLS CPPFLAGS += -Wall -Wextra CFLAGS = -Os althttpd: althttpd.c manifest |