X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/56d71638dbf48b8e4885e1e5ed5d0f1859674541..53e5fdd4e4c2cf8b53702e559797185f2d009187:/package/uhttpd/src/uhttpd-file.c?ds=sidebyside

diff --git a/package/uhttpd/src/uhttpd-file.c b/package/uhttpd/src/uhttpd-file.c
index 2a06f8520..850a14175 100644
--- a/package/uhttpd/src/uhttpd-file.c
+++ b/package/uhttpd/src/uhttpd-file.c
@@ -29,23 +29,21 @@
 static const char * uh_file_mime_lookup(const char *path)
 {
 	struct mimetype *m = &uh_mime_types[0];
-	char *p, *pd, *ps;
+	const char *e;
 
-	ps = strrchr(path, '/');
-	pd = strrchr(path, '.');
-
-	/* use either slash or dot as separator, whatever comes last */
-	p = (ps && pd && (ps > pd)) ? ps : pd;
-
-	if( (p != NULL) && (*(++p) != 0) )
+	while( m->extn )
 	{
-		while( m->extn )
+		e = &path[strlen(path)-1];
+
+		while( e >= path )
 		{
-			if( ! strcasecmp(p, m->extn) )
+			if( (*e == '.') && !strcasecmp(&e[1], m->extn) )
 				return m->mime;
 
-			m++;
+			e--;
 		}
+
+		m++;
 	}
 
 	return "application/octet-stream";
@@ -277,7 +275,9 @@ static void uh_file_dirlist(struct client *cl, struct http_request *req, struct
 			strncat(filename, files[i]->d_name,
 				sizeof(filename) - strlen(files[i]->d_name));
 
-			if( !stat(filename, &s) && (s.st_mode & S_IFDIR) )
+			if( !stat(filename, &s) &&
+			    (s.st_mode & S_IFDIR) && (s.st_mode & S_IXOTH)
+			)
 				uh_http_sendf(cl, req,
 					"<li><strong><a href='%s%s'>%s</a>/</strong><br />"
 					"<small>modified: %s<br />directory - %.02f kbyte"
@@ -295,7 +295,9 @@ static void uh_file_dirlist(struct client *cl, struct http_request *req, struct
 			strncat(filename, files[i]->d_name,
 				sizeof(filename) - strlen(files[i]->d_name));
 
-			if( !stat(filename, &s) && !(s.st_mode & S_IFDIR) )
+			if( !stat(filename, &s) &&
+			    !(s.st_mode & S_IFDIR) && (s.st_mode & S_IROTH)
+			)
 				uh_http_sendf(cl, req,
 					"<li><strong><a href='%s%s'>%s</a></strong><br />"
 					"<small>modified: %s<br />%s - %.02f kbyte<br />"
@@ -371,7 +373,7 @@ void uh_file_request(struct client *cl, struct http_request *req, struct path_in
 	}
 
 	/* directory */
-	else if( pi->stat.st_mode & S_IFDIR )
+	else if( (pi->stat.st_mode & S_IFDIR) && !cl->server->conf->no_dirlists )
 	{
 		/* write status */
 		uh_file_response_200(cl, req, NULL);