Changeset 161 in Main for trunk

Timestamp:

Sep 25, 2024, 10:35:04 PM (7 weeks ago)

Author:

Nishi

Message:

adding chroot

Location:

trunk

Files:

• README (modified) (1 diff)
• Server/config.c (modified) (3 diffs)
• Server/server.c (modified) (5 diffs)
• Server/tw_version.h (modified) (1 diff)
• Tool/genconf.c (modified) (1 diff)

trunk/README

@@ -1 +1 @@
 
-Tewi HTTPd version 1.07A
+Tewi HTTPd version 1.08
 
 Original by Nishi <nishi@nishi.boats>

trunk/Server/config.c

@@ -103 +103 @@
         config.defined[0] = NULL;
         gethostname(config.hostname, 1024);
+#ifdef HAS_CHROOT
+        tw_add_define("HAS_CHROOT");
+#endif
 }
 
@@ -274 +277 @@
                                                 }
 #endif
+#ifdef HAS_CHROOT
+                                        } else if(cm_strcaseequ(r[0], "ChrootDirectory")) {
+                                                if(r[1] == NULL) {
+                                                        cm_log("Config", "Missing path at line %d", ln);
+                                                        stop = 1;
+                                                } else {
+                                                        if(current->chroot_path != NULL) free(current->chroot_path);
+                                                        current->chroot_path = cm_strdup(r[1]);
+                                                }
+#endif
                                         } else if(cm_strcaseequ(r[0], "ForceLog")) {
                                                 if(r[1] == NULL) {
@@ -346 +359 @@
                                                         if(current->root != NULL) free(current->root);
                                                         current->root = cm_strdup(strcmp(r[1], "/") == 0 ? "" : r[1]);
-                                                }
-                                        } else if(cm_strcaseequ(r[0], "ServerRoot")) {
-                                                if(r[1] == NULL) {
-                                                        cm_log("Config", "Missing path at line %d", ln);
-                                                        stop = 1;
-                                                } else {
-                                                        if(config.server_root != NULL) free(config.server_root);
-                                                        config.server_root = cm_strdup(r[1]);
                                                 }
                                         } else if(cm_strcaseequ(r[0], "MIMEType")) {

trunk/Server/server.c

@@ -280 +280 @@
         } else if(code == 404) {
                 return "404 Not Found";
+        } else if(code == 500) {
+                return "500 Internal Server Error";
         } else {
                 return "400 Bad Request";
@@ -508 +510 @@
                         }
                 }
+                bool rej = false;
                 cm_log("Server", "Host is %s", vhost);
                 int port = s == NULL ? 80 : 443;
@@ -521 +524 @@
                 cm_log("Server", "Hostname is `%s', port is `%d'", host, port);
                 struct tw_config_entry* vhost_entry = tw_vhost_match(host, port);
+#ifdef HAS_CHROOT
+                char* chrootpath = vhost_entry->chroot_path != NULL ? vhost_entry->chroot_path : config.root.chroot_path;
+                if(chrootpath != NULL) {
+                        if(chdir(chrootpath) == 0) {
+                                if(chroot(".") == 0) {
+                                        cm_log("Server", "Chroot successful");
+                                }
+                        } else {
+                                cm_log("Server", "chdir() failed, cannot chroot");
+                                tw_http_error(s, sock, 500, name, port, vhost_entry);
+                                rej = true;
+                        }
+                }
+#endif
                 for(i = 0; i < config.module_count; i++) {
                         tw_mod_request_t mod_req = (tw_mod_request_t)tw_module_symbol(config.modules[i], "mod_request");
@@ -545 +562 @@
                         char* path = cm_strcat(vhost_entry->root == NULL ? "" : vhost_entry->root, req.path);
                         cm_log("Server", "Filesystem path is %s", path);
-                        bool rej = false;
 #ifdef __MINGW32__
                         char* rpath = cm_strdup(path);
@@ -777 +793 @@
                                 }
                         } else {
-                                tw_http_error(s, sock, 404, name, port, vhost_entry);
+                                if(!rej) {
+                                        tw_http_error(s, sock, 404, name, port, vhost_entry);
+                                }
                         }
                         free(path);

trunk/Server/tw_version.h

@@ -8 +8 @@
 #endif
 
-#define TW_VERSION "1.07A\0"
+#define TW_VERSION "1.08\0"
 
 const char* tw_get_version(void);

trunk/Tool/genconf.c

@@ -43 +43 @@
         printf("\n");
         printf("DocumentRoot %s/www\n", argv[1]);
-        printf("\n");
         printf("BeginDirectory %s/www\n", argv[1]);
-        printf("\tAllow all\n");
+        printf("        Allow all\n");
         printf("EndDirectory\n", argv[1]);
 }