--- parser3/src/main/pa_exec.C 2002/04/16 09:38:49 1.35 +++ parser3/src/main/pa_exec.C 2003/04/08 12:47:31 1.48.2.18.2.15 @@ -1,15 +1,14 @@ /** @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/04/08 12:47:31 $"; + #include "pa_config_includes.h" #include "pa_exec.h" @@ -27,14 +26,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 +88,8 @@ static BOOL WINAPI CreateHiddenConsolePr dir, &si, ppi); + if(!fCreated) + result=GetLastError(); CloseHandle(hInRead); CloseHandle(hOutWrite); @@ -96,64 +98,63 @@ 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, - String::Untaint_lang lang){ +static void read_pipe(String& result, HANDLE hOutRead, String::Language lang){ while(true) { - char *buf=(char *)result.pool().malloc(MAX_STRING); + char *buf=new(PointerFreeGC) char[MAX_STRING]; unsigned long size; - if(!ReadFile(hOutRead, buf, MAX_STRING, &size, NULL) || !size) + if(!ReadFile(hOutRead, buf, MAX_STRING-1, &size, NULL) || !size) break; - result.APPEND(buf, size, lang, file_spec, 0); - } + buf[size]=0; + result.append_know_length(buf, size, lang); + } } - -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 const char* buildCommand(const char* file_spec_cstr, const ArrayString& 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(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(size_t i=0; i(info); - - string << key << "=" << *static_cast(value); - string.APPEND_AS_IS("", 1, 0, 0); // zero byte + String& string; + Append_env_pair_info(String& astring): string(astring) {} +#else + char **env_ref; +#endif +}; +#endif +///@test maybe here and at argv construction --- cstr(String::L_UNSPECIFIED +static void append_env_pair(HashStringString::key_type key, HashStringString::value_type value, + Append_env_pair_info *info) { +#ifdef WIN32 + info->string << key << "=" << value; + info->string.append_know_length("", 1, String::L_AS_IS); // zero byte #else - String string(key.pool()); - string << key << "=" << *static_cast(value); + StringBody body; + body << key << "=" << value; - char ***env_ref=static_cast(info); - **env_ref=string.cstr(); (*env_ref)++; + *(info->env_ref++)=body.cstrm(); #endif } -int pa_exec( - bool forced_allow, +/// @todonow unix part to smart_ptr +PA_exec_result 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(); + const HashStringString* env, + const ArrayString& argv, + String& in) { + PA_exec_result result; #ifdef NO_PA_EXECS if(!forced_allow) @@ -318,30 +330,46 @@ int pa_exec( "parser execs are disabled [recompile parser without --disable-execs configure option]"); #endif + // execve needs non const + char* file_spec_cstr=file_spec.cstrm(String::L_FILE_SPEC); #ifdef WIN32 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; + const char* cmd=buildCommand(file_spec.cstr(String::L_FILE_SPEC), argv); + char* env_cstr; if(env) { - String string(env->pool()); - env->for_each(append_env_pair, &string); - env_cstr=string.cstr(); + String string; + Append_env_pair_info info(string); + env->for_each(append_env_pair, &info); + env_cstr=info.string.cstrm(String::L_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]; + const 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); + 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 { + const char* in_cstr=in.cstr(); DWORD written_size; - WriteFile(hInWrite, in_cstr, in.size(), &written_size, NULL); + WriteFile(hInWrite, in_cstr, in.length(), &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(result.out, hOutRead, String::L_AS_IS); CloseHandle(hOutRead); - read_pipe(err, hErrRead, file_spec_cstr, String::UL_TAINTED); + read_pipe(result.err, hErrRead, String::L_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,86 +379,67 @@ 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 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) throw Exception("file.missing", - &file_spec, - "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'", - file_spec_cstr); + &file_spec, + "stat failed: %s (%d), actual filename '%s'", + strerror(errno), errno, file_spec_cstr); + + check_safe_mode(finfo, file_spec, file_spec_cstr); } #endif - 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; + 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; icstrm(); + argv_cstrs[1+argv_size]=0; + + char **env_cstrs; 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; - } + env_cstrs=new(PointerFreeGC) char *[env->count()+1/*0*/]; + Append_env_pair_info info={env_cstrs}; + env->for_each(append_env_pair, &info); + *info.env_ref=0; + } else + env_cstrs=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.length()) {// there is some in data + const char* in_cstr=in.cstr(); + write(pipe_write, in_cstr, in.length()); + } close(pipe_write); - read_pipe(out, pipe_read, file_spec_cstr, String::UL_AS_IS); + read_pipe(result.out, pipe_read, String::L_AS_IS); close(pipe_read); - read_pipe(err, pipe_err, file_spec_cstr, String::UL_TAINTED); + read_pipe(result.err, pipe_err, String::L_TAINTED); close(pipe_err); - return get_exit_status(pid); // negative may mean "-errno[execl()]" + result.status=get_exit_status(pid); // negative may mean "-errno[execl()]" } else throw Exception(0, &file_spec, - "pipe error"); + "%s error: %s (%d)", pid<0?"fork":"pipe", strerror(errno), errno); #endif - return 0; + return result; }