Sat, 18 Mar 2023 11:44:37 +0100
fix nsapi_error_request() could send empty error messages with http status 200, if the request status code wasn't set
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> | |
31 | ||
32 | #include "addlog.h" | |
33 | ||
34 | #include "../daemon/request.h" | |
35 | #include "../daemon/vserver.h" | |
36 | #include "../daemon/log.h" | |
196
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
37 | #include "../util/util.h" |
45 | 38 | |
39 | int common_log(pblock *pb, Session *sn, Request *rq) { | |
40 | NSAPIRequest *request = (NSAPIRequest*)rq; | |
41 | VirtualServer *vs = request->vs; | |
42 | AccessLog *log = vs->log; | |
43 | ||
196
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
44 | char *combined_str = pblock_findval("combined", pb); |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
45 | WSBool combined = FALSE; |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
46 | if(combined_str) { |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
47 | combined = util_getboolean(combined_str, FALSE); |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
48 | } |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
49 | |
45 | 50 | if(log == NULL) { |
51 | return REQ_NOACTION; | |
52 | } | |
53 | ||
54 | char *ip = pblock_findval("ip", sn->client); | |
55 | char *user = pblock_findval("auth-user", rq->vars); | |
56 | time_t t = time(NULL); | |
57 | char *time = ctime(&t); | |
58 | char *req = pblock_findval("clf-request", rq->reqpb); | |
59 | ||
60 | // hack to get the content length | |
61 | // http_start_response should not modify the header names | |
62 | char *len = pblock_findval("Content-length", rq->srvhdrs); | |
63 | ||
64 | if(!ip) { | |
65 | ip = "-"; | |
66 | } | |
67 | if(!user) { | |
68 | user = "-"; | |
69 | } | |
70 | if(!len) { | |
71 | len = "0"; | |
72 | } | |
73 | ||
74 | // remove trailing line feed | |
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
75 | cxstring tmstr = cx_str(time); |
45 | 76 | if(tmstr.ptr[tmstr.length-1] == '\n') { |
77 | tmstr.length--; | |
78 | } | |
79 | ||
196
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
80 | if(combined) { |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
81 | char *referer = pblock_findval("referer", rq->headers); |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
82 | char *user_agent = pblock_findval("user-agent", rq->headers); |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
83 | int refq = 1; |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
84 | int uaq = 1; |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
85 | if(!referer) { |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
86 | referer = "-"; |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
87 | refq = 0; |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
88 | } |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
89 | if(!user_agent) { |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
90 | user_agent = "-"; |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
91 | uaq = 0; |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
92 | } |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
93 | fprintf( |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
94 | log->log->file, |
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
95 | "%s - %s [%.*s] \"%s\" %d %s %.*s%s%.*s %.*s%s%.*s\n", |
196
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
96 | ip, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
97 | user, |
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
98 | (int)tmstr.length, |
196
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
99 | tmstr.ptr, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
100 | req, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
101 | rq->status_num, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
102 | len, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
103 | refq, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
104 | "\"", |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
105 | referer, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
106 | refq, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
107 | "\"", |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
108 | uaq, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
109 | "\"", |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
110 | user_agent, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
111 | uaq, |
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 | ); |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
114 | } else { |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
115 | fprintf( |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
116 | log->log->file, |
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
117 | "%s - %s [%.*s] \"%s\" %d %s\n", |
196
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
118 | ip, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
119 | user, |
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
120 | (int)tmstr.length, |
196
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
121 | tmstr.ptr, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
122 | req, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
123 | rq->status_num, |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
124 | len); |
0459c94a60ed
adds combined log format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
125 | } |
77 | 126 | fflush(log->log->file); |
45 | 127 | |
128 | ||
129 | return REQ_PROCEED; | |
130 | } | |
131 |