--- parser3/src/main/pa_exec.C 2002/04/16 09:38:49 1.35 +++ parser3/src/main/pa_exec.C 2003/01/29 12:02:23 1.48.2.3 @@ -1,20 +1,20 @@ /** @file Parser: program executing for different OS-es. - Copyright(c) 2000,2001, 2002 ArtLebedev Group(http://www.artlebedev.com) + Copyright(c) 2000,2001, 2003 ArtLebedev Group(http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: pa_exec.C,v 1.35 2002/04/16 09:38:49 paf Exp $ - - @todo setrlimit */ +static const char* IDENT_EXEC_C="$Date: 2003/01/29 12:02:23 $"; + #include "pa_config_includes.h" #include "pa_exec.h" #include "pa_exception.h" #include "pa_common.h" +#include "pa_value_includes.h" #ifdef WIN32 # include @@ -27,14 +27,15 @@ #ifdef WIN32 /// this func from http://www.ccas.ru/~posp/popov/spawn.htm -static BOOL WINAPI CreateHiddenConsoleProcess(LPCTSTR szCmdLine, +static DWORD CreateHiddenConsoleProcess(LPCTSTR szCmdLine, char *szEnv, PROCESS_INFORMATION* ppi, LPHANDLE phInWrite, LPHANDLE phOutRead, LPHANDLE phErrRead) { - BOOL fCreated; + DWORD result=0; + BOOL fCreated; STARTUPINFO si; SECURITY_ATTRIBUTES sa={0}; HANDLE hInRead; @@ -88,6 +89,8 @@ static BOOL WINAPI CreateHiddenConsolePr dir, &si, ppi); + if(!fCreated) + result=GetLastError(); CloseHandle(hInRead); CloseHandle(hOutWrite); @@ -96,33 +99,34 @@ static BOOL WINAPI CreateHiddenConsolePr if(!fCreated) goto error; - return TRUE; + return result; error: + if(!result/*yet*/) + result=GetLastError(); // get it + CloseHandle(*phInWrite); CloseHandle(*phOutRead); CloseHandle(*phErrRead); - return FALSE; + return result; } -static void read_pipe(String& result, HANDLE hOutRead, const char *file_spec, +static void read_pipe(Pool& pool, StringPtr result, HANDLE hOutRead, const char *file_spec, String::Untaint_lang lang){ while(true) { - char *buf=(char *)result.pool().malloc(MAX_STRING); + 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); + result->APPEND(buf, size, lang, file_spec, 0); } } - -static const char *buildCommand(Pool& pool, - const String& origin_string, - const char *file_spec_cstr, const Array *argv) { - const char *result=file_spec_cstr; +static CharPtr buildCommand(CharPtr file_spec_cstr, const Array& argv) { + CharPtr 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) { @@ -132,28 +136,26 @@ static const char *buildCommand(Pool& po if(*begin==' ') // alx: were an old magic for some linux-es begin++; if(char *end=strchr(begin, '\n')) { - String string(pool); - string.APPEND_AS_IS(begin, end-begin, - origin_string.origin().file, 0); + String string(begin, end-begin); string << " " << file_spec_cstr; - if(argv) - for(int i=0; isize(); i++) - string << argv->get_string(i)->cstr(); result=string.cstr(); } } } + } catch(...) { + fclose(f); + rethrow; + } fclose(f); } - if(argv) { - String buf(pool); - buf << result; - for(int i=0; isize(); i++) { - buf << " "; - buf << *argv->get_string(i); + { // appending argv + String string(result); + for(int i=0; i(info); - - string << key << "=" << *static_cast(value); - string.APPEND_AS_IS("", 1, 0, 0); // zero byte + String *string +#else + struct { + Pool *pool; + char ***env + } info +#endif + ) { +#ifdef WIN32 + *string << key << "=" << value; + string->APPEND_AS_IS("", 1, 0, 0); // zero byte #else - String string(key.pool()); - string << key << "=" << *static_cast(value); + String string; + string << key << "=" << value; - char ***env_ref=static_cast(info); - **env_ref=string.cstr(); (*env_ref)++; + **env=string.cstr(*info->pool, String::UL_UNSPECIFIED); (*env)++; #endif } -int pa_exec( - bool forced_allow, - const String& file_spec, - const Hash *env, - const Array *argv, - const String& in, String& out, String& err) { - Pool& pool=file_spec.pool(); - +/// @todonow unix part to smart_ptr +int pa_exec(Pool& pool, + bool forced_allow, + ConstStringPtr file_spec, + HashStringString& env, + Array& argv, + ConstStringPtr in, StringPtr out, StringPtr err) { #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 @@ -322,26 +330,40 @@ int pa_exec( PROCESS_INFORMATION pi; HANDLE hInWrite, hOutRead, hErrRead; - 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(); + CharPtr file_spec_cstr=file_spec->cstr(String::UL_FILE_SPEC); + CharPtr cmd=buildCommand(file_spec_cstr, argv); + CharPtr env_cstr(0); + { // env + String string; + env.for_each(append_env_pair, &string); + env_cstr=string.cstr(String::UL_UNSPECIFIED); } - if(CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) { - const char *in_cstr=in.cstr(); + if(DWORD error=CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) { + char szErrorDesc[MAX_STRING]; + 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), ¶m); + if(error_size>3) // ".\r\n" + szErrorDesc[error_size-3]=0; + + throw Exception(0, + 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(); DWORD written_size; - WriteFile(hInWrite, in_cstr, in.size(), &written_size, NULL); + WriteFile(hInWrite, in_cstr, in->size(), &written_size, NULL); // EOF for stupid text reads // normally they should read CONTENT_LENGTH bytes, // without this char WriteFile(hInWrite, "\x1A", 1, &written_size, NULL); CloseHandle(hInWrite); - read_pipe(out, hOutRead, file_spec_cstr, String::UL_AS_IS); + read_pipe(pool, out, hOutRead, file_spec_cstr, String::UL_AS_IS); CloseHandle(hOutRead); - read_pipe(err, hErrRead, file_spec_cstr, String::UL_TAINTED); + read_pipe(pool, 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 @@ -351,21 +373,6 @@ from http://www.apache.org/websrc/cvsweb */ CloseHandle(pi.hProcess); CloseHandle(pi.hThread); - } else { - DWORD error=GetLastError(); - char szErrorDesc[MAX_STRING]; - FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, - MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), - szErrorDesc, sizeof(szErrorDesc), NULL); - size_t error_size=strlen(szErrorDesc); - if(error_size>3) // ".\r\n" - szErrorDesc[error_size-3]=0; - - throw Exception(0, - &file_spec, - "(real command line=\"%s\") exec failed - %s (%ld)", - cmd, - szErrorDesc, (long)error); } #else @@ -373,7 +380,7 @@ from http://www.apache.org/websrc/cvsweb int pipe_write, pipe_read, pipe_err; char *file_spec_cstr=file_spec.cstr(String::UL_FILE_SPEC); -#ifdef NO_FOREIGN_GROUP_FILES +#ifdef PA_SAFE_MODE if(!forced_allow) { struct stat finfo; if(stat(file_spec_cstr, &finfo)!=0) @@ -382,10 +389,11 @@ from http://www.apache.org/websrc/cvsweb "stat failed: %s (%d), actual filename '%s'", strerror(errno), errno, file_spec_cstr); - if(finfo.st_gid/*foreign?*/!=getegid()) - throw Exception("parser.runtime", - &file_spec, - "parser executing files of foreign group is disabled [recompile parser without --disable-foreign-group-files configure option], actual filename '%s'", + 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); } #endif @@ -411,14 +419,15 @@ from http://www.apache.org/websrc/cvsweb *env_ref=0; } - int pid=execve_piped( + pid_t pid=execve_piped( file_spec_cstr, argv_cstrs, env_cstrs, &pipe_write, &pipe_read, &pipe_err); - if(pid) { + if(pid>0) { // in child const char *in_cstr=in.cstr(); - write(pipe_write, in_cstr, in.size()); + if(*in_cstr) // there is some in data + write(pipe_write, in_cstr, in.size()); close(pipe_write); read_pipe(out, pipe_read, file_spec_cstr, String::UL_AS_IS); close(pipe_read); @@ -429,7 +438,7 @@ from http://www.apache.org/websrc/cvsweb } else throw Exception(0, &file_spec, - "pipe error"); + "%s error: %s (%d)", pid<0?"fork":"pipe", strerror(errno), errno); #endif return 0;