solene
/
vger
5
10
Fork 4
Code Issues Pull Requests 2 Releases Activity
vger/mimes.c

142 lines
4.3 KiB
C
Raw Normal View History

Add MIME support + according tests
2020-12-02 18:59:52 +00:00
#include <string.h>
Code refactoring: get_file_mime got into mime.c and all security code moved into a procedure
2020-12-04 18:08:36 +00:00
#include <unistd.h>
#include <string.h>
Do not include c sources
2020-12-04 18:29:44 +00:00
#include "mimes.h"
add mimetype and autoindex option + minor changes * follow style(9) for prototypes * move first most used extension for more effeciciency when looking for mime * add opts.h to deal with options * remove lang=en by default * add option to set default mimetype * add option to autoindex if no index.gmi found * redirect if ending "/" is missing * send appropriate status code if request too long * edit manpage and README for new options
2021-01-10 08:30:35 +00:00
#include "opts.h"
Add MIME support + according tests
2020-12-02 18:59:52 +00:00
Fix virtualhost support changing the way request is parsed
2021-03-22 20:44:23 +00:00
/* extension to mimetype table */
Declare and initialize the mime database in one statement. This way the compiler can figure out the correct sizing of the strings for us and we won't forget to increase the char arrays if a longer mime type gets declared. While here introduce nitems macro to simplify for loop.
2020-12-05 15:47:33 +00:00
static const struct {
const char *extension;
const char *type;
} database[] = {
add mimetype and autoindex option + minor changes * follow style(9) for prototypes * move first most used extension for more effeciciency when looking for mime * add opts.h to deal with options * remove lang=en by default * add option to set default mimetype * add option to autoindex if no index.gmi found * redirect if ending "/" is missing * send appropriate status code if request too long * edit manpage and README for new options
2021-01-10 08:30:35 +00:00
{"gmi", "text/gemini"},
{"gemini", "text/gemini"},
Make the MIME database as a global variable, it's a lot more cleaner. (thanks to oa for recommendation)
2020-12-03 20:06:17 +00:00
{"7z", "application/x-7z-compressed"},
{"atom", "application/atom+xml"},
{"avi", "video/x-msvideo"},
{"bin", "application/octet-stream"},
{"bmp", "image/x-ms-bmp"},
{"cco", "application/x-cocoa"},
{"crt", "application/x-x509-ca-cert"},
{"css", "text/css"},
{"deb", "application/octet-stream"},
{"dll", "application/octet-stream"},
{"dmg", "application/octet-stream"},
{"doc", "application/msword"},
{"eot", "application/vnd.ms-fontobject"},
{"exe", "application/octet-stream"},
{"flv", "video/x-flv"},
{"fs", "application/octet-stream"},
{"gif", "image/gif"},
{"hqx", "application/mac-binhex40"},
{"htc", "text/x-component"},
{"html", "text/html"},
{"ico", "image/x-icon"},
{"img", "application/octet-stream"},
{"iso", "application/octet-stream"},
{"jad", "text/vnd.sun.j2me.app-descriptor"},
{"jar", "application/java-archive"},
{"jardiff", "application/x-java-archive-diff"},
{"jng", "image/x-jng"},
{"jnlp", "application/x-java-jnlp-file"},
{"jpeg", "image/jpeg"},
{"jpg", "image/jpeg"},
{"js", "application/javascript"},
{"json", "application/json"},
{"kml", "application/vnd.google-earth.kml+xml"},
{"kmz", "application/vnd.google-earth.kmz"},
{"m3u8", "application/vnd.apple.mpegurl"},
{"m4a", "audio/x-m4a"},
{"m4v", "video/x-m4v"},
{"md", "text/markdown"},
{"mid", "audio/midi"},
{"midi", "audio/midi"},
{"mkv", "video/x-matroska"},
{"mml", "text/mathml"},
{"mng", "video/x-mng"},
{"mov", "video/quicktime"},
{"mp3", "audio/mpeg"},
{"mp4", "video/mp4"},
{"mpeg", "video/mpeg"},
{"mpg", "video/mpeg"},
{"msi", "application/octet-stream"},
{"msm", "application/octet-stream"},
{"msp", "application/octet-stream"},
{"odb", "application/vnd.oasis.opendocument.database"},
{"odc", "application/vnd.oasis.opendocument.chart"},
{"odf", "application/vnd.oasis.opendocument.formula"},
{"odg", "application/vnd.oasis.opendocument.graphics"},
{"odi", "application/vnd.oasis.opendocument.image"},
{"odm", "application/vnd.oasis.opendocument.text-master"},
{"odp", "application/vnd.oasis.opendocument.presentation"},
{"ods", "application/vnd.oasis.opendocument.spreadsheet"},
{"odt", "application/vnd.oasis.opendocument.text"},
{"ogg", "audio/ogg"},
{"oth", "application/vnd.oasis.opendocument.text-web"},
{"otp", "application/vnd.oasis.opendocument.presentation-template"},
{"pac", "application/x-ns-proxy-autoconfig"},
{"pdf", "application/pdf"},
{"pem", "application/x-x509-ca-cert"},
{"pl", "application/x-perl"},
{"pm", "application/x-perl"},
{"png", "image/png"},
{"ppt", "application/vnd.ms-powerpoint"},
{"ps", "application/postscript"},
{"ra", "audio/x-realaudio"},
{"rar", "application/x-rar-compressed"},
{"rpm", "application/x-redhat-package-manager"},
{"rss", "application/rss+xml"},
{"rtf", "application/rtf"},
{"run", "application/x-makeself"},
{"sea", "application/x-sea"},
{"sit", "application/x-stuffit"},
{"svg", "image/svg+xml"},
{"svgz", "image/svg+xml"},
{"swf", "application/x-shockwave-flash"},
{"tcl", "application/x-tcl"},
{"tif", "image/tiff"},
{"tiff", "image/tiff"},
{"tk", "application/x-tcl"},
{"ts", "video/mp2t"},
{"txt", "text/plain"},
{"war", "application/java-archive"},
{"wbmp", "image/vnd.wap.wbmp"},
{"webm", "video/webm"},
{"webp", "image/webp"},
{"wml", "text/vnd.wap.wml"},
{"wmlc", "application/vnd.wap.wmlc"},
{"wmv", "video/x-ms-wmv"},
{"woff", "application/font-woff"},
{"xhtml", "application/xhtml+xml"},
{"xls", "application/vnd.ms-excel"},
{"xml", "text/xml"},
{"xpi", "application/x-xpinstall"},
{"zip", "application/zip"}
};
Code refactoring: get_file_mime got into mime.c and all security code moved into a procedure
2020-12-04 18:08:36 +00:00
Declare and initialize the mime database in one statement. This way the compiler can figure out the correct sizing of the strings for us and we won't forget to increase the char arrays if a longer mime type gets declared. While here introduce nitems macro to simplify for loop.
2020-12-05 15:47:33 +00:00
#ifndef nitems
#define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
#endif
Return a constant string from the mimes database. We are not modifying it so there is no need to copy memory around. This also prevents file_mime getting out of sync as had already happend. It had a size of 50 while the mime types database type used to have a size of 70.
2020-12-05 15:58:26 +00:00
const char *
add mimetype and autoindex option + minor changes * follow style(9) for prototypes * move first most used extension for more effeciciency when looking for mime * add opts.h to deal with options * remove lang=en by default * add option to set default mimetype * add option to autoindex if no index.gmi found * redirect if ending "/" is missing * send appropriate status code if request too long * edit manpage and README for new options
2021-01-10 08:30:35 +00:00
get_file_mime(const char *path, const char *default_mime)
Code refactoring: get_file_mime got into mime.c and all security code moved into a procedure
2020-12-04 18:08:36 +00:00
{
remove unused extension and fix warnings
2020-12-09 07:31:18 +00:00
size_t i;
Declare and initialize the mime database in one statement. This way the compiler can figure out the correct sizing of the strings for us and we won't forget to increase the char arrays if a longer mime type gets declared. While here introduce nitems macro to simplify for loop.
2020-12-05 15:47:33 +00:00
char *extension;
Code refactoring: get_file_mime got into mime.c and all security code moved into a procedure
2020-12-04 18:08:36 +00:00
Fix virtualhost support changing the way request is parsed
2021-03-22 20:44:23 +00:00
/* search for extension after last '.' in path */
Return a constant string from the mimes database. We are not modifying it so there is no need to copy memory around. This also prevents file_mime getting out of sync as had already happend. It had a size of 50 while the mime types database type used to have a size of 70.
2020-12-05 15:58:26 +00:00
if ((extension = strrchr(path, '.')) == NULL)
goto out;
Code refactoring: get_file_mime got into mime.c and all security code moved into a procedure
2020-12-04 18:08:36 +00:00
/* look for the MIME in the database */
Declare and initialize the mime database in one statement. This way the compiler can figure out the correct sizing of the strings for us and we won't forget to increase the char arrays if a longer mime type gets declared. While here introduce nitems macro to simplify for loop.
2020-12-05 15:47:33 +00:00
for (i = 0; i < nitems(database); i++) {
Return a constant string from the mimes database. We are not modifying it so there is no need to copy memory around. This also prevents file_mime getting out of sync as had already happend. It had a size of 50 while the mime types database type used to have a size of 70.
2020-12-05 15:58:26 +00:00
if (strcmp(database[i].extension, extension + 1) == 0)
return (database[i].type);
Code refactoring: get_file_mime got into mime.c and all security code moved into a procedure
2020-12-04 18:08:36 +00:00
}
Return a constant string from the mimes database. We are not modifying it so there is no need to copy memory around. This also prevents file_mime getting out of sync as had already happend. It had a size of 50 while the mime types database type used to have a size of 70.
2020-12-05 15:58:26 +00:00
out:
Code refactoring: get_file_mime got into mime.c and all security code moved into a procedure
2020-12-04 18:08:36 +00:00
/* if no MIME have been found, set a default one */
add mimetype and autoindex option + minor changes * follow style(9) for prototypes * move first most used extension for more effeciciency when looking for mime * add opts.h to deal with options * remove lang=en by default * add option to set default mimetype * add option to autoindex if no index.gmi found * redirect if ending "/" is missing * send appropriate status code if request too long * edit manpage and README for new options
2021-01-10 08:30:35 +00:00
return (default_mime);
Code refactoring: get_file_mime got into mime.c and all security code moved into a procedure
2020-12-04 18:08:36 +00:00
}