summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac6
-rw-r--r--lib/component_factory.cc2
-rw-r--r--lib/file_factory.cc2
-rw-r--r--src/sitecing-fastcgi.cc3
-rw-r--r--src/sitecing-plaincgi.cc3
5 files changed, 11 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index b9e9b56..a8aa142 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,89 +1,89 @@
AC_INIT([sitecing], [0.0.1], [sitecing-bugs@klever.net])
AC_CONFIG_SRCDIR([include/sitecing/sitecing_parser.h])
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_PROG_INSTALL
AC_PROG_AWK
AC_PROG_CXX
AC_PROG_CC
AM_PROG_LEX
AC_PROG_LIBTOOL
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h unistd.h])
AC_C_CONST
AC_FUNC_MALLOC
AC_FUNC_REALLOC
AC_WITH_PKGCONFIG
-PKG_CHECK_MODULES([KINGATE],[kingate],,[
+PKG_CHECK_MODULES([KINGATE],[kingate >= 0.0.1],,[
AC_MSG_ERROR([no kingate library found, get it at http://kin.klever.net/kingate/])
])
HAVE_FCGI=false
HAVE_PLAINCGI=false
-PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi],[
+PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi >= 0.0.1],[
HAVE_FCGI=true
],[
AC_MSG_NOTICE([no fastcgi support in kingate library])
])
-PKG_CHECK_MODULES([KINGATE_PLAINCGI],[kingate-plaincgi],[
+PKG_CHECK_MODULES([KINGATE_PLAINCGI],[kingate-plaincgi >= 0.0.1],[
HAVE_PLAINCGI=true
],[
AC_MSG_NOTICE([no plaincgi support in kingate library])
])
if ! (${HAVE_FCGI} || ${HAVE_PLAINCGI}) ; then
AC_MSG_ERROR([not a single CGI interface supported in kingate])
fi
AM_CONDITIONAL([HAVE_FCGI],[${HAVE_FCGI}])
AM_CONDITIONAL([HAVE_PLAINCGI],[${HAVE_PLAINCGI}])
PKG_CHECK_MODULES([DOTCONF],[dotconf],,[
AC_MSG_ERROR([no dotconf library found])
])
AC_WITH_PCRE([
AC_WITH_PCREPP(,[
AC_MSG_ERROR([no pcre++ library found])
])
],[
AC_MSG_ERROR([no pcre library found])
])
AC_CHECK_FUNC([dlopen],,[
AC_CHECK_LIB([dl],[dlopen],,[
AC_MSG_ERROR([no dlopen library found])
])
])
AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
WANT_DOXYGEN="yes"
AC_ARG_ENABLE([doxygen],
AC_HELP_STRING([--disable-doxygen],[do not generate documentation]),
[
test "${enableval}" = "no" && WANT_DOXYGEN="no"
]
)
if test "${WANT_DOXYGEN}" = "yes" ; then
AC_WITH_DOXYGEN
AC_WITH_DOT
else
AM_CONDITIONAL([HAVE_DOXYGEN],[false])
AM_CONDITIONAL([HAVE_DOT],[false])
fi
AC_CONFIG_FILES([
Makefile
Doxyfile
sitecing.pc
include/Makefile
lib/Makefile
share/Makefile
src/Makefile
components/Makefile
])
AC_OUTPUT
diff --git a/lib/component_factory.cc b/lib/component_factory.cc
index b5e95af..d9692de 100644
--- a/lib/component_factory.cc
+++ b/lib/component_factory.cc
@@ -1,344 +1,344 @@
#ifdef USE_PCH
#include "pch.h"
#else
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/wait.h>
#include <fcntl.h>
#include <iostream>
#include <fstream>
#include <stdexcept>
#include <vector>
using namespace std;
#include "sitecing/component_factory.h"
#include "sitecing/sitecing_util.h"
#include "sitecing/sitecing_parser.h"
#include "sitecing/sitecing_exception.h"
#endif
namespace sitecing {
static const char *pp_targets[] = { ".cc", ".h", ".imports", ".classname", ".baseclassname", ".ancestors", ".pp_stamp" };
static const char *cc_targets[] = { ".o", ".d" };
component_factory::component_factory(configuration& c)
: config(c),
root_source(normalize_path(c.root_source,strip_trailing_slash)+'/'),
root_intermediate(normalize_path(c.root_intermediate,strip_trailing_slash)+'/'),
root_so(normalize_path(c.root_so,strip_trailing_slash)+'/') {
}
void component_factory::get_dependencies(const string& dst,file_list_t& deps) {
deps.clear();
string dp = normalize_path(dst,strip_trailing_slash);
// source documents
try { // XXX: or just compare it off?
string noro = strip_prefix(dp,root_source);
return;
}catch(utility_no_affix& una) { }
// .so binaries
try {
string noso = strip_suffix(dp,".so");
string noro = strip_prefix(noso,root_so);
deps.push_back(root_intermediate+noro+".o");
config_options *co_so_deps = config.lookup_config(noro,config_options::flag_so_deps);
if(co_so_deps) {
for(list<string>::const_iterator i=co_so_deps->so_deps.begin();i!=co_so_deps->so_deps.end();++i)
deps.push_back(*i);
}
return;
}catch(utility_no_prefix& unp) {
throw konforka::exception(CODEPOINT,"component is outside of component root");
}catch(utility_no_suffix& uns) { }
try {
// preprocessor targets
string noro = strip_prefix(dp,root_intermediate);
for(int ppt=0;ppt<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) {
try {
string nos = strip_suffix(noro,pp_targets[ppt]);
deps.push_back(root_source+nos); // depends on the source
ifstream imports((root_intermediate+nos+".imports").c_str(),ios::in);
if(imports.good()) {
string str;
while(!imports.eof()) {
imports >> str;
if(!str.empty())
deps.push_back(root_intermediate+str+".classname");
}
}
ifstream ancestors((root_intermediate+nos+".ancestors").c_str(),ios::in);
if(ancestors.good()) {
string str;
while(!ancestors.eof()) {
ancestors >> str;
if(!str.empty())
deps.push_back(root_intermediate+str+".classname");
}
}
// XXX: intermediate_deps should be broken down
config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps);
if(co_intermediate_deps) {
for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i)
deps.push_back(*i);
}
return;
}catch(utility_no_suffix& uns) { }
}
// compiler targets
for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) {
try {
string nos = strip_suffix(noro,cc_targets[cct]);
deps.push_back(root_intermediate+nos+".cc");
config_options *co_cpp_deps = config.lookup_config(noro,config_options::flag_cpp_deps);
if( (!co_cpp_deps) || co_cpp_deps->cpp_deps) {
- ifstream df((root_intermediate+noro+".d").c_str(),ios::in);
+ ifstream df((root_intermediate+nos+".d").c_str(),ios::in);
if(df.good()) {
string str;
while(!df.eof()) {
df >> str;
if(str.find_first_of("\\:")==string::npos)
deps.push_back(combine_path(config.root_source+nos,str));
}
}
}
// XXX: intermediate_deps should be broken down
config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps);
if(co_intermediate_deps) {
for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i)
deps.push_back(*i);
}
}catch(utility_no_suffix& uns) { }
}
}catch(utility_no_prefix& unp) { }
}
bool component_factory::is_uptodate(const string& dst,file_list_t *deps) {
string dp = normalize_path(dst,strip_trailing_slash);
try {
string noro = strip_prefix(dp,root_intermediate);
for(int ppt=0;(ppt+1)<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) {
try {
string nos = strip_suffix(noro,pp_targets[ppt]);
return file_factory::is_uptodate(root_intermediate+nos+".pp_stamp",deps);
}catch(utility_no_suffix& uns) { }
}
bool rv = file_factory::is_uptodate(dst,deps);
return rv;
}catch(utility_no_prefix& unp) { }
// XXX: or just compare it off, instead of throwing things around.
try {
strip_prefix(dp,root_so);
return file_factory::is_uptodate(dst,deps);
}catch(utility_no_prefix& unp) { }
return true;
}
void component_factory::build(const string& dst) {
string dp = normalize_path(dst,strip_trailing_slash);
// sources
try {
string noro = strip_prefix(dp,root_source);
// building the sources is left up to developer
return;
}catch(utility_no_prefix& unp) { }
// .so files
try {
string noso = strip_suffix(dp,".so");
string noro = strip_prefix(noso,root_so);
string o = root_intermediate+noro+".o";
cerr << "Linking " << noro << endl;
if(access(o.c_str(),R_OK))
throw konforka::exception(CODEPOINT,string("can't access compiled component code (")+o+")");
make_path(dir_name(root_so+noro),0755);
file_lock lock_cc(root_intermediate+noro+".o.lock");
file_lock lock_so(root_so+noro+".so.lock");
int stdO = open((root_intermediate+noro+".ld.stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
if(stdO<0)
throw konforka::exception(CODEPOINT,"failed to open/create linker stdout");
int stdE = open((root_intermediate+noro+".ld.stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
if(stdE<0) {
close(stdO);
throw konforka::exception(CODEPOINT,"failed to open/create linker stderr");
}
list<string> args;
config_options *co_ld_flags = config.lookup_config(noro,config_options::flag_ld_flags);
if(co_ld_flags) {
args.insert(args.end(),co_ld_flags->ld_flags.begin(),co_ld_flags->ld_flags.end());
}
args.push_back("-shared");
args.push_back(o);
file_list_t ancestors;
get_ancestors(noro,ancestors);
for(file_list_t::const_iterator i=ancestors.begin();i!=ancestors.end();++i) {
string aso=root_so+*i+".so";
make(aso);
args.push_back(aso);
}
args.push_back("-o"); args.push_back(dp);
// TODO: "g++" configurable
int rv = execute("g++",args,stdO,stdE);
if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) )
throw link_error(CODEPOINT,"failed to link component",noro);
return;
}catch(utility_no_prefix& unp) {
throw konforka::exception(CODEPOINT,"component is outside of component root");
}catch(utility_no_suffix& uns) { }
try {
string noro = strip_prefix(dp,root_intermediate);
// compiler targets
for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) {
try {
string nos = strip_suffix(noro,cc_targets[cct]);
string cc = root_intermediate+nos+".cc";
string o = root_intermediate+nos+".o";
cerr << "Compiling " << nos << endl;
if(access(cc.c_str(),R_OK))
throw konforka::exception(CODEPOINT,string("can't access preprocessed component code (")+cc+")");
make_path(dir_name(cc),0755);
string pwd = dir_name(root_source+nos);
auto_chdir dir_changer(pwd);
file_lock lock_source(root_intermediate+nos+".lock");
file_lock lock_cc(root_intermediate+nos+".o.lock");
int stdO = open((root_intermediate+nos+".stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
if(stdO<0)
throw konforka::exception(CODEPOINT,"failed to open/create compiler stdout");
int stdE = open((root_intermediate+nos+".stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
if(stdE<0) {
close(stdO);
throw konforka::exception(CODEPOINT,"failed to open/create compiler's stderr");
}
list<string> args;
config_options *co_cpp_flags = config.lookup_config(nos,config_options::flag_cpp_flags);
if(co_cpp_flags) {
args.insert(args.end(),co_cpp_flags->cpp_flags.begin(),co_cpp_flags->cpp_flags.end());
}
// TODO: maybe move it to separare config option like CoreCPPFLags?
args.push_back("-I"+root_intermediate);
args.push_back("-I"+root_source);
args.push_back("-MD"); args.push_back("-MF"); args.push_back(root_intermediate+nos+".d");
args.push_back("-c");
args.push_back(cc);
args.push_back("-o"); args.push_back(o);
// TODO: "g++" configurable
int rv = execute("g++",args,stdO,stdE);
if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) )
throw compile_error(CODEPOINT,"failed to compile component",nos);
return;
}catch(utility_no_suffix& uns) { }
}
// preprocessor targets
for(int ppt=0;ppt<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) {
try {
string nos = strip_suffix(noro,pp_targets[ppt]);
string src = root_source+nos;
cerr << "Preprocessing " << nos << endl;
if(access(src.c_str(),R_OK))
throw konforka::exception(CODEPOINT,string("can't access component source (")+src+")");
make_path(dir_name(root_intermediate+nos),0755);
file_lock lock(root_intermediate+nos+".lock");
sitecing_parser parser(*this);
config_options *co_skeleton = config.lookup_config(nos,config_options::flag_skeleton);
if(co_skeleton)
parser.skeleton = co_skeleton->skeleton;
static const char *id_chars = "abcdefghijklmnopqrstuvwxyz0123456789_ABCDEFGHIJKLMNOPQRSTUVWXYZ";
parser.class_name = normalize_path(nos,strip_leading_slash|strip_trailing_slash);
for(string::size_type illc = parser.class_name.find_first_not_of(id_chars);illc!=string::npos;illc=parser.class_name.find_first_not_of(id_chars,illc)) {
string::size_type lc = parser.class_name.find_first_of(id_chars,illc);
int n = ((lc==string::npos)?parser.class_name.length():lc)-illc;
parser.class_name.replace(illc,n,n,'_');
}
parser.class_name = "_SCC_"+parser.class_name;
parser.output_basename = root_intermediate+nos;
parser.component_basename = nos;
try {
parser.preprocess(src);
string sf = root_intermediate+nos+".pp_stamp";
ofstream sfs(sf.c_str(),ios::trunc|ios::out); // touch .pp_stamp
}catch(preprocessor_error& pe) {
pe.component_name = nos;
pe.see(CODEPOINT);
throw;
}
return;
}catch(utility_no_suffix& uns) { }
}
}catch(utility_no_prefix& unp) { }
cerr << "ignoring build request for " << dp << endl;
}
void component_factory::make(const string& dst) {
string dp = normalize_path(dst,strip_trailing_slash);
try {
string noso = strip_suffix(dp,".so");
string noro = strip_prefix(noso,root_so);
file_list_t a;
get_ancestors(noro,a);
for(file_list_t::const_iterator i=a.begin();i!=a.end();++i) {
make(root_so+*i+".so");
}
}catch(utility_no_affix& una) { }
file_factory::make(dst);
}
int component_factory::execute(const string& cmd, const list<string>& args,int stdo,int stde) {
// XXX: is it right that we do stdio/stderr tricks outside of the function?
// cerr << "executing: " << cmd;
vector<const char*> argv(args.size()+2);
argv[0]=cmd.c_str();
int an = 1;
for(list<string>::const_iterator i=args.begin();i!=args.end();i++) {
// cerr << " " << *i ;
argv[an++] = i->c_str();
}
// cerr << endl;
argv[an++]=NULL;
pid_t pid = vfork();
if(pid==-1) {
close(stdo); close(stde);
throw konforka::exception(CODEPOINT,"failed to vfork()");
}
if(!pid) {
// child
if(dup2(stdo,1)!=1)
_exit(-1);
if(dup2(stde,2)!=2)
_exit(-1);
close(0);
execvp(cmd.c_str(),(char**)&argv.front());
_exit(-1);
}
// parent
close(stdo); close(stde);
int rv;
if(waitpid(pid,&rv,0)<0)
throw konforka::exception(CODEPOINT,"failed to waitpid()");
return rv;
}
string component_factory::get_classname(const string& component) {
string cn = root_intermediate+normalize_path(component,strip_trailing_slash|strip_leading_slash)+".classname";
make(cn);
ifstream ifs(cn.c_str());
if(!ifs.good())
throw konforka::exception(CODEPOINT,"failed to access component .classname");
ifs >> cn;
return cn;
}
void component_factory::get_ancestors(const string& component,file_list_t& rv) {
string cn = root_intermediate+normalize_path(component,strip_trailing_slash|strip_leading_slash)+".ancestors";
make(cn);
ifstream ifs(cn.c_str());
if(!ifs.good())
throw konforka::exception(CODEPOINT,string("failed to access component '")+component+"' .ancestors");
rv.clear();
while(!ifs.eof()) {
string a;
ifs >> a;
if(!a.empty())
rv.push_back(a);
}
}
}
diff --git a/lib/file_factory.cc b/lib/file_factory.cc
index 7ca7b86..c22fac2 100644
--- a/lib/file_factory.cc
+++ b/lib/file_factory.cc
@@ -1,56 +1,56 @@
#ifdef USE_PCH
#include "pch.h"
#else
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <konforka/exception.h>
using namespace std;
#include "sitecing/file_factory.h"
#endif
namespace sitecing {
bool file_factory::is_uptodate(const string& dst,file_list_t* deps) {
file_list_t deplist;
file_list_t *fl = deps?deps:&deplist;
get_dependencies(dst,*fl);
struct stat stdst;
if(stat(dst.c_str(),&stdst))
return false;
- for(file_list_t::const_iterator i=fl->begin();i!=fl->end();i++) {
+ for(file_list_t::const_iterator i=fl->begin();i!=fl->end();++i) {
struct stat stdep;
if(stat(i->c_str(),&stdep))
return false;
if(stdst.st_mtime<stdep.st_mtime)
return false;
if(!is_uptodate(*i))
return false;
}
return true;
}
void file_factory::make(const string& dst) {
try {
depth++;
if(depth>25)
throw konforka::exception(CODEPOINT,"recursed too deeply.");
file_list_t deps;
if(!is_uptodate(dst,&deps)) {
for(file_list_t::const_iterator i=deps.begin();i!=deps.end();i++)
make(*i);
if(!is_uptodate(dst,&deps))
build(dst);
}
depth--;
}catch(konforka::exception& ke) {
depth--;
ke.see(CODEPOINT);
throw;
}catch(...) {
depth--;
throw;
}
}
}
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
@@ -1,325 +1,328 @@
#include <sys/types.h>
#include <unistd.h>
#include <signal.h>
#include <getopt.h>
#include <pwd.h>
#include <grp.h>
#include <errno.h>
#include <syslog.h>
#include <iostream>
#include <memory>
#include <typeinfo>
using namespace std;
#include "kingate/fastcgi.h"
#include "kingate/cgi_gateway.h"
using namespace kingate;
#include "sitecing/sitecing_util.h"
#include "sitecing/util.h"
#include "sitecing/sitespace.h"
#include "sitecing/sitecing_interface_cgi.h"
#include "sitecing/cgi_component.h"
#include "sitecing/configuration.h"
#include "sitecing/magic.h"
#include "sitecing/sitecing_exception.h"
#include "sitecing/exception.h"
#include "sitecing/process_manager.h"
using namespace sitecing;
#include "config.h"
#define PHEADER PACKAGE " Version " VERSION
#define PCOPY "Copyright (c) 2004 Klever Group"
class cdummyClass : public acomponent {
public:
void main(int _magic,va_list _args) {}
void *__the_most_derived_this() { return NULL; }
} cdummyInstance;
class adummyClass : public cgi_component {
public:
void main(int _magic,va_list _args) {}
void *__the_most_derived_this() { return NULL; }
} adummyInstance;
class sitecing_fastcgi_pm : public process_manager {
public:
configuration config;
fcgi_socket *fss;
semaphore sem;
bool multi;
uid_t uid;
gid_t gid;
pid_file pidfile;
sitecing_fastcgi_pm(const string& config_file);
~sitecing_fastcgi_pm();
void process(int slot);
void run();
void give_up_privs();
};
sitecing_fastcgi_pm::sitecing_fastcgi_pm(const string& config_file)
: config(config_file), multi(false) {
if(( (config.flags&configuration::flag_user) || (config.flags&configuration::flag_group) || (config.flags&configuration::flag_chroot) ) && geteuid() )
throw konforka::exception(CODEPOINT,"can't use User, Group or Chroot when started without root privileges");
if(config.flags&configuration::flag_user) {
struct passwd *ptmp = getpwnam(config.user.c_str());
if(ptmp) {
uid = ptmp->pw_uid;
}else{
errno=0;
uid = strtol(config.user.c_str(),NULL,0);
if(errno)
throw konforka::exception(CODEPOINT,"failed to resolve User value to uid");
}
}
if(config.flags&configuration::flag_group) {
struct group *gtmp = getgrnam(config.group.c_str());
if(gtmp) {
gid = gtmp->gr_gid;
}else{
errno=0;
gid = strtol(config.group.c_str(),NULL,0);
if(errno)
throw konforka::exception(CODEPOINT,"failed to resolve Group value to gid");
}
}
if(!(config.flags&configuration::flag_root_source))
throw konforka::exception(CODEPOINT,"unspecified root for sources");
if(!(config.flags&configuration::flag_root_intermediate))
throw konforka::exception(CODEPOINT,"unspecified root for intermediate files");
if(!(config.flags&configuration::flag_root_so))
throw konforka::exception(CODEPOINT,"unspecified root for shared objects");
if(config.flags&configuration::flag_min_children)
min_children = config.min_children;
if(config.flags&configuration::flag_max_children)
max_children = config.max_children;
if(config.flags&configuration::flag_min_spare_children)
min_spare_children = config.min_spare_children;
if(config.flags&configuration::flag_max_spare_children)
max_spare_children = config.max_spare_children;
if(max_children<min_spare_children)
throw konforka::exception(CODEPOINT,"inconsistent numbers of MaxChildren and MinSpareChildren");
if(min_children>max_spare_children && max_spare_children>=0)
throw konforka::exception(CODEPOINT,"inconsistent numbers of MinChildren and MaxSpareChildren");
if(config.flags&configuration::flag_multi_process) {
multi = config.multi_process;
}else{
if(config.flags&configuration::flag_listen_socket)
multi = true;
else
multi = false;
}
fss = (config.flags&configuration::flag_listen_socket)?new fcgi_socket(config.listen_socket.c_str(),5):new fcgi_socket(0);
if(!fss)
throw konforka::exception(CODEPOINT,"failed to establish listening socket");
if(config.flags&configuration::flag_daemonize && config.daemonize) {
pid_t pf = fork();
if(pf<0)
throw konforka::exception(CODEPOINT,"failed to fork()");
if(pf) {
die_humbly=true;
_exit(0);
}
}
if(config.flags&configuration::flag_pid_file) {
pidfile.set(config.pid_file);
}
if(multi)
sem.init();
}
sitecing_fastcgi_pm::~sitecing_fastcgi_pm() {
if(fss)
delete fss;
}
void sitecing_fastcgi_pm::process(int slot) {
signal(SIGINT,SIG_DFL);
signal(SIGABRT,SIG_DFL);
signal(SIGTERM,SIG_DFL);
give_up_privs();
scoreboard_slot *sslot = sboard.get_slot(slot);
try {
sitespace ss(config);
fcgi_socket& fs = *fss;
sitecing_interface_cgi scif(&ss);
string component_path;
string action;
config_options::action_handler_t *action_handler;
int rpc = 0;
if(config.flags&configuration::flag_requests_per_child)
rpc = config.requests_per_child;
for(int req=0;(rpc<=0) || (req<rpc);rpc++) {
semaphore_lock sl;
if(multi) {
sslot->state = scoreboard_slot::state_idle;
sl.sem = &sem;
sl.lock();
}
sslot->state = scoreboard_slot::state_accept;
fcgi_interface fi(fs);
sslot->state = scoreboard_slot::state_processing;
if(multi)
sl.unlock();
cgi_gateway gw(fi);
scif.prepare(&gw);
try {
component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash);
string full_component_path;
+ string sitecing_path_info;
while(true) {
full_component_path = config.root_source+'/'+component_path;
if(!access(full_component_path.c_str(),F_OK))
break;
string::size_type sl = component_path.rfind('/');
if(sl==string::npos)
throw konforka::exception(CODEPOINT,"can't find the target component");
+ sitecing_path_info.insert(0,component_path,sl,string::npos);
component_path.erase(sl);
}
+ fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info;
action = component_path;
action_handler = config.lookup_action_handler(component_path);
if(action_handler) {
action = action_handler->action;
}
string pwd = dir_name(full_component_path);
if(chdir(pwd.c_str()))
throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory");
so_component soc = ss.fetch(action,&scif);
if(action_handler) {
soc.ac->run(__magic_action,
config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(),
&(action_handler->args)
);
}else{
soc.ac->main(0,NULL);
}
}catch(http_status& hs) {
scif.headers["Status"] = hs.status+" "+hs.message;
string hshp = config.lookup_http_status_handler(component_path,hs.status);
if(!hshp.empty()) {
so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status
hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(),
config.root_so.c_str(),action.c_str(),&hs);
}
}catch(compile_error& ce) {
config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
if(co_exception_handler) {
so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
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());
}else{
ce.see(CODEPOINT);
throw;
}
}catch(preprocessor_error& pe) {
config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
if(co_exception_handler) {
so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
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);
}else{
pe.see(CODEPOINT);
throw;
}
}catch(exception& e) {
config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
if(co_exception_handler) {
so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
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);
}
}
scif.flush();
}
}catch(exception& e) {
cerr << "->Oops: " << e.what() << endl;
}
}
void sitecing_fastcgi_pm::run() {
if(multi)
manage();
else
process(0);
}
void sitecing_fastcgi_pm::give_up_privs() {
if(config.flags&configuration::flag_chroot) {
if(chroot(config.chroot.c_str()))
throw konforka::exception(CODEPOINT,"failed to chroot()");
}
if(config.flags&configuration::flag_group) {
if((getgid()!=gid) && setgid(gid))
throw konforka::exception(CODEPOINT,"failed to setgid()");
}
if(config.flags&configuration::flag_user) {
if((getuid()!=uid) && setuid(uid))
throw konforka::exception(CODEPOINT,"failed to setuid()");
}
}
static sitecing_fastcgi_pm* _process_manager = NULL;
static void lethal_signal_handler(int signum) {
_process_manager->finishing=true;
}
int main(int argc,char **argv) {
const char* id = *argv;
const char* t;
while(t = index(id,'/')) {
id=t; id++;
}
openlog(id,LOG_PERROR|LOG_PID,LOG_USER);
try {
string config_file = "sitecing.conf";
while(true) {
static struct option opts[] = {
{ "help", no_argument, 0, 'h' },
{ "usage", no_argument, 0, 'h' },
{ "version", no_argument, 0, 'V' },
{ "license", no_argument, 0, 'L' },
{ "config", required_argument, 0, 'f' },
{ NULL, 0, 0, 0 }
};
int c = getopt_long(argc,argv,"f:hVL",opts,NULL);
if(c==-1)
break;
switch(c) {
case 'h':
cerr << PHEADER << endl
<< PCOPY << endl << endl
<< " -h, --help" << endl
<< " --usage display this text" << endl
<< " -V, --version display version number" << endl
<< " -L, --license show license" << endl
<< " -f filename, --config=filename" << endl
<< " specify configuration file to use" << endl;
exit(0);
break;
case 'V':
cerr << VERSION << endl;
exit(0);
break;
case 'L':
extern const char *COPYING;
cerr << COPYING << endl;
exit(0);
break;
case 'f':
config_file = optarg;
break;
default:
cerr << "Huh??" << endl;
break;
}
}
sitecing_fastcgi_pm sfpm(config_file);
_process_manager = &sfpm;
signal(SIGINT,lethal_signal_handler);
signal(SIGABRT,lethal_signal_handler);
signal(SIGTERM,lethal_signal_handler);
sfpm.run();
}catch(exception& e) {
/* cerr << "Oops: " << e.what() << endl; */
syslog(LOG_ERR,"uncaught exception: %s",e.what());
}
closelog();
}
diff --git a/src/sitecing-plaincgi.cc b/src/sitecing-plaincgi.cc
index 6e8a215..3bd291a 100644
--- a/src/sitecing-plaincgi.cc
+++ b/src/sitecing-plaincgi.cc
@@ -1,178 +1,181 @@
#include <sys/types.h>
#include <unistd.h>
#include <signal.h>
#include <getopt.h>
#include <pwd.h>
#include <grp.h>
#include <errno.h>
#include <syslog.h>
#include <iostream>
#include <memory>
#include <typeinfo>
using namespace std;
#include "kingate/plaincgi.h"
#include "kingate/cgi_gateway.h"
using namespace kingate;
#include "sitecing/sitecing_util.h"
#include "sitecing/util.h"
#include "sitecing/sitespace.h"
#include "sitecing/sitecing_interface_cgi.h"
#include "sitecing/cgi_component.h"
#include "sitecing/configuration.h"
#include "sitecing/magic.h"
#include "sitecing/sitecing_exception.h"
#include "sitecing/exception.h"
using namespace sitecing;
#include "config.h"
#define PHEADER PACKAGE " Version " VERSION
#define PCOPY "Copyright (c) 2005 Klever Group"
class cdummyClass : public acomponent {
public:
void main(int _magic,va_list _args) {}
void *__the_most_derived_this() { return NULL; }
} cdummyInstance;
class adummyClass : public cgi_component {
public:
void main(int _magic,va_list _args) {}
void *__the_most_derived_this() { return NULL; }
} adummyInstance;
void process_request(configuration& config) {
try {
sitespace ss(config);
sitecing_interface_cgi scif(&ss);
string component_path;
string action;
config_options::action_handler_t *action_handler;
plaincgi_interface ci;
cgi_gateway gw(ci);
scif.prepare(&gw);
try {
component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash);
string full_component_path;
+ string sitecing_path_info;
while(true) {
full_component_path = config.root_source+'/'+component_path;
if(!access(full_component_path.c_str(),F_OK))
break;
string::size_type sl = component_path.rfind('/');
if(sl==string::npos)
throw konforka::exception(CODEPOINT,"can't find the target component");
+ sitecing_path_info.insert(0,component_path,sl,string::npos);
component_path.erase(sl);
}
+ ci.metavars["SITECING_PATH_INFO"]=sitecing_path_info;
action = component_path;
action_handler = config.lookup_action_handler(component_path);
if(action_handler) {
action = action_handler->action;
}
string pwd = dir_name(full_component_path);
if(chdir(pwd.c_str()))
throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory");
so_component soc = ss.fetch(action,&scif);
if(action_handler) {
soc.ac->run(__magic_action,
config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(),
&(action_handler->args)
);
}else{
soc.ac->main(0,NULL);
}
}catch(http_status& hs) {
scif.headers["Status"] = hs.status+" "+hs.message;
string hshp = config.lookup_http_status_handler(component_path,hs.status);
if(!hshp.empty()) {
so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status
hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(),
config.root_so.c_str(),action.c_str(),&hs);
}
}catch(compile_error& ce) {
config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
if(co_exception_handler) {
so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
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());
}else{
ce.see(CODEPOINT);
throw;
}
}catch(preprocessor_error& pe) {
config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
if(co_exception_handler) {
so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
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);
}else{
pe.see(CODEPOINT);
throw;
}
}catch(exception& e) {
config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
if(co_exception_handler) {
so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
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);
}
}
scif.flush();
}catch(exception& e) {
cerr << "->Oops: " << e.what() << endl;
}
}
int main(int argc,char **argv) {
const char* id = *argv;
const char* t;
while(t = index(id,'/')) {
id=t; id++;
}
openlog(id,LOG_PERROR|LOG_PID,LOG_USER);
try {
const char *esccf = getenv("SITECING_CONF");
string config_file = esccf ? esccf : "sitecing.conf";
while(true) {
static struct option opts[] = {
{ "help", no_argument, 0, 'h' },
{ "usage", no_argument, 0, 'h' },
{ "version", no_argument, 0, 'V' },
{ "license", no_argument, 0, 'L' },
{ "config", required_argument, 0, 'f' },
{ NULL, 0, 0, 0 }
};
int c = getopt_long(argc,argv,"f:hVL",opts,NULL);
if(c==-1)
break;
switch(c) {
case 'h':
cerr << PHEADER << endl
<< PCOPY << endl << endl
<< " -h, --help" << endl
<< " --usage display this text" << endl
<< " -V, --version display version number" << endl
<< " -L, --license show license" << endl
<< " -f filename, --config=filename" << endl
<< " specify configuration file to use" << endl;
exit(0);
break;
case 'V':
cerr << VERSION << endl;
exit(0);
break;
case 'L':
extern const char *COPYING;
cerr << COPYING << endl;
exit(0);
break;
case 'f':
config_file = optarg;
break;
default:
cerr << "Huh??" << endl;
break;
}
}
configuration config(config_file);
process_request(config);
}catch(exception& e) {
/* cerr << "Oops: " << e.what() << endl; */
syslog(LOG_ERR,"uncaught exception: %s",e.what());
}
closelog();
}