mirrors/libmicrohttpd
2
0
Fork 0
mirror of https://git.gnunet.org/libmicrohttpd.git synced 2026-09-25 04:09:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

do not use doc root; avoid various buffer overflows -- pass full filenames

Browse Source
This commit is contained in:
Christian Grothoff
2008-06-28 23:01:19 +00:00
parent 6963e39555
commit 7afe06474b
3 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/daemon.c
+4 -21
View File
@@ -54,10 +54,6 @@
*/
#define DEBUG_CONNECT MHD_NO
// TODO rm
/* HTTPS file path limit, leaving room for file name */
#define MHD_PATH_LEN 240
/* initialize security aspects of the HTTPS daemon */
int MHDS_init (struct MHD_Daemon *daemon);
@@ -792,12 +788,9 @@ MHD_start_daemon (unsigned int options,
retVal->pool_size = MHD_POOL_SIZE_DEFAULT;
retVal->connection_timeout = 0; /* no timeout */
/* set server default document root path */
getcwd (retVal->doc_root, MHD_PATH_LEN);
/* initialize ssl path parameters to the local path */
strcpy (retVal->https_cert_path, "cert.pem");
strcpy (retVal->https_key_path, "key.pem");
retVal->https_cert_path = "cert.pem";
retVal->https_key_path = "key.pem";
/* initializes the argument pointer variable */
va_start (ap, dh_cls);
@@ -825,22 +818,12 @@ MHD_start_daemon (unsigned int options,
case MHD_OPTION_PER_IP_CONNECTION_LIMIT:
retVal->per_ip_connection_limit = va_arg (ap, unsigned int);
break;
case MHD_OPTION_DOC_ROOT:
strncpy (retVal->doc_root, va_arg (ap, char *), MHD_PATH_LEN);
break;
case MHD_OPTION_HTTPS_KEY_PATH:
strncpy (retVal->https_key_path, va_arg (ap, char *), MHD_PATH_LEN);
strcat (retVal->https_key_path, DIR_SEPARATOR_STR);
strcat (retVal->https_key_path, "key.pem");
retVal->https_key_path = va_arg (ap, const char *);
break;
case MHD_OPTION_HTTPS_CERT_PATH:
strncpy (retVal->https_cert_path,
va_arg (ap, char *), MHD_PATH_LEN);
strcat (retVal->https_cert_path, DIR_SEPARATOR_STR);
strcat (retVal->https_cert_path, "cert.pem");
retVal->https_cert_path = va_arg (ap, const char* );
break;
default:
#if HAVE_MESSAGES
fprintf (stderr,
src/daemon/internal.h
+2 -6
View File
@@ -654,13 +654,9 @@ struct MHD_Daemon
/* Diffie-Hellman parameters */
gnutls_dh_params_t dh_params;
// TODO consider switching to variadic length paths
/* server root path used while serving http pages */
char doc_root[255];
const char * https_key_path;
char https_key_path[255];
char https_cert_path[255];
const char * https_cert_path;
#endif
};
src/include/microhttpd.h
+14 -7
View File
@@ -345,14 +345,21 @@ enum MHD_OPTION
*/
MHD_OPTION_PER_IP_CONNECTION_LIMIT = 5,
/* server root path used while serving http pages */
MHD_OPTION_DOC_ROOT = 6,
/**
* Filename for the private key (key.pem) to be used by the
* HTTPS daemon. This option should be followed by an
* "const char*" argument. The memory of the filename must
* not be released until the application terminates.
*/
MHD_OPTION_HTTPS_KEY_PATH = 6,
/* private key path used by the HTTPS daemon */
MHD_OPTION_HTTPS_KEY_PATH = 7,
/* certificate path used by the HTTPS daemon */
MHD_OPTION_HTTPS_CERT_PATH = 8,
/**
* Filename for the certificate (cert.pem) to be used by the
* HTTPS daemon. This option should be followed by an
* "const char*" argument. The memory of the filename must
* not be released until the application terminates.
*/
MHD_OPTION_HTTPS_CERT_PATH = 7,
};
/**