author | Michael Krelin <hacker@klever.net> | 2005-04-25 16:36:32 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2005-04-25 16:36:32 (UTC) |
commit | 981b219f5297ad2ccc1fc1d0e24e41ec009c35a3 (patch) (unidiff) | |
tree | 9fa81d7fe70883ad26d946c902ba06edcebd4516 /src/sitecing-plaincgi.cc | |
parent | 54e344b7e3623e807b893b7febad3adfc6c1648f (diff) | |
download | sitecing-981b219f5297ad2ccc1fc1d0e24e41ec009c35a3.zip sitecing-981b219f5297ad2ccc1fc1d0e24e41ec009c35a3.tar.gz sitecing-981b219f5297ad2ccc1fc1d0e24e41ec009c35a3.tar.bz2 |
moved a few utility functions to konforka and bumped konforka version requirement accordingly
-rw-r--r-- | src/sitecing-plaincgi.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sitecing-plaincgi.cc b/src/sitecing-plaincgi.cc index 3bd291a..2f93cc5 100644 --- a/src/sitecing-plaincgi.cc +++ b/src/sitecing-plaincgi.cc | |||
@@ -5,116 +5,116 @@ | |||
5 | #include <pwd.h> | 5 | #include <pwd.h> |
6 | #include <grp.h> | 6 | #include <grp.h> |
7 | #include <errno.h> | 7 | #include <errno.h> |
8 | #include <syslog.h> | 8 | #include <syslog.h> |
9 | #include <iostream> | 9 | #include <iostream> |
10 | #include <memory> | 10 | #include <memory> |
11 | #include <typeinfo> | 11 | #include <typeinfo> |
12 | using namespace std; | 12 | using namespace std; |
13 | #include "kingate/plaincgi.h" | 13 | #include "kingate/plaincgi.h" |
14 | #include "kingate/cgi_gateway.h" | 14 | #include "kingate/cgi_gateway.h" |
15 | using namespace kingate; | 15 | using namespace kingate; |
16 | #include "sitecing/sitecing_util.h" | 16 | #include "sitecing/sitecing_util.h" |
17 | #include "sitecing/util.h" | 17 | #include "sitecing/util.h" |
18 | #include "sitecing/sitespace.h" | 18 | #include "sitecing/sitespace.h" |
19 | #include "sitecing/sitecing_interface_cgi.h" | 19 | #include "sitecing/sitecing_interface_cgi.h" |
20 | #include "sitecing/cgi_component.h" | 20 | #include "sitecing/cgi_component.h" |
21 | #include "sitecing/configuration.h" | 21 | #include "sitecing/configuration.h" |
22 | #include "sitecing/magic.h" | 22 | #include "sitecing/magic.h" |
23 | #include "sitecing/sitecing_exception.h" | 23 | #include "sitecing/sitecing_exception.h" |
24 | #include "sitecing/exception.h" | 24 | #include "sitecing/exception.h" |
25 | using namespace sitecing; | 25 | using namespace sitecing; |
26 | 26 | ||
27 | #include "config.h" | 27 | #include "config.h" |
28 | #define PHEADER PACKAGE " Version " VERSION | 28 | #define PHEADER PACKAGE " Version " VERSION |
29 | #define PCOPY "Copyright (c) 2005 Klever Group" | 29 | #define PCOPY "Copyright (c) 2005 Klever Group" |
30 | 30 | ||
31 | class cdummyClass : public acomponent { | 31 | class cdummyClass : public acomponent { |
32 | public: | 32 | public: |
33 | void main(int _magic,va_list _args) {} | 33 | void main(int _magic,va_list _args) {} |
34 | void *__the_most_derived_this() { return NULL; } | 34 | void *__the_most_derived_this() { return NULL; } |
35 | } cdummyInstance; | 35 | } cdummyInstance; |
36 | class adummyClass : public cgi_component { | 36 | class adummyClass : public cgi_component { |
37 | public: | 37 | public: |
38 | void main(int _magic,va_list _args) {} | 38 | void main(int _magic,va_list _args) {} |
39 | void *__the_most_derived_this() { return NULL; } | 39 | void *__the_most_derived_this() { return NULL; } |
40 | } adummyInstance; | 40 | } adummyInstance; |
41 | 41 | ||
42 | void process_request(configuration& config) { | 42 | void process_request(configuration& config) { |
43 | try { | 43 | try { |
44 | sitespace ss(config); | 44 | sitespace ss(config); |
45 | sitecing_interface_cgi scif(&ss); | 45 | sitecing_interface_cgi scif(&ss); |
46 | string component_path; | 46 | string component_path; |
47 | string action; | 47 | string action; |
48 | config_options::action_handler_t *action_handler; | 48 | config_options::action_handler_t *action_handler; |
49 | plaincgi_interface ci; | 49 | plaincgi_interface ci; |
50 | cgi_gateway gw(ci); | 50 | cgi_gateway gw(ci); |
51 | scif.prepare(&gw); | 51 | scif.prepare(&gw); |
52 | try { | 52 | try { |
53 | component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash); | 53 | component_path = konforka::normalize_path(gw.path_info(),konforka::strip_leading_slash|konforka::strip_trailing_slash); |
54 | string full_component_path; | 54 | string full_component_path; |
55 | string sitecing_path_info; | 55 | string sitecing_path_info; |
56 | while(true) { | 56 | while(true) { |
57 | full_component_path = config.root_source+'/'+component_path; | 57 | full_component_path = config.root_source+'/'+component_path; |
58 | if(!access(full_component_path.c_str(),F_OK)) | 58 | if(!access(full_component_path.c_str(),F_OK)) |
59 | break; | 59 | break; |
60 | string::size_type sl = component_path.rfind('/'); | 60 | string::size_type sl = component_path.rfind('/'); |
61 | if(sl==string::npos) | 61 | if(sl==string::npos) |
62 | throw konforka::exception(CODEPOINT,"can't find the target component"); | 62 | throw konforka::exception(CODEPOINT,"can't find the target component"); |
63 | sitecing_path_info.insert(0,component_path,sl,string::npos); | 63 | sitecing_path_info.insert(0,component_path,sl,string::npos); |
64 | component_path.erase(sl); | 64 | component_path.erase(sl); |
65 | } | 65 | } |
66 | ci.metavars["SITECING_PATH_INFO"]=sitecing_path_info; | 66 | ci.metavars["SITECING_PATH_INFO"]=sitecing_path_info; |
67 | action = component_path; | 67 | action = component_path; |
68 | action_handler = config.lookup_action_handler(component_path); | 68 | action_handler = config.lookup_action_handler(component_path); |
69 | if(action_handler) { | 69 | if(action_handler) { |
70 | action = action_handler->action; | 70 | action = action_handler->action; |
71 | } | 71 | } |
72 | string pwd = dir_name(full_component_path); | 72 | string pwd = konforka::dir_name(full_component_path); |
73 | if(chdir(pwd.c_str())) | 73 | if(chdir(pwd.c_str())) |
74 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); | 74 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); |
75 | so_component soc = ss.fetch(action,&scif); | 75 | so_component soc = ss.fetch(action,&scif); |
76 | if(action_handler) { | 76 | if(action_handler) { |
77 | soc.ac->run(__magic_action, | 77 | soc.ac->run(__magic_action, |
78 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), | 78 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), |
79 | &(action_handler->args) | 79 | &(action_handler->args) |
80 | ); | 80 | ); |
81 | }else{ | 81 | }else{ |
82 | soc.ac->main(0,NULL); | 82 | soc.ac->main(0,NULL); |
83 | } | 83 | } |
84 | }catch(http_status& hs) { | 84 | }catch(http_status& hs) { |
85 | scif.headers["Status"] = hs.status+" "+hs.message; | 85 | scif.headers["Status"] = hs.status+" "+hs.message; |
86 | string hshp = config.lookup_http_status_handler(component_path,hs.status); | 86 | string hshp = config.lookup_http_status_handler(component_path,hs.status); |
87 | if(!hshp.empty()) { | 87 | if(!hshp.empty()) { |
88 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status | 88 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status |
89 | hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(), | 89 | hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(), |
90 | config.root_so.c_str(),action.c_str(),&hs); | 90 | config.root_so.c_str(),action.c_str(),&hs); |
91 | } | 91 | } |
92 | }catch(compile_error& ce) { | 92 | }catch(compile_error& ce) { |
93 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 93 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
94 | if(co_exception_handler) { | 94 | if(co_exception_handler) { |
95 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 95 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
96 | 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()); | 96 | 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()); |
97 | }else{ | 97 | }else{ |
98 | ce.see(CODEPOINT); | 98 | ce.see(CODEPOINT); |
99 | throw; | 99 | throw; |
100 | } | 100 | } |
101 | }catch(preprocessor_error& pe) { | 101 | }catch(preprocessor_error& pe) { |
102 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 102 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
103 | if(co_exception_handler) { | 103 | if(co_exception_handler) { |
104 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 104 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
105 | 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); | 105 | 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); |
106 | }else{ | 106 | }else{ |
107 | pe.see(CODEPOINT); | 107 | pe.see(CODEPOINT); |
108 | throw; | 108 | throw; |
109 | } | 109 | } |
110 | }catch(exception& e) { | 110 | }catch(exception& e) { |
111 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 111 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
112 | if(co_exception_handler) { | 112 | if(co_exception_handler) { |
113 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 113 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
114 | 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); | 114 | 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); |
115 | } | 115 | } |
116 | } | 116 | } |
117 | scif.flush(); | 117 | scif.flush(); |
118 | }catch(exception& e) { | 118 | }catch(exception& e) { |
119 | cerr << "->Oops: " << e.what() << endl; | 119 | cerr << "->Oops: " << e.what() << endl; |
120 | } | 120 | } |