author | Michael Krelin <hacker@klever.net> | 2005-04-24 19:37:17 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2005-04-24 19:37:17 (UTC) |
commit | 54e344b7e3623e807b893b7febad3adfc6c1648f (patch) (unidiff) | |
tree | ded792083882fbe452992b6808487baec269526a /src/sitecing-fastcgi.cc | |
parent | 83cf01018c67e7eb5e1cca7d698bac731f8e1e9d (diff) | |
download | sitecing-54e344b7e3623e807b893b7febad3adfc6c1648f.zip sitecing-54e344b7e3623e807b893b7febad3adfc6c1648f.tar.gz sitecing-54e344b7e3623e807b893b7febad3adfc6c1648f.tar.bz2 |
1. setting up of SITECING_PATH_INFO environment variable
2. bumped up kingate version requirement
3. fixed a bug in component build process
-rw-r--r-- | src/sitecing-fastcgi.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sitecing-fastcgi.cc b/src/sitecing-fastcgi.cc index 9c0d7d1..756dcee 100644 --- a/src/sitecing-fastcgi.cc +++ b/src/sitecing-fastcgi.cc | |||
@@ -74,201 +74,204 @@ sitecing_fastcgi_pm::sitecing_fastcgi_pm(const string& config_file) | |||
74 | throw konforka::exception(CODEPOINT,"failed to resolve User value to uid"); | 74 | throw konforka::exception(CODEPOINT,"failed to resolve User value to uid"); |
75 | } | 75 | } |
76 | } | 76 | } |
77 | if(config.flags&configuration::flag_group) { | 77 | if(config.flags&configuration::flag_group) { |
78 | struct group *gtmp = getgrnam(config.group.c_str()); | 78 | struct group *gtmp = getgrnam(config.group.c_str()); |
79 | if(gtmp) { | 79 | if(gtmp) { |
80 | gid = gtmp->gr_gid; | 80 | gid = gtmp->gr_gid; |
81 | }else{ | 81 | }else{ |
82 | errno=0; | 82 | errno=0; |
83 | gid = strtol(config.group.c_str(),NULL,0); | 83 | gid = strtol(config.group.c_str(),NULL,0); |
84 | if(errno) | 84 | if(errno) |
85 | throw konforka::exception(CODEPOINT,"failed to resolve Group value to gid"); | 85 | throw konforka::exception(CODEPOINT,"failed to resolve Group value to gid"); |
86 | } | 86 | } |
87 | } | 87 | } |
88 | if(!(config.flags&configuration::flag_root_source)) | 88 | if(!(config.flags&configuration::flag_root_source)) |
89 | throw konforka::exception(CODEPOINT,"unspecified root for sources"); | 89 | throw konforka::exception(CODEPOINT,"unspecified root for sources"); |
90 | if(!(config.flags&configuration::flag_root_intermediate)) | 90 | if(!(config.flags&configuration::flag_root_intermediate)) |
91 | throw konforka::exception(CODEPOINT,"unspecified root for intermediate files"); | 91 | throw konforka::exception(CODEPOINT,"unspecified root for intermediate files"); |
92 | if(!(config.flags&configuration::flag_root_so)) | 92 | if(!(config.flags&configuration::flag_root_so)) |
93 | throw konforka::exception(CODEPOINT,"unspecified root for shared objects"); | 93 | throw konforka::exception(CODEPOINT,"unspecified root for shared objects"); |
94 | if(config.flags&configuration::flag_min_children) | 94 | if(config.flags&configuration::flag_min_children) |
95 | min_children = config.min_children; | 95 | min_children = config.min_children; |
96 | if(config.flags&configuration::flag_max_children) | 96 | if(config.flags&configuration::flag_max_children) |
97 | max_children = config.max_children; | 97 | max_children = config.max_children; |
98 | if(config.flags&configuration::flag_min_spare_children) | 98 | if(config.flags&configuration::flag_min_spare_children) |
99 | min_spare_children = config.min_spare_children; | 99 | min_spare_children = config.min_spare_children; |
100 | if(config.flags&configuration::flag_max_spare_children) | 100 | if(config.flags&configuration::flag_max_spare_children) |
101 | max_spare_children = config.max_spare_children; | 101 | max_spare_children = config.max_spare_children; |
102 | if(max_children<min_spare_children) | 102 | if(max_children<min_spare_children) |
103 | throw konforka::exception(CODEPOINT,"inconsistent numbers of MaxChildren and MinSpareChildren"); | 103 | throw konforka::exception(CODEPOINT,"inconsistent numbers of MaxChildren and MinSpareChildren"); |
104 | if(min_children>max_spare_children && max_spare_children>=0) | 104 | if(min_children>max_spare_children && max_spare_children>=0) |
105 | throw konforka::exception(CODEPOINT,"inconsistent numbers of MinChildren and MaxSpareChildren"); | 105 | throw konforka::exception(CODEPOINT,"inconsistent numbers of MinChildren and MaxSpareChildren"); |
106 | if(config.flags&configuration::flag_multi_process) { | 106 | if(config.flags&configuration::flag_multi_process) { |
107 | multi = config.multi_process; | 107 | multi = config.multi_process; |
108 | }else{ | 108 | }else{ |
109 | if(config.flags&configuration::flag_listen_socket) | 109 | if(config.flags&configuration::flag_listen_socket) |
110 | multi = true; | 110 | multi = true; |
111 | else | 111 | else |
112 | multi = false; | 112 | multi = false; |
113 | } | 113 | } |
114 | fss = (config.flags&configuration::flag_listen_socket)?new fcgi_socket(config.listen_socket.c_str(),5):new fcgi_socket(0); | 114 | fss = (config.flags&configuration::flag_listen_socket)?new fcgi_socket(config.listen_socket.c_str(),5):new fcgi_socket(0); |
115 | if(!fss) | 115 | if(!fss) |
116 | throw konforka::exception(CODEPOINT,"failed to establish listening socket"); | 116 | throw konforka::exception(CODEPOINT,"failed to establish listening socket"); |
117 | if(config.flags&configuration::flag_daemonize && config.daemonize) { | 117 | if(config.flags&configuration::flag_daemonize && config.daemonize) { |
118 | pid_t pf = fork(); | 118 | pid_t pf = fork(); |
119 | if(pf<0) | 119 | if(pf<0) |
120 | throw konforka::exception(CODEPOINT,"failed to fork()"); | 120 | throw konforka::exception(CODEPOINT,"failed to fork()"); |
121 | if(pf) { | 121 | if(pf) { |
122 | die_humbly=true; | 122 | die_humbly=true; |
123 | _exit(0); | 123 | _exit(0); |
124 | } | 124 | } |
125 | } | 125 | } |
126 | if(config.flags&configuration::flag_pid_file) { | 126 | if(config.flags&configuration::flag_pid_file) { |
127 | pidfile.set(config.pid_file); | 127 | pidfile.set(config.pid_file); |
128 | } | 128 | } |
129 | if(multi) | 129 | if(multi) |
130 | sem.init(); | 130 | sem.init(); |
131 | } | 131 | } |
132 | sitecing_fastcgi_pm::~sitecing_fastcgi_pm() { | 132 | sitecing_fastcgi_pm::~sitecing_fastcgi_pm() { |
133 | if(fss) | 133 | if(fss) |
134 | delete fss; | 134 | delete fss; |
135 | } | 135 | } |
136 | 136 | ||
137 | void sitecing_fastcgi_pm::process(int slot) { | 137 | void sitecing_fastcgi_pm::process(int slot) { |
138 | signal(SIGINT,SIG_DFL); | 138 | signal(SIGINT,SIG_DFL); |
139 | signal(SIGABRT,SIG_DFL); | 139 | signal(SIGABRT,SIG_DFL); |
140 | signal(SIGTERM,SIG_DFL); | 140 | signal(SIGTERM,SIG_DFL); |
141 | give_up_privs(); | 141 | give_up_privs(); |
142 | scoreboard_slot *sslot = sboard.get_slot(slot); | 142 | scoreboard_slot *sslot = sboard.get_slot(slot); |
143 | try { | 143 | try { |
144 | sitespace ss(config); | 144 | sitespace ss(config); |
145 | fcgi_socket& fs = *fss; | 145 | fcgi_socket& fs = *fss; |
146 | sitecing_interface_cgi scif(&ss); | 146 | sitecing_interface_cgi scif(&ss); |
147 | string component_path; | 147 | string component_path; |
148 | string action; | 148 | string action; |
149 | config_options::action_handler_t *action_handler; | 149 | config_options::action_handler_t *action_handler; |
150 | int rpc = 0; | 150 | int rpc = 0; |
151 | if(config.flags&configuration::flag_requests_per_child) | 151 | if(config.flags&configuration::flag_requests_per_child) |
152 | rpc = config.requests_per_child; | 152 | rpc = config.requests_per_child; |
153 | for(int req=0;(rpc<=0) || (req<rpc);rpc++) { | 153 | for(int req=0;(rpc<=0) || (req<rpc);rpc++) { |
154 | semaphore_lock sl; | 154 | semaphore_lock sl; |
155 | if(multi) { | 155 | if(multi) { |
156 | sslot->state = scoreboard_slot::state_idle; | 156 | sslot->state = scoreboard_slot::state_idle; |
157 | sl.sem = &sem; | 157 | sl.sem = &sem; |
158 | sl.lock(); | 158 | sl.lock(); |
159 | } | 159 | } |
160 | sslot->state = scoreboard_slot::state_accept; | 160 | sslot->state = scoreboard_slot::state_accept; |
161 | fcgi_interface fi(fs); | 161 | fcgi_interface fi(fs); |
162 | sslot->state = scoreboard_slot::state_processing; | 162 | sslot->state = scoreboard_slot::state_processing; |
163 | if(multi) | 163 | if(multi) |
164 | sl.unlock(); | 164 | sl.unlock(); |
165 | cgi_gateway gw(fi); | 165 | cgi_gateway gw(fi); |
166 | scif.prepare(&gw); | 166 | scif.prepare(&gw); |
167 | try { | 167 | try { |
168 | component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash); | 168 | component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash); |
169 | string full_component_path; | 169 | string full_component_path; |
170 | string sitecing_path_info; | ||
170 | while(true) { | 171 | while(true) { |
171 | full_component_path = config.root_source+'/'+component_path; | 172 | full_component_path = config.root_source+'/'+component_path; |
172 | if(!access(full_component_path.c_str(),F_OK)) | 173 | if(!access(full_component_path.c_str(),F_OK)) |
173 | break; | 174 | break; |
174 | string::size_type sl = component_path.rfind('/'); | 175 | string::size_type sl = component_path.rfind('/'); |
175 | if(sl==string::npos) | 176 | if(sl==string::npos) |
176 | throw konforka::exception(CODEPOINT,"can't find the target component"); | 177 | throw konforka::exception(CODEPOINT,"can't find the target component"); |
178 | sitecing_path_info.insert(0,component_path,sl,string::npos); | ||
177 | component_path.erase(sl); | 179 | component_path.erase(sl); |
178 | } | 180 | } |
181 | fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info; | ||
179 | action = component_path; | 182 | action = component_path; |
180 | action_handler = config.lookup_action_handler(component_path); | 183 | action_handler = config.lookup_action_handler(component_path); |
181 | if(action_handler) { | 184 | if(action_handler) { |
182 | action = action_handler->action; | 185 | action = action_handler->action; |
183 | } | 186 | } |
184 | string pwd = dir_name(full_component_path); | 187 | string pwd = dir_name(full_component_path); |
185 | if(chdir(pwd.c_str())) | 188 | if(chdir(pwd.c_str())) |
186 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); | 189 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); |
187 | so_component soc = ss.fetch(action,&scif); | 190 | so_component soc = ss.fetch(action,&scif); |
188 | if(action_handler) { | 191 | if(action_handler) { |
189 | soc.ac->run(__magic_action, | 192 | soc.ac->run(__magic_action, |
190 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), | 193 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), |
191 | &(action_handler->args) | 194 | &(action_handler->args) |
192 | ); | 195 | ); |
193 | }else{ | 196 | }else{ |
194 | soc.ac->main(0,NULL); | 197 | soc.ac->main(0,NULL); |
195 | } | 198 | } |
196 | }catch(http_status& hs) { | 199 | }catch(http_status& hs) { |
197 | scif.headers["Status"] = hs.status+" "+hs.message; | 200 | scif.headers["Status"] = hs.status+" "+hs.message; |
198 | string hshp = config.lookup_http_status_handler(component_path,hs.status); | 201 | string hshp = config.lookup_http_status_handler(component_path,hs.status); |
199 | if(!hshp.empty()) { | 202 | if(!hshp.empty()) { |
200 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status | 203 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status |
201 | hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(), | 204 | hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(), |
202 | config.root_so.c_str(),action.c_str(),&hs); | 205 | config.root_so.c_str(),action.c_str(),&hs); |
203 | } | 206 | } |
204 | }catch(compile_error& ce) { | 207 | }catch(compile_error& ce) { |
205 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 208 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
206 | if(co_exception_handler) { | 209 | if(co_exception_handler) { |
207 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 210 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
208 | eh.ac->run(__magic_compile_error,ce.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),ce.component_path.c_str()); | 211 | eh.ac->run(__magic_compile_error,ce.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),ce.component_path.c_str()); |
209 | }else{ | 212 | }else{ |
210 | ce.see(CODEPOINT); | 213 | ce.see(CODEPOINT); |
211 | throw; | 214 | throw; |
212 | } | 215 | } |
213 | }catch(preprocessor_error& pe) { | 216 | }catch(preprocessor_error& pe) { |
214 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 217 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
215 | if(co_exception_handler) { | 218 | if(co_exception_handler) { |
216 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 219 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
217 | eh.ac->run(__magic_preprocess_error,pe.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),pe.component_name.c_str(),pe.line_number); | 220 | eh.ac->run(__magic_preprocess_error,pe.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),pe.component_name.c_str(),pe.line_number); |
218 | }else{ | 221 | }else{ |
219 | pe.see(CODEPOINT); | 222 | pe.see(CODEPOINT); |
220 | throw; | 223 | throw; |
221 | } | 224 | } |
222 | }catch(exception& e) { | 225 | }catch(exception& e) { |
223 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 226 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
224 | if(co_exception_handler) { | 227 | if(co_exception_handler) { |
225 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 228 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
226 | eh.ac->run(__magic_generic_exception,e.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),component_path.c_str(),&e); | 229 | eh.ac->run(__magic_generic_exception,e.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),component_path.c_str(),&e); |
227 | } | 230 | } |
228 | } | 231 | } |
229 | scif.flush(); | 232 | scif.flush(); |
230 | } | 233 | } |
231 | }catch(exception& e) { | 234 | }catch(exception& e) { |
232 | cerr << "->Oops: " << e.what() << endl; | 235 | cerr << "->Oops: " << e.what() << endl; |
233 | } | 236 | } |
234 | } | 237 | } |
235 | 238 | ||
236 | void sitecing_fastcgi_pm::run() { | 239 | void sitecing_fastcgi_pm::run() { |
237 | if(multi) | 240 | if(multi) |
238 | manage(); | 241 | manage(); |
239 | else | 242 | else |
240 | process(0); | 243 | process(0); |
241 | } | 244 | } |
242 | 245 | ||
243 | void sitecing_fastcgi_pm::give_up_privs() { | 246 | void sitecing_fastcgi_pm::give_up_privs() { |
244 | if(config.flags&configuration::flag_chroot) { | 247 | if(config.flags&configuration::flag_chroot) { |
245 | if(chroot(config.chroot.c_str())) | 248 | if(chroot(config.chroot.c_str())) |
246 | throw konforka::exception(CODEPOINT,"failed to chroot()"); | 249 | throw konforka::exception(CODEPOINT,"failed to chroot()"); |
247 | } | 250 | } |
248 | if(config.flags&configuration::flag_group) { | 251 | if(config.flags&configuration::flag_group) { |
249 | if((getgid()!=gid) && setgid(gid)) | 252 | if((getgid()!=gid) && setgid(gid)) |
250 | throw konforka::exception(CODEPOINT,"failed to setgid()"); | 253 | throw konforka::exception(CODEPOINT,"failed to setgid()"); |
251 | } | 254 | } |
252 | if(config.flags&configuration::flag_user) { | 255 | if(config.flags&configuration::flag_user) { |
253 | if((getuid()!=uid) && setuid(uid)) | 256 | if((getuid()!=uid) && setuid(uid)) |
254 | throw konforka::exception(CODEPOINT,"failed to setuid()"); | 257 | throw konforka::exception(CODEPOINT,"failed to setuid()"); |
255 | } | 258 | } |
256 | } | 259 | } |
257 | 260 | ||
258 | static sitecing_fastcgi_pm* _process_manager = NULL; | 261 | static sitecing_fastcgi_pm* _process_manager = NULL; |
259 | 262 | ||
260 | static void lethal_signal_handler(int signum) { | 263 | static void lethal_signal_handler(int signum) { |
261 | _process_manager->finishing=true; | 264 | _process_manager->finishing=true; |
262 | } | 265 | } |
263 | 266 | ||
264 | int main(int argc,char **argv) { | 267 | int main(int argc,char **argv) { |
265 | const char* id = *argv; | 268 | const char* id = *argv; |
266 | const char* t; | 269 | const char* t; |
267 | while(t = index(id,'/')) { | 270 | while(t = index(id,'/')) { |
268 | id=t; id++; | 271 | id=t; id++; |
269 | } | 272 | } |
270 | openlog(id,LOG_PERROR|LOG_PID,LOG_USER); | 273 | openlog(id,LOG_PERROR|LOG_PID,LOG_USER); |
271 | try { | 274 | try { |
272 | string config_file = "sitecing.conf"; | 275 | string config_file = "sitecing.conf"; |
273 | while(true) { | 276 | while(true) { |
274 | static struct option opts[] = { | 277 | static struct option opts[] = { |