incubator/dirl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Send absolute path when redirecting

Browse source 
The logic is a little more complicated, but we need it for some future
changes.
This commit is contained in:
Laslo Hunhold 2017-07-07 13:33:43 +02:00
parent fc9f02cee3
commit d598da3d52
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
quark.c
View file

@ -36,12 +36,14 @@ char *argv0;
#define TIMESTAMP_LEN 30 #define TIMESTAMP_LEN 30
enum req_field { enum req_field {
REQ_HOST,
REQ_RANGE, REQ_RANGE,
REQ_MOD, REQ_MOD,
NUM_REQ_FIELDS, NUM_REQ_FIELDS,
}; };
static char *req_field_str[] = { static char *req_field_str[] = {
[REQ_HOST] = "Host",
[REQ_RANGE] = "Range", [REQ_RANGE] = "Range",
[REQ_MOD] = "If-Modified-Since", [REQ_MOD] = "If-Modified-Since",
}; };
@ -542,10 +544,12 @@ squash:
static enum status static enum status
sendresponse(int fd, struct request *r) sendresponse(int fd, struct request *r)
{ {
struct in6_addr res;
struct stat st; struct stat st;
struct tm tm; struct tm tm;
size_t len, i; size_t len, i;
off_t lower, upper; off_t lower, upper;
int hasport, ipv6host;
static char realtarget[PATH_MAX], tmptarget[PATH_MAX], t[TIMESTAMP_LEN]; static char realtarget[PATH_MAX], tmptarget[PATH_MAX], t[TIMESTAMP_LEN];
char *p, *q, *mime; char *p, *q, *mime;
const char *err; const char *err;
@ -580,18 +584,31 @@ sendresponse(int fd, struct request *r)
/* redirect if targets differ */ /* redirect if targets differ */
if (strcmp(r->target, realtarget)) { if (strcmp(r->target, realtarget)) {
/* do we need to add a port to the Location? */
hasport = strcmp(port, "80");
/* RFC 2732 specifies to use brackets for IPv6-addresses in
* URLs, so we need to check if our host is one and honor that
* later when we fill the "Location"-field */
ipv6host = inet_pton(AF_INET6, r->field[REQ_HOST][0] ?
r->field[REQ_HOST] : host, &res);
/* encode realtarget */ /* encode realtarget */
encode(realtarget, tmptarget); encode(realtarget, tmptarget);
/* send redirection header */
if (dprintf(fd, if (dprintf(fd,
"HTTP/1.1 %d %s\r\n" "HTTP/1.1 %d %s\r\n"
"Date: %s\r\n" "Date: %s\r\n"
"Connection: close\r\n" "Connection: close\r\n"
"Location: %s\r\n" "Location: http://%s%s%s%s%s%s\r\n"
"\r\n", "\r\n",
S_MOVED_PERMANENTLY, S_MOVED_PERMANENTLY,
status_str[S_MOVED_PERMANENTLY], status_str[S_MOVED_PERMANENTLY],
timestamp(time(NULL), t), tmptarget) < 0) { timestamp(time(NULL), t), ipv6host ? "[" : "",
r->field[REQ_HOST][0] ? r->field[REQ_HOST] : host,
ipv6host ? "]" : "", hasport ? ":" : "",
hasport ? port : "", tmptarget) < 0) {
return S_REQUEST_TIMEOUT; return S_REQUEST_TIMEOUT;
} }