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

Timestamp:

Sep 19, 2024, 6:23:45 PM (2 months ago)

Author:

Nishi

Message:

patch for windows xp

File:

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

trunk/Server/server.c

@@ -51 +51 @@
 SOCKADDR addresses[MAX_PORTS];
 int sockets[MAX_PORTS];
+
+#ifdef __MINGW32__
+const char* reserved_names[] = {"CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"};
+#endif
 
 /* https://qiita.com/gyu-don/items/5a640c6d2252a860c8cd */
@@ -429 +433 @@
                 int i;
                 time_t cmtime = 0;
-                if(req.headers != NULL){
+                if(req.headers != NULL) {
                         for(i = 0; req.headers[i] != NULL; i += 2) {
                                 if(cm_strcaseequ(req.headers[i], "Host")) {
@@ -480 +484 @@
                         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__
+                        for(i = 0; i < sizeof(reserved_names) / sizeof(reserved_names[0]); i++) {
+                                char* n = cm_strcat("/", reserved_names[i]);
+                                if(cm_nocase_endswith(path, n)) {
+                                        tw_http_error(s, sock, 403, name, port);
+                                        free(n);
+                                        rej = true;
+                                        cm_log("Server", "XP Patch ; rejecting access to device");
+                                        break;
+                                }
+                                free(n);
+                                char* y = cm_strcat3("/", reserved_names[i], ":");
+                                if(cm_nocase_endswith(path, y)) {
+                                        tw_http_error(s, sock, 403, name, port);
+                                        free(y);
+                                        rej = true;
+                                        cm_log("Server", "XP Patch ; rejecting access to device");
+                                        break;
+                                }
+                                free(y);
+                        }
+#endif
                         struct stat st;
-                        if(stat(path, &st) == 0) {
+                        if(!rej && stat(path, &st) == 0) {
                                 if(!tw_permission_allowed(path, addr, req, vhost_entry)) {
                                         tw_http_error(s, sock, 403, name, port);
@@ -648 +675 @@
                                                                         addstring(&str, "<pre><code>%h</code></pre>\n", rmbuf);
                                                                         fclose(fr);
+                                                                        free(rmbuf);
                                                                 }
                                                                 free(fpth);
@@ -682 +710 @@
                 free(vhost);
                 free(host);
-                tw_free_request(&req);
         } else if(ret == -1) {
         } else {
                 tw_http_error(s, sock, 400, name, port);
         }
+        tw_free_request(&req);
 cleanup:
 #ifndef NO_SSL
@@ -718 +746 @@
 #ifdef __MINGW32__
         struct thread_entry threads[2048];
-        for(i = 0; i < sizeof(threads) / sizeof(threads[0]); i++){
+        for(i = 0; i < sizeof(threads) / sizeof(threads[0]); i++) {
                 threads[i].used = false;
         }
@@ -732 +760 @@
                 if(ret == -1) {
                         break;
-                }else if(ret == 0){
-#ifdef __MINGW32__
-                        for(i = 0; i < sizeof(threads) / sizeof(threads[0]); i++){
-                                if(threads[i].used){
+                } else if(ret == 0) {
+#ifdef __MINGW32__
+                        for(i = 0; i < sizeof(threads) / sizeof(threads[0]); i++) {
+                                if(threads[i].used) {
                                         DWORD ex;
                                         GetExitCodeThread(threads[i].handle, &ex);
-                                        if(ex != STILL_ACTIVE){
+                                        if(ex != STILL_ACTIVE) {
                                                 CloseHandle(threads[i].handle);
                                                 threads[i].used = false;
@@ -746 +774 @@
 #endif
 #ifdef SERVICE
-                        if(status.dwCurrentState == SERVICE_STOP_PENDING){
+                        if(status.dwCurrentState == SERVICE_STOP_PENDING) {
                                 break;
                         }
@@ -766 +794 @@
                                         e->addr = claddr;
                                         int j;
-                                        for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++){
-                                                if(threads[j].used){
+                                        for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
+                                                if(threads[j].used) {
                                                         DWORD ex;
                                                         GetExitCodeThread(threads[j].handle, &ex);
-                                                        if(ex != STILL_ACTIVE){
+                                                        if(ex != STILL_ACTIVE) {
                                                                 CloseHandle(threads[j].handle);
                                                                 threads[j].used = false;
@@ -776 +804 @@
                                                 }
                                         }
-                                        for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++){
-                                                if(!threads[j].used){
+                                        for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
+                                                if(!threads[j].used) {
                                                         threads[j].handle = (HANDLE)_beginthreadex(NULL, 0, tw_server_pass, e, 0, NULL);
                                                         threads[j].used = true;