Merge pull request #9 from Lawlieta/master

armink · web-flow · commit bc78d00c10aa · 2019-04-11T13:46:01.000+08:00
【修复】文件或文件名打开失败问题
diff --git a/module/wn_module_index.c b/module/wn_module_index.c
@@ -43,6 +43,7 @@ int webnet_module_dirindex(struct webnet_session* session, int event)
     if (event == WEBNET_EVENT_URI_POST)
     {
         DIR *dir;
+        struct stat file_stat;
         struct webnet_request *request;
         static const char* header = "<html><head><title>Index of %s</title></head><body bgcolor=\"white\"><h1>Index of %s</h1><hr><pre>";
         static const char* foot = "</pre><hr>WebNet/%s (RT-Thread)</body></html>";
@@ -51,6 +52,11 @@ int webnet_module_dirindex(struct webnet_session* session, int event)
         request = session->request;
         RT_ASSERT(request != RT_NULL);
 
+        if (stat(request->path, &file_stat) < 0 || !S_ISDIR(file_stat.st_mode))
+        {
+            return WEBNET_MODULE_CONTINUE;
+        }
+        
         dir = opendir(request->path);
         if (dir != RT_NULL)
         {
diff --git a/src/wn_module.c b/src/wn_module.c
@@ -146,6 +146,7 @@ static const struct webnet_session_ops _dofile_ops =
 int webnet_module_system_dofile(struct webnet_session *session)
 {
     int fd = -1;    /* file descriptor */
+    struct stat file_stat;
     const char *mimetype;
     rt_size_t file_length;
     struct webnet_request *request;
@@ -242,7 +243,7 @@ int webnet_module_system_dofile(struct webnet_session *session)
 
     /* .gz not exist, use raw. */
 #endif /* WEBNET_USING_GZIP */
-    if (fd < 0)
+    if (fd < 0 && stat(request->path, &file_stat) >= 0 && !S_ISDIR(file_stat.st_mode))
     {
         fd = open(request->path, O_RDONLY, 0);
     }
@@ -536,17 +537,16 @@ int webnet_module_handle_uri(struct webnet_session *session)
     index = 0;
     while (default_files[index] != RT_NULL)
     {
+        struct stat file_stat;
+        
         /* made a full path */
         rt_snprintf(full_path, WEBNET_PATH_MAX, "%s/%s%s",
                     webnet_get_root(), request->path, default_files[index]);
         /* normalize path */
         str_normalize_path(full_path);
 
-        fd = open(full_path, O_RDONLY, 0);
-        if (fd >= 0)
+        if (stat(full_path, &file_stat) >= 0 && !S_ISDIR(file_stat.st_mode))
         {
-            /* close file descriptor */
-            close(fd);
             break;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ static const struct webnet_session_ops _dofile_ops =`
`146`	`146`	`int webnet_module_system_dofile(struct webnet_session *session)`
`147`	`147`	`{`
`148`	`148`	`int fd = -1; /* file descriptor */`
	`149`	`+ struct stat file_stat;`
`149`	`150`	`const char *mimetype;`
`150`	`151`	`rt_size_t file_length;`
`151`	`152`	`struct webnet_request *request;`
`@@ -242,7 +243,7 @@ int webnet_module_system_dofile(struct webnet_session *session)`
`242`	`243`
`243`	`244`	`/* .gz not exist, use raw. */`
`244`	`245`	`#endif /* WEBNET_USING_GZIP */`
`245`		`- if (fd < 0)`
	`246`	`+ if (fd < 0 && stat(request->path, &file_stat) >= 0 && !S_ISDIR(file_stat.st_mode))`
`246`	`247`	`{`
`247`	`248`	`fd = open(request->path, O_RDONLY, 0);`
`248`	`249`	`}`
`@@ -536,17 +537,16 @@ int webnet_module_handle_uri(struct webnet_session *session)`
`536`	`537`	`index = 0;`
`537`	`538`	`while (default_files[index] != RT_NULL)`
`538`	`539`	`{`
	`540`	`+ struct stat file_stat;`
	`541`	`+`
`539`	`542`	`/* made a full path */`
`540`	`543`	`rt_snprintf(full_path, WEBNET_PATH_MAX, "%s/%s%s",`
`541`	`544`	`webnet_get_root(), request->path, default_files[index]);`
`542`	`545`	`/* normalize path */`
`543`	`546`	`str_normalize_path(full_path);`
`544`	`547`
`545`		`- fd = open(full_path, O_RDONLY, 0);`
`546`		`- if (fd >= 0)`
	`548`	`+ if (stat(full_path, &file_stat) >= 0 && !S_ISDIR(file_stat.st_mode))`
`547`	`549`	`{`
`548`		`- /* close file descriptor */`
`549`		`- close(fd);`
`550`	`550`	`break;`
`551`	`551`	`}`
`552`	`552`