src/server/safs/addlog.c

Sun, 14 Dec 2025 20:37:11 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 14 Dec 2025 20:37:11 +0100
changeset 657
f1469e3144a7
parent 415
d938228c382e
permissions
-rw-r--r--

fix wrong content-length in the access log

45
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
4 * Copyright 2013 Olaf Wintermann. All rights reserved.
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
29 #include <stdio.h>
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30 #include <stdlib.h>
657
f1469e3144a7 fix wrong content-length in the access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
31 #include <inttypes.h>
45
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
32
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
33 #include "addlog.h"
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
34
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
35 #include "../daemon/request.h"
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
36 #include "../daemon/vserver.h"
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
37 #include "../daemon/log.h"
196
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
38 #include "../util/util.h"
657
f1469e3144a7 fix wrong content-length in the access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
39 #include "../util/io.h"
45
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
40
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
41 int common_log(pblock *pb, Session *sn, Request *rq) {
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
42 NSAPIRequest *request = (NSAPIRequest*)rq;
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
43 VirtualServer *vs = request->vs;
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
44 AccessLog *log = vs->log;
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
45
196
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
46 char *combined_str = pblock_findval("combined", pb);
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
47 WSBool combined = FALSE;
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
48 if(combined_str) {
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
49 combined = util_getboolean(combined_str, FALSE);
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
50 }
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
51
45
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
52 if(log == NULL) {
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
53 return REQ_NOACTION;
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
54 }
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
55
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
56 char *ip = pblock_findval("ip", sn->client);
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
57 char *user = pblock_findval("auth-user", rq->vars);
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
58 time_t t = time(NULL);
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
59 char *time = ctime(&t);
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
60 char *req = pblock_findval("clf-request", rq->reqpb);
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
61
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
62 // hack to get the content length
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
63 // http_start_response should not modify the header names
657
f1469e3144a7 fix wrong content-length in the access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
64 int64_t len = httpstream_written(sn->csd);
45
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
65
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
66 if(!ip) {
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
67 ip = "-";
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
68 }
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
69 if(!user) {
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
70 user = "-";
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
71 }
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
72
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
73 // remove trailing line feed
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
74 cxstring tmstr = cx_str(time);
45
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
75 if(tmstr.ptr[tmstr.length-1] == '\n') {
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
76 tmstr.length--;
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
77 }
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
78
196
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
79 if(combined) {
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
80 char *referer = pblock_findval("referer", rq->headers);
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
81 char *user_agent = pblock_findval("user-agent", rq->headers);
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
82 int refq = 1;
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
83 int uaq = 1;
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
84 if(!referer) {
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
85 referer = "-";
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
86 refq = 0;
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
87 }
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
88 if(!user_agent) {
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
89 user_agent = "-";
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
90 uaq = 0;
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
91 }
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
92 fprintf(
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
93 log->log->file,
657
f1469e3144a7 fix wrong content-length in the access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
94 "%s - %s [%.*s] \"%s\" %d %" PRId64 " %.*s%s%.*s %.*s%s%.*s\n",
196
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
95 ip,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
96 user,
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
97 (int)tmstr.length,
196
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
98 tmstr.ptr,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
99 req,
657
f1469e3144a7 fix wrong content-length in the access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
100 (int)rq->status_num,
196
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
101 len,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
102 refq,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
103 "\"",
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
104 referer,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
105 refq,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
106 "\"",
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
107 uaq,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
108 "\"",
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
109 user_agent,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
110 uaq,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
111 "\""
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
112 );
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
113 } else {
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
114 fprintf(
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
115 log->log->file,
657
f1469e3144a7 fix wrong content-length in the access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
116 "%s - %s [%.*s] \"%s\" %d %" PRId64 "\n",
196
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
117 ip,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
118 user,
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
119 (int)tmstr.length,
196
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
120 tmstr.ptr,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
121 req,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
122 rq->status_num,
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
123 len);
0459c94a60ed adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
124 }
77
f1cff81e425a some fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 45
diff changeset
125 fflush(log->log->file);
45
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
126
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
127
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
128 return REQ_PROCEED;
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
129 }
a24aa388f02f added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
130

mercurial