Sun, 14 Dec 2025 20:37:11 +0100
fix wrong content-length in the access log
| 45 | 1 | /* |
| 2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | |
| 3 | * | |
| 4 | * Copyright 2013 Olaf Wintermann. All rights reserved. | |
| 5 | * | |
| 6 | * Redistribution and use in source and binary forms, with or without | |
| 7 | * modification, are permitted provided that the following conditions are met: | |
| 8 | * | |
| 9 | * 1. Redistributions of source code must retain the above copyright | |
| 10 | * notice, this list of conditions and the following disclaimer. | |
| 11 | * | |
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
| 13 | * notice, this list of conditions and the following disclaimer in the | |
| 14 | * documentation and/or other materials provided with the distribution. | |
| 15 | * | |
| 16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |
| 17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
| 18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
| 19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | |
| 20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
| 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
| 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
| 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
| 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
| 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
| 26 | * POSSIBILITY OF SUCH DAMAGE. | |
| 27 | */ | |
| 28 | ||
| 29 | #include <stdio.h> | |
| 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 | 32 | |
| 33 | #include "addlog.h" | |
| 34 | ||
| 35 | #include "../daemon/request.h" | |
| 36 | #include "../daemon/vserver.h" | |
| 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 | 40 | |
| 41 | int common_log(pblock *pb, Session *sn, Request *rq) { | |
| 42 | NSAPIRequest *request = (NSAPIRequest*)rq; | |
| 43 | VirtualServer *vs = request->vs; | |
| 44 | AccessLog *log = vs->log; | |
| 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 | 52 | if(log == NULL) { |
| 53 | return REQ_NOACTION; | |
| 54 | } | |
| 55 | ||
| 56 | char *ip = pblock_findval("ip", sn->client); | |
| 57 | char *user = pblock_findval("auth-user", rq->vars); | |
| 58 | time_t t = time(NULL); | |
| 59 | char *time = ctime(&t); | |
| 60 | char *req = pblock_findval("clf-request", rq->reqpb); | |
| 61 | ||
| 62 | // hack to get the content length | |
| 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 | 65 | |
| 66 | if(!ip) { | |
| 67 | ip = "-"; | |
| 68 | } | |
| 69 | if(!user) { | |
| 70 | user = "-"; | |
| 71 | } | |
| 72 | ||
| 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 | 75 | if(tmstr.ptr[tmstr.length-1] == '\n') { |
| 76 | tmstr.length--; | |
| 77 | } | |
| 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 | 125 | fflush(log->log->file); |
| 45 | 126 | |
| 127 | ||
| 128 | return REQ_PROCEED; | |
| 129 | } | |
| 130 |