mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
httpd_ssi.c: make it a bit less broken
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
aa7da73880
commit
772c2db971
@ -31,13 +31,17 @@ httpd_ssi.c -o httpd_ssi
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* Size (i386, static uclibc, approximate):
|
/* Size (i386, static uclibc, approximate):
|
||||||
text data bss dec hex filename
|
* text data bss dec hex filename
|
||||||
8931 164 68552 77647 12f4f httpd_ssi
|
* 9487 160 68552 78199 13177 httpd_ssi
|
||||||
*/
|
*
|
||||||
|
* Note: it wouldn't be too hard to get rid of stdio and strdup,
|
||||||
|
* (especially that fgets() mangles NULs...)
|
||||||
|
*/
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <fcntl.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@ -46,40 +50,97 @@ httpd_ssi.c -o httpd_ssi
|
|||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
|
static char* skip_whitespace(char *s)
|
||||||
|
{
|
||||||
|
while (*s == ' ' || *s == '\t') ++s;
|
||||||
|
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
|
||||||
static char line[64 * 1024];
|
static char line[64 * 1024];
|
||||||
|
|
||||||
/*
|
|
||||||
* Currently only handles directives which are alone on the line
|
|
||||||
*/
|
|
||||||
static void process_includes(const char *filename)
|
static void process_includes(const char *filename)
|
||||||
{
|
{
|
||||||
|
int curdir_fd;
|
||||||
|
char *end;
|
||||||
FILE *fp = fopen(filename, "r");
|
FILE *fp = fopen(filename, "r");
|
||||||
if (!fp)
|
if (!fp)
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
||||||
#define INCLUDE "<!--#include file=\""
|
/* Ensure that nested includes are relative:
|
||||||
while (fgets(line, sizeof(line), fp)) {
|
* if we include a/1.htm and it includes b/2.htm,
|
||||||
char *closing_dq;
|
* we need to include a/b/2.htm, not b/2.htm
|
||||||
|
*/
|
||||||
|
curdir_fd = -1;
|
||||||
|
end = strrchr(filename, '/');
|
||||||
|
if (end) {
|
||||||
|
curdir_fd = open(".", O_RDONLY);
|
||||||
|
/* *end = '\0' would mishandle "/file.htm" */
|
||||||
|
end[1] = '\0';
|
||||||
|
chdir(filename);
|
||||||
|
}
|
||||||
|
|
||||||
/* FIXME: output text leading to INCLUDE first */
|
#define INCLUDE "<!--#include"
|
||||||
if (strncmp(line, INCLUDE, sizeof(INCLUDE)-1) != 0
|
while (fgets(line, sizeof(line), fp)) {
|
||||||
|| (closing_dq = strchr(line + sizeof(INCLUDE)-1, '"')) == NULL
|
unsigned preceding_len;
|
||||||
/* or strstr(line + sizeof(INCLUDE)-1, "\" -->")? */
|
char *include_directive;
|
||||||
) {
|
|
||||||
|
include_directive = strstr(line, INCLUDE);
|
||||||
|
if (!include_directive) {
|
||||||
fputs(line, stdout);
|
fputs(line, stdout);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
*closing_dq = '\0';
|
preceding_len = include_directive - line;
|
||||||
|
if (memchr(line, '\"', preceding_len)
|
||||||
|
|| memchr(line, '\'', preceding_len)
|
||||||
|
) {
|
||||||
|
/* INCLUDE string may be inside "str" or 'str',
|
||||||
|
* ignore it */
|
||||||
|
fputs(line, stdout);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
/* Small bug: we accept #includefile="file" too */
|
||||||
|
include_directive = skip_whitespace(include_directive + sizeof(INCLUDE)-1);
|
||||||
|
if (strncmp(include_directive, "file=\"", 6) != 0) {
|
||||||
|
/* "<!--#include virtual=..."? - not supported */
|
||||||
|
fputs(line, stdout);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
include_directive += 6; /* now it points to file name */
|
||||||
|
end = strchr(include_directive, '\"');
|
||||||
|
if (!end) {
|
||||||
|
fputs(line, stdout);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
/* We checked that this is a valid include directive */
|
||||||
|
|
||||||
|
/* Print everything before directive */
|
||||||
|
if (preceding_len) {
|
||||||
|
line[preceding_len] = '\0';
|
||||||
|
fputs(line, stdout);
|
||||||
|
}
|
||||||
|
/* Save everything after directive */
|
||||||
|
*end++ = '\0';
|
||||||
|
end = strchr(end, '>');
|
||||||
|
if (end)
|
||||||
|
end = strdup(end + 1);
|
||||||
|
|
||||||
/* FIXME:
|
/* FIXME:
|
||||||
* (1) are relative paths with /../ etc ok?
|
* (1) are relative paths with /../ etc ok?
|
||||||
* (2) if we include a/1.htm and it includes b/2.htm,
|
* (2) what to do with absolute paths?
|
||||||
* do we need to include a/b/2.htm or b/2.htm?
|
* are they relative to doc root or to real root?
|
||||||
* IOW, do we need to "cd $dirname"?
|
|
||||||
*/
|
*/
|
||||||
process_includes(line + sizeof(INCLUDE)-1);
|
process_includes(include_directive);
|
||||||
/* FIXME: this should be the tail of line after --> */
|
|
||||||
putchar('\n');
|
/* Print everything after directive */
|
||||||
|
if (end) {
|
||||||
|
fputs(end, stdout);
|
||||||
|
free(end);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
if (curdir_fd >= 0)
|
||||||
|
fchdir(curdir_fd);
|
||||||
|
fclose(fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
@ -95,13 +156,14 @@ int main(int argc, char *argv[])
|
|||||||
* Connection: close
|
* Connection: close
|
||||||
* Content-Type: text/html
|
* Content-Type: text/html
|
||||||
*/
|
*/
|
||||||
printf(
|
fputs(
|
||||||
/* "Date: Thu, 10 Sep 2009 18:23:28 GMT\r\n" */
|
/* "Date: Thu, 10 Sep 2009 18:23:28 GMT\r\n" */
|
||||||
/* "Server: Apache\r\n" */
|
/* "Server: Apache\r\n" */
|
||||||
/* "Accept-Ranges: bytes\r\n" - do we really accept bytes?! */
|
/* "Accept-Ranges: bytes\r\n" - do we really accept bytes?! */
|
||||||
"Connection: close\r\n"
|
"Connection: close\r\n"
|
||||||
"Content-Type: text/html\r\n"
|
"Content-Type: text/html\r\n"
|
||||||
"\r\n"
|
"\r\n",
|
||||||
|
stdout
|
||||||
);
|
);
|
||||||
process_includes(argv[1]);
|
process_includes(argv[1]);
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user