neale
/
eris
mirror of https://github.com/nealey/eris.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make it easier to Debianize

This commit is contained in:
Neale Pickett 2012-10-30 17:45:19 -06:00
parent 25600693cc
commit f0cd1af781
10 changed files with 283 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,3 +1,7 @@
3.1.1:
Restructured code to make it easier to package for Debian.
I hate you so much right now, Ryan.
3.1:
Add -. flag to disable vhosting
Support server push CGI

3
Makefile
View File

@ -4,8 +4,7 @@ CFLAGS = -DFNORD='"eris/$(VERSION)"' -Wall -Werror
all: eris
eris: eris.c strings.c mime.c time.c cgi.c
$(CC) $(CFLAGS) -o $@ $<
eris: eris.o strings.o mime.o timerfc.o
test: eris
sh ./test.sh

213
cgi.c
View File

@ -1,213 +0,0 @@
void
sigchld(int sig)
{
while (waitpid(0, NULL, WNOHANG) > 0);
}
void
sigalarm_cgi(int sig)
{
/* send this out regardless of whether we've already sent a header,
* to maybe help with debugging */
badrequest(504, "Gateway Timeout", "The CGI is being too slow.");
}
static void
cgi_child(const char *relpath)
{
env("GATEWAY_INTERFACE", "CGI/1.1");
env("SERVER_SOFTWARE", FNORD);
env("REQUEST_URI", path);
env("SERVER_NAME", host);
env("SCRIPT_NAME", relpath);
env("REMOTE_ADDR", remote_addr);
env("REMOTE_IDENT", remote_ident);
if (content_length) {
char cl[20];
snprintf(cl, sizeof cl, "%llu", (unsigned long long) content_length);
env("CONTENT_LENGTH", cl);
env("CONTENT_TYPE", content_type);
}
/* Change to CGI's directory */
{
char *delim = strrchr(relpath, '/');
if (delim) {
*delim = '\0';
chdir(relpath);
relpath = delim + 1;
}
}
execl(relpath, relpath, NULL);
exit(1);
}
void
cgi_parent(int cin, int cout, int passthru)
{
char cgiheader[BUFFER_SIZE];
size_t cgiheaderlen = 0;
FILE *cinf = fdopen(cin, "rb");
size_t size = 0;
int header_sent = 0;
int code = 200;
fcntl(cin, F_SETFL, O_NONBLOCK);
signal(SIGCHLD, sigchld);
signal(SIGPIPE, SIG_IGN); /* NO! no signal! */
while (1) {
int nfds;
fd_set rfds, wfds;
FD_ZERO(&rfds);
FD_ZERO(&wfds);
FD_SET(cin, &rfds);
nfds = cin;
if (content_length) {
/* have post data */
FD_SET(cout, &wfds);
if (cout > nfds) {
nfds = cout;
}
} else if (cout >= 0) {
close(cout); /* no post data */
cout = -1;
}
if (-1 == select(nfds+1, &rfds, &wfds, NULL, NULL)) {
break;
}
if (FD_ISSET(cin, &rfds)) {
if (passthru) {
/* Pass everything through verbatim */
size_t len;
/* Re-use this big buffer */
len = fread(cgiheader, 1, sizeof cgiheader, cinf);
if (0 == len) {
/* CGI is done */
break;
}
fwrite(cgiheader, 1, len, stdout);
/* Naively assume the CGI knows best about sending stuff */
fflush(stdout);
size += len;
} else {
/* Interpret header fields */
size_t readlen = (sizeof cgiheader) - cgiheaderlen;
if (NULL == fgets(cgiheader + cgiheaderlen, readlen, cinf)) {
/* EOF or error */
badrequest(500, "CGI Error", "CGI output too weird");
}
cgiheaderlen = strlen(cgiheader);
if ('\n' == cgiheader[cgiheaderlen - 1]) {
/* We read a whole line */
size_t len;
char *val;
len = extract_header_field(cgiheader, &val, 0);
if (! len) {
/* We've read the entire header block */
passthru = 1;
eoh();
} else {
if (! header_sent) {
if (! strcasecmp(cgiheader, "Location")) {
header(302, "CGI Redirect");
printf("%s: %s\r\n\r\n", cgiheader, val);
dolog(302, 0);
exit(0);
} else if (! strcasecmp(cgiheader, "Status")) {
char *txt = val + 4;
code = atoi(val);
header(code, txt);
} else {
header(200, "OK");
printf("Pragma: no-cache\r\n");
}
header_sent = 1;
}
printf("%s: %s\r\n", cgiheader, val);
cgiheaderlen = 0;
}
}
}
} else if (FD_ISSET(cout, &wfds)) {
/*
* write to cgi the post data
*/
if (content_length) {
size_t len;
char buf[BUFFER_SIZE];
size_t nmemb = min(BUFFER_SIZE, content_length);
len = fread(buf, 1, nmemb, stdin);
if (len < 1) {
break;
}
content_length -= len;
write(cout, buf, len);
} else {
close(cout);
}
}
}
fflush(stdout);
dolog(200, size);
cork(0);
}
void
serve_cgi(char *relpath)
{
int pid;
int cin[2];
int cout[2];
if (pipe(cin) || pipe(cout)) {
badrequest(500, "Internal Server Error", "Server Resource problem.");
}
pid = fork();
if (-1 == pid) {
badrequest(500, "Internal Server Error", "Unable to fork.");
}
if (pid) {
close(cin[1]);
close(cout[0]);
/* Eris is not this smart yet */
keepalive = 0;
alarm(CGI_TIMEOUT);
signal(SIGALRM, sigalarm_cgi);
cgi_parent(cin[0], cout[1], 0);
exit(0);
} else {
close(cwd);
close(cout[1]);
close(cin[0]);
dup2(cout[0], 0);
dup2(cin[1], 1);
close(cout[0]);
close(cin[1]);
cgi_child(relpath);
}
}

253
eris.c
View File

@ -22,6 +22,10 @@
#include <dirent.h>
#include <limits.h>
#include "strings.h"
#include "mime.h"
#include "timerfc.h"
#ifdef __linux__
# include <sys/sendfile.h>
#else
@ -69,6 +73,8 @@
/* Maximum number of header fields */
#define MAXHEADERFIELDS 60
#define BUFFER_SIZE 8192
/*
* Options
*/
@ -102,13 +108,6 @@ off_t range_start, range_end;
time_t ims;
#define BUFFER_SIZE 8192
char stdout_buf[BUFFER_SIZE];
#include "strings.c"
#include "mime.c"
#include "time.c"
/*
* TCP_CORK is a Linux extension to work around a TCP problem.
* http://www.baus.net/on-tcp_cork has a good description.
@ -129,7 +128,7 @@ cork(int enable)
}
/** Log a request */
static void
void
dolog(int code, off_t len)
{ /* write a log line to stderr */
sanitize(host);
@ -157,7 +156,7 @@ eoh()
/*
* output an error message and exit
*/
static void
void
badrequest(long code, const char *httpcomment, const char *message)
{
size_t msglen = 0;
@ -178,15 +177,7 @@ badrequest(long code, const char *httpcomment, const char *message)
exit(0);
}
void
env(const char *k, const char *v)
{
if (v) {
setenv(k, v, 1);
}
}
#include "cgi.c"
void
not_found()
@ -202,6 +193,14 @@ not_found()
fflush(stdout);
}
void
env(const char *k, const char *v)
{
if (v) {
setenv(k, v, 1);
}
}
char *
proto_getenv(char *proto, char *name)
{
@ -285,6 +284,224 @@ parse_options(int argc, char *argv[])
}
}
/*
* CGI stuff
*/
static void
sigchld(int sig)
{
while (waitpid(0, NULL, WNOHANG) > 0);
}
static void
sigalarm_cgi(int sig)
{
/* send this out regardless of whether we've already sent a header,
* to maybe help with debugging */
badrequest(504, "Gateway Timeout", "The CGI is being too slow.");
}
static void
cgi_child(const char *relpath)
{
env("GATEWAY_INTERFACE", "CGI/1.1");
env("SERVER_SOFTWARE", FNORD);
env("REQUEST_URI", path);
env("SERVER_NAME", host);
env("SCRIPT_NAME", relpath);
env("REMOTE_ADDR", remote_addr);
env("REMOTE_IDENT", remote_ident);
if (content_length) {
char cl[20];
snprintf(cl, sizeof cl, "%llu", (unsigned long long) content_length);
env("CONTENT_LENGTH", cl);
env("CONTENT_TYPE", content_type);
}
/* Change to CGI's directory */
{
char *delim = strrchr(relpath, '/');
if (delim) {
*delim = '\0';
chdir(relpath);
relpath = delim + 1;
}
}
execl(relpath, relpath, NULL);
exit(1);
}
void
cgi_parent(int cin, int cout, int passthru)
{
char cgiheader[BUFFER_SIZE];
size_t cgiheaderlen = 0;
FILE *cinf = fdopen(cin, "rb");
size_t size = 0;
int header_sent = 0;
int code = 200;
fcntl(cin, F_SETFL, O_NONBLOCK);
signal(SIGCHLD, sigchld);
signal(SIGPIPE, SIG_IGN); /* NO! no signal! */
while (1) {
int nfds;
fd_set rfds, wfds;
FD_ZERO(&rfds);
FD_ZERO(&wfds);
FD_SET(cin, &rfds);
nfds = cin;
if (content_length) {
/* have post data */
FD_SET(cout, &wfds);
if (cout > nfds) {
nfds = cout;
}
} else if (cout >= 0) {
close(cout); /* no post data */
cout = -1;
}
if (-1 == select(nfds+1, &rfds, &wfds, NULL, NULL)) {
break;
}
if (FD_ISSET(cin, &rfds)) {
if (passthru) {
/* Pass everything through verbatim */
size_t len;
/* Re-use this big buffer */
len = fread(cgiheader, 1, sizeof cgiheader, cinf);
if (0 == len) {
/* CGI is done */
break;
}
fwrite(cgiheader, 1, len, stdout);
/* Naively assume the CGI knows best about sending stuff */
fflush(stdout);
size += len;
} else {
/* Interpret header fields */
size_t readlen = (sizeof cgiheader) - cgiheaderlen;
if (NULL == fgets(cgiheader + cgiheaderlen, readlen, cinf)) {
/* EOF or error */
badrequest(500, "CGI Error", "CGI output too weird");
}
cgiheaderlen = strlen(cgiheader);
if ('\n' == cgiheader[cgiheaderlen - 1]) {
/* We read a whole line */
size_t len;
char *val;
len = extract_header_field(cgiheader, &val, 0);
if (! len) {
/* We've read the entire header block */
passthru = 1;
eoh();
} else {
if (! header_sent) {
if (! strcasecmp(cgiheader, "Location")) {
header(302, "CGI Redirect");
printf("%s: %s\r\n\r\n", cgiheader, val);
dolog(302, 0);
exit(0);
} else if (! strcasecmp(cgiheader, "Status")) {
char *txt = val + 4;
code = atoi(val);
header(code, txt);
} else {
header(200, "OK");
printf("Pragma: no-cache\r\n");
}
header_sent = 1;
}
printf("%s: %s\r\n", cgiheader, val);
cgiheaderlen = 0;
}
}
}
} else if (FD_ISSET(cout, &wfds)) {
/*
* write to cgi the post data
*/
if (content_length) {
size_t len;
char buf[BUFFER_SIZE];
size_t nmemb = min(BUFFER_SIZE, content_length);
len = fread(buf, 1, nmemb, stdin);
if (len < 1) {
break;
}
content_length -= len;
write(cout, buf, len);
} else {
close(cout);
}
}
}
fflush(stdout);
dolog(200, size);
cork(0);
}
void
serve_cgi(char *relpath)
{
int pid;
int cin[2];
int cout[2];
if (pipe(cin) || pipe(cout)) {
badrequest(500, "Internal Server Error", "Server Resource problem.");
}
pid = fork();
if (-1 == pid) {
badrequest(500, "Internal Server Error", "Unable to fork.");
}
if (pid) {
close(cin[1]);
close(cout[0]);
/* Eris is not this smart yet */
keepalive = 0;
alarm(CGI_TIMEOUT);
signal(SIGALRM, sigalarm_cgi);
cgi_parent(cin[0], cout[1], 0);
exit(0);
} else {
close(cwd);
close(cout[1]);
close(cin[0]);
dup2(cout[0], 0);
dup2(cin[1], 1);
close(cout[0]);
close(cin[1]);
cgi_child(relpath);
}
}
/*
* Main HTTPd
*/
void
fake_sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
@ -764,8 +981,6 @@ main(int argc, char *argv[], const char *const *envp)
cwd = open(".", O_RDONLY);
setbuffer(stdout, stdout_buf, sizeof stdout_buf);
signal(SIGPIPE, SIG_IGN);
get_ucspi_env();

6
mime.c
View File

@ -1,3 +1,7 @@
#include <stdio.h>
#include <string.h>
#include "mime.h"
static struct mimeentry {
const char *name,
*type;
@ -44,7 +48,7 @@ static const char *default_mimetype = "application/octet-stream";
/*
* Determine MIME type from file extension
*/
static const char *
const char *
getmimetype(char *url)
{
char *ext = strrchr(url, '.');

6
mime.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef __MIME_H__
#define __MIME_H__
const char *getmimetype(char *url);
#endif

6
strings.c
View File

@ -1,3 +1,7 @@
#include <stdio.h>
#include <ctype.h>
#include "strings.h"
int
endswith(char *haystack, char *needle)
{
@ -20,7 +24,7 @@ endswith(char *haystack, char *needle)
}
/** Replace whitespace with underscores for logging */
static void
void
sanitize(char *s)
{
if (!s) {

13
strings.h Normal file
View File

@ -0,0 +1,13 @@
#ifndef __STRINGS_H__
#define __STRINGS_H__
#include <stdio.h>
int endswith(char *haystack, char *needle);
void sanitize(char *s);
size_t extract_header_field(char *buf, char **val, int cgi);
int fromhex(int c);
void html_esc(FILE *f, char *s);
void url_esc(FILE *f, char *s);
#endif

7
time.c → timerfc.c
View File

@ -35,10 +35,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <time.h>
#include <ctype.h>
#include <string.h>
#include "timerfc.h"
static const char days[] = "SunMonTueWedThuFriSat";
static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
static time_t
time_t
timerfc(const char *s)
{
static const int daytab[2][12] = {

9
timerfc.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef __TIMERFC_H__
#define __TIMERFC_H__
#include <time.h>
time_t timerfc(const char *s);
char *rfctime(time_t t, char *buf);
#endif