--- parser3/src/main/pa_exec.C 2003/03/04 16:15:57 1.48.2.15 +++ parser3/src/main/pa_exec.C 2003/04/07 07:03:05 1.50 @@ -1,13 +1,15 @@ /** @file Parser: program executing for different OS-es. - Copyright(c) 2000,2001-2003 ArtLebedev Group(http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) + portions by Victor Fedoseev" [January 23, 2003] + @todo setrlimit */ -static const char* IDENT_EXEC_C="$Date: 2003/03/04 16:15:57 $"; +static const char* IDENT_EXEC_C="$Date: 2003/04/07 07:03:05 $"; #include "pa_config_includes.h" @@ -27,7 +29,7 @@ static const char* IDENT_EXEC_C="$Date: /// this func from http://www.ccas.ru/~posp/popov/spawn.htm static DWORD CreateHiddenConsoleProcess(LPCTSTR szCmdLine, - char *szEnv, + char *szEnv, PROCESS_INFORMATION* ppi, LPHANDLE phInWrite, LPHANDLE phOutRead, @@ -111,60 +113,47 @@ error: return result; } -static StringPtr read_pipe(Pool& pool, HANDLE hOutRead, const char* file_spec, - String::Untaint_lang lang){ - StringPtr result(new String); - while(true) { - char *buf=new(pool) char[MAX_STRING]; - unsigned long size; - if(!ReadFile(hOutRead, buf, MAX_STRING, &size, NULL) || !size) - break; - result->APPEND(buf, size, lang, file_spec, 0); - } - return result; -} - -static CharPtr buildCommand(CharPtr file_spec_cstr, const ArrayString& argv) { - CharPtr result=file_spec_cstr; +static const char *buildCommand(Pool& pool, + const String& origin_string, + const char *file_spec_cstr, const Array *argv) { + const char *result=file_spec_cstr; if(FILE *f=fopen(file_spec_cstr, "r")) { - try { char buf[MAX_STRING]; size_t size=fread(buf, 1, MAX_STRING-1, f); if(size>2) { buf[size]=0; if(strncmp(buf, "#!", 2)==0) { - const char* begin=buf+2; + const char *begin=buf+2; if(*begin==' ') // alx: were an old magic for some linux-es begin++; if(char *end=strchr(begin, '\n')) { - String string(begin, end-begin); + String string(pool); + string.APPEND_AS_IS(begin, end-begin, + origin_string.origin().file, 0); string << " " << file_spec_cstr; result=string.cstr(); } } } - } catch(...) { - fclose(f); - rethrow; - } fclose(f); } - { // appending argv - String string(result); - for(int i=0; isize(); i++) { + buf << " "; + buf << *argv->get_string(i); } - result=string.cstr(); + result=buf.cstr(); } return result; } -#else +#else // WIN32 -static pid_t execve_piped(const char* file_spec_cstr, +static pid_t execve_piped(const char *file_spec_cstr, char * const argv[], char * const env[], int *pipe_in, int *pipe_out, int *pipe_err) { pid_t pid; @@ -279,89 +268,140 @@ static int get_exit_status(int pid) { WEXITSTATUS(status) : -2; } -static StringPtr read_pipe(Pool& pool, int file, const char* file_spec, String::Untaint_lang lang){ - StringPtr result(new String); +#endif // WIN32 + +static void read_pipe(String& result, +#ifdef WIN32 + HANDLE hOutRead, +#else // WIN32 + int file, +#endif // WIN32 + const char *file_spec, + String::Untaint_lang lang, + int *header_pos=0, const char **eol_marker=0, size_t *eol_marker_size=0){ + + if(header_pos) *header_pos = -1; + if(eol_marker) *eol_marker = ""; + if(eol_marker_size) *eol_marker_size = 0; + + int dos_seq_match = 0; + int unix_seq_match = 0; + int blk_pos = 0; + bool do_search = (header_pos || eol_marker || eol_marker_size); + while(true) { - char *buf=new(pool) char[MAX_STRING]; - ssize_t size=read(file, buf, MAX_STRING); + char *buf=(char *)result.pool().malloc(MAX_STRING); +#ifdef WIN32 + unsigned long size, i; + if(!ReadFile(hOutRead, buf, MAX_STRING, &size, NULL) || !size) + break; +#else // WIN32 + ssize_t i, size=read(file, buf, MAX_STRING); if(size<=0) break; - result->APPEND(buf, size, lang, file_spec, 0); +#endif // WIN32 + if(do_search){ + for(i=0; istring << key << "=" << value; - info->string->APPEND_AS_IS("", 1, 0, 0); // zero byte + String& string=*static_cast(info); + + string << key << "=" << *static_cast(value); + string.APPEND_AS_IS("", 1, 0, 0); // zero byte #else - String string; - string << key << "=" << value; + String string(key.pool()); + string << key << "=" << *static_cast(value); - *(info->env_ref++)=string.cstr(*info->pool, String::UL_UNSPECIFIED); + char ***env_ref=static_cast(info); + **env_ref=string.cstr(String::UL_UNSPECIFIED); (*env_ref)++; #endif } -/// @todonow unix part to smart_ptr -PA_exec_result pa_exec(Pool& pool, - bool forced_allow, - StringPtr file_spec, - const HashStringString& env, - const ArrayString& argv, - String& in) { - PA_exec_result result; +int pa_exec( + bool forced_allow, + const String& file_spec, + const Hash *env, + const Array *argv, + const String& in, String& out, String& err, + int *header_pos, const char **eol_marker, size_t *eol_marker_size) { + Pool& pool=file_spec.pool(); #ifdef NO_PA_EXECS if(!forced_allow) throw Exception("parser.runtime", - file_spec, + &file_spec, "parser execs are disabled [recompile parser without --disable-execs configure option]"); #endif - char* file_spec_cstr=file_spec->cstr(pool, String::UL_FILE_SPEC); #ifdef WIN32 PROCESS_INFORMATION pi; HANDLE hInWrite, hOutRead, hErrRead; - CharPtr cmd=buildCommand(file_spec->cstr(String::UL_FILE_SPEC), argv); - CharPtr env_cstr; - { // env - String string; - Append_env_pair_info info={&string}; - env.for_each(append_env_pair, &info); - env_cstr=info.string->cstr(String::UL_UNSPECIFIED); + char *file_spec_cstr=file_spec.cstr(String::UL_FILE_SPEC); + const char *cmd=buildCommand(file_spec.pool(), file_spec, file_spec_cstr, argv); + char *env_cstr=0; + if(env) { + String string(env->pool()); + env->for_each(append_env_pair, &string); + env_cstr=string.cstr(String::UL_UNSPECIFIED); } if(DWORD error=CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) { char szErrorDesc[MAX_STRING]; - const char *param="the file you tried to run"; + char *param="the file you tried to run"; size_t error_size=FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_ARGUMENT_ARRAY , NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), - szErrorDesc, sizeof(szErrorDesc), (va_list *)¶m); + szErrorDesc, sizeof(szErrorDesc), ¶m); if(error_size>3) // ".\r\n" szErrorDesc[error_size-3]=0; throw Exception(0, - file_spec, + &file_spec, "exec failed - %s (%ld). Consider adding shbang line (#!x:\\interpreter\\command line)", error_size?szErrorDesc:"", (long)error); } else { - CharPtr in_cstr=in.cstr(); + const char *in_cstr=in.cstr(); DWORD written_size; WriteFile(hInWrite, in_cstr, in.size(), &written_size, NULL); // EOF for stupid text reads @@ -369,9 +409,9 @@ PA_exec_result pa_exec(Pool& pool, // without this char WriteFile(hInWrite, "\x1A", 1, &written_size, NULL); CloseHandle(hInWrite); - result.out=read_pipe(pool, hOutRead, file_spec_cstr, String::UL_AS_IS); + read_pipe(out, hOutRead, file_spec_cstr, String::UL_AS_IS, header_pos, eol_marker, eol_marker_size); CloseHandle(hOutRead); - result.err=read_pipe(pool, hErrRead, file_spec_cstr, String::UL_TAINTED); + read_pipe(err, hErrRead, file_spec_cstr, String::UL_TAINTED); CloseHandle(hErrRead); /* from http://www.apache.org/websrc/cvsweb.cgi/apache-1.3/src/main/util_script.c?rev=1.151&content-type=text/vnd.viewcvs-markup @@ -386,41 +426,40 @@ from http://www.apache.org/websrc/cvsweb #else int pipe_write, pipe_read, pipe_err; + char *file_spec_cstr=file_spec.cstr(String::UL_FILE_SPEC); #ifdef PA_SAFE_MODE if(!forced_allow) { struct stat finfo; if(stat(file_spec_cstr, &finfo)!=0) throw Exception("file.missing", - file_spec, + &file_spec, "stat failed: %s (%d), actual filename '%s'", strerror(errno), errno, file_spec_cstr); - if(finfo.st_uid/*foreign?*/!=geteuid() - && finfo.st_gid/*foreign?*/!=getegid()) - throw Exception("parser.runtime", - file_spec, - "parser is in safe mode: executing files of foreign group and user disabled [recompile parser with --disable-safe-mode configure option], actual filename '%s'", - file_spec_cstr); + check_safe_mode(finfo, file_spec, file_spec_cstr); } #endif - char * argv_cstrs[1+10+1]={file_spec_cstr, 0}; - const int argv_size=argv.count(); - const int argv_max=sizeof(argv_cstrs)/sizeof(argv_cstrs[0])-1-1; - if(argv_size>argv_max) - throw Exception("parser.runtime", - file_spec, - "too many arguments (%d > max %d)", argv_size, argv_max); - for(int i=0; icstr(pool); - argv_cstrs[1+argv_size]=0; - - char **env_cstrs=new(pool) char *[env.count()+1/*0*/]; - { - Append_env_pair_info info={&pool, env_cstrs}; - env.for_each(append_env_pair, &info); - *info.env_ref=0; + char *argv_cstrs[1+10+1]={file_spec_cstr, 0}; + if(argv) { + const int argv_size=argv->size(); + const int argv_max=sizeof(argv_cstrs)/sizeof(argv_cstrs[0])-1-1; + if(argv_size>argv_max) + throw Exception("parser.runtime", + &file_spec, + "too many arguments (%d > max %d)", argv_size, argv_max); + for(int i=0; iget_string(i)->cstr(); + argv_cstrs[1+argv_size]=0; + } + char **env_cstrs=0; + if(env) { + env_cstrs= + (char **)env->pool().malloc(sizeof(char *)*(env->size()+1/*0*/)); + char **env_ref=env_cstrs; + env->for_each(append_env_pair, &env_ref); + *env_ref=0; } pid_t pid=execve_piped( @@ -429,22 +468,21 @@ from http://www.apache.org/websrc/cvsweb &pipe_write, &pipe_read, &pipe_err); if(pid>0) { // in child - if(in && in.size()) {// there is some in data - CharPtr in_cstr=in.cstr(); + const char *in_cstr=in.cstr(); + if(*in_cstr) // there is some in data write(pipe_write, in_cstr, in.size()); - } close(pipe_write); - result.out=read_pipe(pool, pipe_read, file_spec_cstr, String::UL_AS_IS); + read_pipe(out, pipe_read, file_spec_cstr, String::UL_AS_IS, header_pos, eol_marker, eol_marker_size); close(pipe_read); - result.err=read_pipe(pool, pipe_err, file_spec_cstr, String::UL_TAINTED); + read_pipe(err, pipe_err, file_spec_cstr, String::UL_TAINTED); close(pipe_err); - result.status=get_exit_status(pid); // negative may mean "-errno[execl()]" + return get_exit_status(pid); // negative may mean "-errno[execl()]" } else throw Exception(0, - file_spec, + &file_spec, "%s error: %s (%d)", pid<0?"fork":"pipe", strerror(errno), errno); #endif - return result; + return 0; }