Changeset 161 in Main for trunk/Server/server.c

Timestamp:

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

Author:

Nishi

Message:

adding chroot

File:

• trunk/Server/server.c (modified) (5 diffs)

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);