Changeset 21 in Main for trunk/Server/config.c

Timestamp:

Sep 14, 2024, 9:39:39 PM (2 months ago)

Author:

Nishi

Message:

can send file now

File:

• trunk/Server/config.c (modified) (7 diffs)

trunk/Server/config.c

@@ -31 +31 @@
 }
 
+bool tw_permission_allowed(const char* path, SOCKADDR addr, struct tw_http_request req, struct tw_config_entry* vhost){
+        int i;
+        bool found = false;
+        bool pathstart = false;
+        bool perm = false;
+again:
+        for(i = 0; i < vhost->dir_count; i++){
+                struct tw_dir_entry* e = &vhost->dirs[i];
+                pathstart = false;
+                if(strlen(path) >= strlen(e->dir)){
+                        pathstart = true;
+                        int j;
+                        for(j = 0; path[j] != 0 && e->dir[j] != 0; j++){
+                                if(path[j] != e->dir[j]){
+                                        pathstart = false;
+                                        break;
+                                }
+                        }
+                }
+                char* noslash = cm_strdup(e->dir);
+                noslash[strlen(noslash) - 1] = 0;
+                if(strcmp(e->dir, path) == 0 || strcmp(noslash, path) == 0 || pathstart){
+                        found = true;
+                        if(strcmp(e->name, "all") == 0){
+                                perm = e->type == TW_DIR_ALLOW;
+                        }
+                }
+                free(noslash);
+        }
+        if(!found && vhost != &config.root){
+                vhost = &config.root;
+                goto again;
+        }
+        return perm;
+}
+
 void tw_config_init(void) {
         int i;
@@ -44 +80 @@
         config.root.sslcert = NULL;
         config.root.root = NULL;
+        config.root.mime_count = 0;
+        config.root.dir_count = 0;
         config.vhost_count = 0;
         config.module_count = 0;
@@ -63 +101 @@
                 struct tw_config_entry* current = &config.root;
                 char* vhost = NULL;
+                char* dir = NULL;
                 while(stop == 0) {
                         int c = fread(cbuf, 1, 1, f);
@@ -78 +117 @@
                                                         }
                                                 }
+                                        } else if(cm_strcaseequ(r[0], "BeginDirectory")) {
+                                                if(dir != NULL) {
+                                                        cm_log("Config", "Already in directory section at line %d", ln);
+                                                        stop = 1;
+                                                } else {
+                                                        if(r[1] == NULL) {
+                                                                cm_log("Config", "Missing directory at line %d", ln);
+                                                                stop = 1;
+                                                        } else {
+                                                                dir = cm_strcat(r[1], r[1][strlen(r[1]) - 1] == '/' ? "" : "/");
+                                                        }
+                                                }
+                                        } else if(cm_strcaseequ(r[0], "EndDirectory")) {
+                                                if(dir == NULL) {
+                                                        cm_log("Config", "Not in directory section at line %d", ln);
+                                                        stop = 1;
+                                                } else {
+                                                        free(dir);
+                                                        dir = NULL;
+                                                }
+                                        } else if(cm_strcaseequ(r[0], "Allow")) {
+                                                if(dir == NULL) {
+                                                        cm_log("Config", "Not in directory section at line %d", ln);
+                                                        stop = 1;
+                                                } else {
+                                                        if(r[1] == NULL) {
+                                                                cm_log("Config", "Missing argument at line %d", ln);
+                                                                stop = 1;
+                                                        } else {
+                                                                struct tw_dir_entry* e = &current->dirs[current->dir_count++];
+                                                                e->name = cm_strdup(r[1]);
+                                                                e->dir = cm_strdup(dir);
+                                                                e->type = TW_DIR_ALLOW;
+                                                        }
+                                                }
+                                        } else if(cm_strcaseequ(r[0], "Deny")) {
+                                                if(dir == NULL) {
+                                                        cm_log("Config", "Not in directory section at line %d", ln);
+                                                        stop = 1;
+                                                } else {
+                                                        if(r[1] == NULL) {
+                                                                cm_log("Config", "Missing argument at line %d", ln);
+                                                                stop = 1;
+                                                        } else {
+                                                                struct tw_dir_entry* e = &current->dirs[current->dir_count++];
+                                                                e->name = cm_strdup(r[1]);
+                                                                e->dir = cm_strdup(dir);
+                                                                e->type = TW_DIR_DENY;
+                                                        }
+                                                }
                                         } else if(cm_strcaseequ(r[0], "BeginVirtualHost")) {
                                                 if(vhost != NULL) {
@@ -89 +178 @@
                                                                 vhost = cm_strdup(r[1]);
                                                                 current = &config.vhosts[config.vhost_count++];
+                                                                current->dir_count = 0;
+                                                                current->mime_count = 0;
                                                                 int i;
                                                                 current->name = cm_strdup(vhost);
@@ -142 +233 @@
                                                 } else {
                                                         if(current->root != NULL) free(current->root);
-                                                        current->root = cm_strdup(r[1]);
+                                                        current->root = cm_strdup(strcmp(r[1], "/") == 0 ? "" : r[1]);
                                                 }
                                         } else if(cm_strcaseequ(r[0], "ServerRoot")) {
@@ -151 +242 @@
                                                         if(config.server_root != NULL) free(config.server_root);
                                                         config.server_root = cm_strdup(r[1]);
+                                                }
+                                        } else if(cm_strcaseequ(r[0], "MIMEType")) {
+                                                if(r[1] == NULL) {
+                                                        cm_log("Config", "Missing extension at line %d", ln);
+                                                        stop = 1;
+                                                }else if(r[2] == NULL) {
+                                                        cm_log("Config", "Missing MIME at line %d", ln);
+                                                        stop = 1;
+                                                } else {
+                                                        struct tw_mime_entry* e = &current->mimes[current->mime_count++];
+                                                        e->ext = cm_strdup(r[1]);
+                                                        e->mime = cm_strdup(r[2]);
                                                 }
                                         } else if(cm_strcaseequ(r[0], "LoadModule")) {