Fri, 29 Nov 2024 18:10:26 +0100
fix wrong column name usage by pg prop extensions
1 | 1 | /* |
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | |
3 | * | |
44
3da1f7b6847f
added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
41
diff
changeset
|
4 | * Copyright 2013 Olaf Wintermann. All rights reserved. |
1 | 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 | ||
41
bb7a1f5a8b48
added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
29 | |
bb7a1f5a8b48
added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
30 | #ifdef __gnu_linux__ |
bb7a1f5a8b48
added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
31 | #define _GNU_SOURCE |
bb7a1f5a8b48
added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
32 | #endif |
bb7a1f5a8b48
added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
33 | |
1 | 34 | #include <stdio.h> |
35 | #include <stdlib.h> | |
9
30e51941a673
Added mod_jk dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
36 | #include <dlfcn.h> |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
37 | #include <grp.h> |
58
66c22e54aa90
webdav uses the vfs api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
38 | #include <sys/types.h> |
66c22e54aa90
webdav uses the vfs api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
39 | #include <sys/stat.h> |
1 | 40 | |
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
41 | #include <openssl/bio.h> |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
42 | #include <openssl/ssl.h> |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
43 | #include <openssl/err.h> |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
44 | |
14
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
9
diff
changeset
|
45 | #include "../public/nsapi.h" |
59
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
46 | #include "../public/auth.h" |
14
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
9
diff
changeset
|
47 | #include "../util/systhr.h" |
363
7f0f5c03666a
port pblock.cpp to pblock.c
Mike Becker <universe@uap-core.de>
parents:
179
diff
changeset
|
48 | #include "../util/pblock.h" |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
49 | #include "../util/util.h" |
1 | 50 | |
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
392
diff
changeset
|
51 | #include <cx/utils.h> |
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
392
diff
changeset
|
52 | #include <cx/printf.h> |
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
392
diff
changeset
|
53 | #include <cx/compare.h> |
156
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
54 | |
154
6394ce09889a
adds set-variable saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
55 | #include "../safs/common.h" |
6394ce09889a
adds set-variable saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
56 | |
1 | 57 | #include "func.h" |
18
73aacbf6e492
Added server.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
58 | #include "config.h" |
19
d680536f8c2f
Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
59 | #include "configmanager.h" |
1 | 60 | #include "httplistener.h" |
61 | #include "webserver.h" | |
66
74babc0082b7
added authentication cache
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
63
diff
changeset
|
62 | #include "auth.h" |
158
77f4f0079428
adds reconfig and shutdown handler to srvctrl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
156
diff
changeset
|
63 | #include "srvctrl.h" |
269
3dfbd0b91950
add ResourcePool initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
64 | #include "resourcepool.h" |
461
9b20b8f3582b
add ldap resource pool type implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
444
diff
changeset
|
65 | #include "ldap_resource.h" |
1 | 66 | |
67 | extern struct FuncStruct webserver_funcs[]; | |
68 | ||
68
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
69 | static RestartCallback *atrestart; |
1 | 70 | |
129
fd324464f56f
adds support for ssl cert chain files and improves ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
71 | int webserver_init() { |
1 | 72 | // init NSPR |
73 | systhread_init("webserver"); | |
28 | 74 | |
392
0aef555055ee
print error in case the log file config doesn't work
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
391
diff
changeset
|
75 | log_ereport(LOG_VERBOSE, "webserver_init"); |
0aef555055ee
print error in case the log file config doesn't work
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
391
diff
changeset
|
76 | |
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
77 | // init ssl |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
78 | if(ws_init_ssl()) { |
392
0aef555055ee
print error in case the log file config doesn't work
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
391
diff
changeset
|
79 | log_ereport(LOG_FAILURE, "ssl init failed"); |
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
80 | return -1; |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
81 | } |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
82 | |
438
22eca559aded
refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
435
diff
changeset
|
83 | // init listener socket map |
22eca559aded
refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
435
diff
changeset
|
84 | if(http_listener_global_init()) { |
22eca559aded
refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
435
diff
changeset
|
85 | log_ereport(LOG_FAILURE, "listener global init failed"); |
22eca559aded
refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
435
diff
changeset
|
86 | return -1; |
22eca559aded
refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
435
diff
changeset
|
87 | } |
22eca559aded
refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
435
diff
changeset
|
88 | |
1 | 89 | // init NSAPI functions |
363
7f0f5c03666a
port pblock.cpp to pblock.c
Mike Becker <universe@uap-core.de>
parents:
179
diff
changeset
|
90 | pblock_init_default_keys(); |
7f0f5c03666a
port pblock.cpp to pblock.c
Mike Becker <universe@uap-core.de>
parents:
179
diff
changeset
|
91 | atexit(pblock_free_default_keys); |
1 | 92 | func_init(); |
93 | add_functions(webserver_funcs); | |
38
d07810b02147
added ldap authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
94 | |
269
3dfbd0b91950
add ResourcePool initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
95 | // init resource pools |
3dfbd0b91950
add ResourcePool initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
96 | if(init_resource_pools()) { |
392
0aef555055ee
print error in case the log file config doesn't work
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
391
diff
changeset
|
97 | log_ereport(LOG_FAILURE, "resource pool init failed"); |
269
3dfbd0b91950
add ResourcePool initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
98 | return -1; |
3dfbd0b91950
add ResourcePool initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
99 | } |
461
9b20b8f3582b
add ldap resource pool type implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
444
diff
changeset
|
100 | if(resourcepool_register_type("ldap", ldap_get_resource_type())) { |
9b20b8f3582b
add ldap resource pool type implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
444
diff
changeset
|
101 | log_ereport(LOG_FAILURE, "webserver-init: Cannot register ldap resourcepool type"); |
9b20b8f3582b
add ldap resource pool type implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
444
diff
changeset
|
102 | return -1; |
9b20b8f3582b
add ldap resource pool type implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
444
diff
changeset
|
103 | } |
269
3dfbd0b91950
add ResourcePool initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
104 | |
1 | 105 | // load init.conf |
426
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
106 | InitConfig *init_config = load_init_conf("config/init.conf"); |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
107 | if(!init_config) { |
60
feb2f1e115c6
improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
108 | return -1; |
feb2f1e115c6
improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
109 | } |
1 | 110 | |
111 | // load server.conf | |
388
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
112 | // Only the runtime infos are stored in the ServerConfiguration at |
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
113 | // this stage. The remaining configuration is loaded after the uid |
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
114 | // is changed (if needed). |
19
d680536f8c2f
Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
115 | init_configuration_manager(); |
388
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
116 | CfgManager mgr; |
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
117 | if(cfgmgr_load_config(&mgr) != 0) { |
443
ef3c8a0e1fee
improve daemon startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
440
diff
changeset
|
118 | return 1; |
19
d680536f8c2f
Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
119 | } |
392
0aef555055ee
print error in case the log file config doesn't work
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
391
diff
changeset
|
120 | log_ereport(LOG_VERBOSE, "cfgmgr_load_config stage 1 successful"); |
388
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
121 | ServerConfiguration *cfg = mgr.cfg; |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
122 | |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
123 | // set global vars |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
124 | conf_global_vars_s *vars = conf_getglobals(); |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
125 | |
146
a9591a91c004
fixes server user init
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
126 | WSBool changeuid = FALSE; |
73
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
127 | uid_t ws_uid = geteuid(); |
63
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
60
diff
changeset
|
128 | setpwent(); |
73
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
129 | char *pwbuf = malloc(DEF_PWBUF); |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
130 | vars->Vuserpw = malloc(sizeof(struct passwd)); |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
131 | if(cfg->user.ptr) { |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
132 | if(!util_getpwnam(cfg->user.ptr, vars->Vuserpw, pwbuf, DEF_PWBUF)) { |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
133 | log_ereport( |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
134 | LOG_MISCONFIG, |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
135 | "user %s does not exist!", |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
136 | cfg->user.ptr); |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
137 | free(vars->Vuserpw); |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
138 | vars->Vuserpw = NULL; |
146
a9591a91c004
fixes server user init
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
139 | } else { |
a9591a91c004
fixes server user init
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
140 | changeuid = TRUE; |
73
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
141 | } |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
142 | } else { |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
143 | if(!util_getpwuid(ws_uid, vars->Vuserpw, pwbuf, DEF_PWBUF)) { |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
144 | log_ereport(LOG_FAILURE, "webserver_init: cannot get passwd data"); |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
145 | free(vars->Vuserpw); |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
146 | vars->Vuserpw = NULL; |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
147 | } |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
148 | } |
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
149 | if(!vars->Vuserpw) { |
435
713ec3da79ec
expression parser: add support for functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
427
diff
changeset
|
150 | log_ereport(LOG_VERBOSE, "globalvars->Vuserpw is null"); |
73
79fa26ecd135
added file system ACLs for linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
151 | } |
443
ef3c8a0e1fee
improve daemon startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
440
diff
changeset
|
152 | |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
153 | // change uid |
146
a9591a91c004
fixes server user init
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
154 | if(changeuid && ws_uid == 0) { |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
155 | // a webserver user is set and we are root |
391
80ee93a7d257
add verbose logging for setuid/setgid and abort startup if setuid fails
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
388
diff
changeset
|
156 | log_ereport(LOG_VERBOSE, "setgid(%d)", vars->Vuserpw->pw_gid); |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
157 | if(setgid(vars->Vuserpw->pw_gid) != 0) { |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
158 | log_ereport( |
60
feb2f1e115c6
improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
159 | LOG_FAILURE, |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
160 | "setgid(%d) failed", |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
161 | vars->Vuserpw->pw_gid); |
391
80ee93a7d257
add verbose logging for setuid/setgid and abort startup if setuid fails
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
388
diff
changeset
|
162 | return -1; |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
163 | } else { |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
164 | // setgid was successful |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
165 | // we need to call initgroups to have all group permissions |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
166 | if(initgroups(vars->Vuserpw->pw_name, vars->Vuserpw->pw_gid)!=0) { |
60
feb2f1e115c6
improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
167 | log_ereport(LOG_FAILURE, "initgroups failed"); |
391
80ee93a7d257
add verbose logging for setuid/setgid and abort startup if setuid fails
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
388
diff
changeset
|
168 | return -1; |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
169 | } |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
170 | } |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
171 | |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
172 | // change the uid |
391
80ee93a7d257
add verbose logging for setuid/setgid and abort startup if setuid fails
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
388
diff
changeset
|
173 | log_ereport(LOG_VERBOSE, "setuid(%d)", vars->Vuserpw->pw_uid); |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
174 | if(setuid(vars->Vuserpw->pw_uid)) { |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
175 | log_ereport( |
60
feb2f1e115c6
improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
176 | LOG_FAILURE, |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
177 | "setuid(%d) failed", |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
178 | vars->Vuserpw->pw_uid); |
391
80ee93a7d257
add verbose logging for setuid/setgid and abort startup if setuid fails
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
388
diff
changeset
|
179 | return -1; |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
180 | } |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
181 | } else if(vars->Vuserpw) { |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
182 | log_ereport( |
60
feb2f1e115c6
improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
183 | LOG_WARN, |
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
184 | "server must be started as root to change uid"); |
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
185 | } |
66
74babc0082b7
added authentication cache
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
63
diff
changeset
|
186 | |
426
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
187 | // run Init directives |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
188 | // this must be done after setuid |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
189 | int err = apply_init_conf(init_config); |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
190 | free_init_conf(init_config); |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
191 | if(err) { |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
192 | log_ereport(LOG_FAILURE, "server init failed"); |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
193 | return 1; |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
194 | } |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
195 | |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
196 | // init caches |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
197 | auth_cache_init(); |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
198 | |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
199 | // init SAFs |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
200 | common_saf_init(); |
6a2e7a464991
run Init directives after setuid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
201 | |
388
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
202 | |
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
203 | // now that the process is running as the correct user, we can load |
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
204 | // the remaining config |
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
205 | if(cfgmgr_apply_config(&mgr)) { |
392
0aef555055ee
print error in case the log file config doesn't work
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
391
diff
changeset
|
206 | log_ereport(LOG_FAILURE, "load config stage 2 failed"); |
388
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
207 | return -1; |
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
208 | } |
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
209 | |
30d29ef5b79a
change uid before most of the config is loaded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
386
diff
changeset
|
210 | |
156
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
211 | // create tmp dir and pid file |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
212 | char *mkdir_cmd = NULL; |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
213 | asprintf(&mkdir_cmd, "mkdir -p %s", cfg->tmp.ptr); |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
214 | system(mkdir_cmd); |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
215 | free(mkdir_cmd); |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
216 | |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
217 | char *pid_file_path = NULL; |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
218 | asprintf(&pid_file_path, "%s/pid", cfg->tmp.ptr); |
427
a327cb6cc868
add check if pidfile can be opened
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
426
diff
changeset
|
219 | FILE *pidfile = fopen(pid_file_path, "w"); |
a327cb6cc868
add check if pidfile can be opened
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
426
diff
changeset
|
220 | if(!pidfile) { |
a327cb6cc868
add check if pidfile can be opened
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
426
diff
changeset
|
221 | log_ereport(LOG_FAILURE, "cannot open pid file %s: %s", pid_file_path, strerror(errno)); |
a327cb6cc868
add check if pidfile can be opened
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
426
diff
changeset
|
222 | return -1; |
a327cb6cc868
add check if pidfile can be opened
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
426
diff
changeset
|
223 | } |
156
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
224 | pid_t pid = getpid(); |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
225 | fprintf(pidfile, "%d", pid); |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
226 | fclose(pidfile); |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
227 | free(pid_file_path); |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
228 | |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
229 | // create unix domain socket for server control |
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
392
diff
changeset
|
230 | cxmutstr tmp_priv = cx_asprintf("%s/private", cfg->tmp.ptr); |
156
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
231 | // TODO: remove existing private dir |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
232 | if(mkdir(tmp_priv.ptr, S_IRWXU)) { |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
233 | if(errno == EEXIST) { |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
234 | if(chmod(tmp_priv.ptr, S_IRWXU)) { |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
235 | log_ereport( |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
236 | LOG_CATASTROPHE, |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
237 | "cannot change permissions of tmp dir %s:", |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
238 | tmp_priv.ptr, |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
239 | strerror(errno)); |
392
0aef555055ee
print error in case the log file config doesn't work
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
391
diff
changeset
|
240 | return -1; |
156
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
241 | } |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
242 | } else { |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
243 | log_ereport( |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
244 | LOG_CATASTROPHE, |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
245 | "cannot create tmp dir %s:", |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
246 | tmp_priv.ptr, |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
247 | strerror(errno)); |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
248 | return -1; |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
249 | } |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
250 | } |
556
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
251 | free(tmp_priv.ptr); |
156
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
252 | |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
253 | |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
254 | // create srvctrl unix domain socket |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
255 | // this socket is used for stop, reconfigure and other operations |
158
77f4f0079428
adds reconfig and shutdown handler to srvctrl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
156
diff
changeset
|
256 | if(srvctrl_init(cfg)) { |
156
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
257 | return -1; |
158
77f4f0079428
adds reconfig and shutdown handler to srvctrl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
156
diff
changeset
|
258 | } |
156
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
259 | |
146
a9591a91c004
fixes server user init
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
260 | //endpwent(); // TODO: close or not? |
a9591a91c004
fixes server user init
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
261 | //free(pwbuf); // TODO: ? |
a9591a91c004
fixes server user init
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
262 | |
1 | 263 | return 0; |
264 | } | |
265 | ||
266 | int webserver_run() { | |
115
51d9a15eac98
improves logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
267 | log_ereport(LOG_VERBOSE, "webserver_run"); |
1 | 268 | |
269 | // start all http listener | |
270 | if(start_all_listener() != 0) { | |
271 | fprintf(stderr, "Error: Cannot start http listener\n"); | |
272 | } | |
115
51d9a15eac98
improves logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
273 | |
51d9a15eac98
improves logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
274 | log_ereport(LOG_INFORM, "webserver started"); |
1 | 275 | |
276 | return 0; | |
277 | } | |
9
30e51941a673
Added mod_jk dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
278 | |
68
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
279 | void webserver_shutdown() { |
115
51d9a15eac98
improves logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
280 | log_ereport(LOG_INFORM, "webserver shutdown"); |
68
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
281 | |
158
77f4f0079428
adds reconfig and shutdown handler to srvctrl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
156
diff
changeset
|
282 | srvctrl_shutdown(); |
556
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
283 | } |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
284 | |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
285 | void webserver_end() { |
68
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
286 | // execute restart callbacks |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
287 | RestartCallback *re = atrestart; |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
288 | while(re) { |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
289 | re->func(re->data); |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
290 | re = re->next; |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
291 | } |
556
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
292 | |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
293 | shutdown_threadpools(); |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
294 | |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
295 | shutdown_eventhandlers_wait(); |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
296 | |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
297 | webserver_destroy(); |
68
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
298 | } |
9
30e51941a673
Added mod_jk dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
299 | |
158
77f4f0079428
adds reconfig and shutdown handler to srvctrl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
156
diff
changeset
|
300 | int webserver_reconfig() { |
440
d77b8f3e14e2
implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
438
diff
changeset
|
301 | CfgManager mgr; |
d77b8f3e14e2
implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
438
diff
changeset
|
302 | if(cfgmgr_load_config(&mgr) != 0) { |
d77b8f3e14e2
implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
438
diff
changeset
|
303 | log_ereport(LOG_FAILURE, "cannot reload server.conf"); |
d77b8f3e14e2
implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
438
diff
changeset
|
304 | return 1; |
d77b8f3e14e2
implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
438
diff
changeset
|
305 | } else { |
d77b8f3e14e2
implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
438
diff
changeset
|
306 | if(cfgmgr_apply_config(&mgr)) { |
d77b8f3e14e2
implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
438
diff
changeset
|
307 | log_ereport(LOG_FAILURE, "cannot reload config"); |
d77b8f3e14e2
implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
438
diff
changeset
|
308 | return 1; |
d77b8f3e14e2
implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
438
diff
changeset
|
309 | } |
158
77f4f0079428
adds reconfig and shutdown handler to srvctrl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
156
diff
changeset
|
310 | } |
440
d77b8f3e14e2
implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
438
diff
changeset
|
311 | |
158
77f4f0079428
adds reconfig and shutdown handler to srvctrl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
156
diff
changeset
|
312 | // start newly created listeners |
77f4f0079428
adds reconfig and shutdown handler to srvctrl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
156
diff
changeset
|
313 | start_all_listener(); |
77f4f0079428
adds reconfig and shutdown handler to srvctrl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
156
diff
changeset
|
314 | |
77f4f0079428
adds reconfig and shutdown handler to srvctrl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
156
diff
changeset
|
315 | return 0; |
156
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
316 | } |
724e107983e9
adds unix domain socket for server control ops
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
317 | |
9
30e51941a673
Added mod_jk dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
318 | void webserver_atrestart(void (*fn)(void *), void *data) { |
68
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
319 | RestartCallback *cb = malloc(sizeof(RestartCallback)); |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
320 | cb->func = fn; |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
321 | cb->data = data; |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
322 | cb->next = NULL; |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
323 | |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
324 | if(atrestart) { |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
325 | RestartCallback *elm = atrestart; |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
326 | while(elm) { |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
327 | if(!elm->next) { |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
328 | elm->next = cb; |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
329 | break; |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
330 | } |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
331 | elm = elm->next; |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
332 | } |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
333 | } else { |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
334 | atrestart = cb; |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
335 | } |
9
30e51941a673
Added mod_jk dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
336 | } |
30e51941a673
Added mod_jk dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
337 | |
556
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
338 | void webserver_destroy() { |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
339 | // free some stuff |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
340 | // this is not necessary, because the whole process will exit |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
341 | // however it will result in a nicer valgrind output with less |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
342 | // memory leaks |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
343 | pool_destroy(cfg_get_init_pool()); |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
344 | } |
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
461
diff
changeset
|
345 | |
68
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
346 | int nsapi_runtime_version() { |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
347 | return 303; |
f5102a892ed4
some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
348 | } |
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
349 | |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
350 | |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
351 | int ws_init_ssl() { |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
352 | // TODO: handle errors |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
353 | SSL_load_error_strings(); |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
354 | SSL_library_init(); |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
355 | OpenSSL_add_all_algorithms(); |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
356 | return 0; |
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
357 | } |