--- parser3/src/main/pa_exec.C 2002/11/20 09:44:43 1.40 +++ parser3/src/main/pa_exec.C 2003/03/18 15:14:18 1.48.2.18.2.1 @@ -1,13 +1,13 @@ /** @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) @todo setrlimit */ -static const char* IDENT_EXEC_C="$Date: 2002/11/20 09:44:43 $"; +static const char* IDENT_EXEC_C="$Date: 2003/03/18 15:14:18 $"; #include "pa_config_includes.h" @@ -111,51 +111,52 @@ error: return result; } -static void read_pipe(String& result, HANDLE hOutRead, const char *file_spec, +static const String& read_pipeHANDLE hOutRead, const char* file_spec, String::Untaint_lang lang){ + const String& result(new String); while(true) { - char *buf=(char *)result.pool().malloc(MAX_STRING); + char *buf=new 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); } + return result; } - -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; 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; iAPPEND(buf, size, lang, file_spec, 0); } + return result; } #endif +#ifndef DOXYGEN +struct Append_env_pair_info { +#ifdef WIN32 + String* string; +#else + ; + char **env_ref; +#endif +}; +#endif ///@test maybe here and at argv construction --- cstr(String::UL_UNSPECIFIED -static void append_env_pair(const Hash::Key& key, Hash::Val *value, void *info) { +static void append_env_pair(HashStringString::key_type key, HashStringString::value_type value, + Append_env_pair_info *info) { #ifdef WIN32 - String& string=*static_cast(info); - - string << key << "=" << *static_cast(value); - string.APPEND_AS_IS("", 1, 0, 0); // zero byte + *info->string << key << "=" << value; + info->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(String::UL_PASSAPPENED); (*env_ref)++; + *(info->env_ref++)=string.cstr(*info->pool, String::UL_UNSPECIFIED); #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) 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; - 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::UL_FILE_SPEC), argv); + const 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->cstr(String::UL_UNSPECIFIED); } if(DWORD error=CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) { char szErrorDesc[MAX_STRING]; - char *param="the file you tried to run"; + 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), ¶m); + szErrorDesc, sizeof(szErrorDesc), (va_list *)¶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 { - const char *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 @@ -355,9 +369,9 @@ int pa_exec( // without this char WriteFile(hInWrite, "\x1A", 1, &written_size, NULL); CloseHandle(hInWrite); - read_pipe(out, hOutRead, file_spec_cstr, String::UL_AS_IS); + result.out=read_pipe(pool, hOutRead, file_spec_cstr, String::UL_AS_IS); CloseHandle(hOutRead); - read_pipe(err, hErrRead, file_spec_cstr, String::UL_TAINTED); + result.err=read_pipe(pool, 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 @@ -372,66 +386,67 @@ 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 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, + 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'", + 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 - 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; icstr(); + 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 char *[env->count()+1/*0*/]; + Append_env_pair_info info={&pool, 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.size()) {// there is some in data + const char* in_cstr=in.cstr(); + write(pipe_write, in_cstr, in.size()); + } close(pipe_write); - read_pipe(out, pipe_read, file_spec_cstr, String::UL_AS_IS); + result.out=read_pipe(pool, pipe_read, file_spec_cstr, String::UL_AS_IS); close(pipe_read); - read_pipe(err, pipe_err, file_spec_cstr, String::UL_TAINTED); + result.err=read_pipe(pool, pipe_err, file_spec_cstr, String::UL_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"); + file_spec, + "%s error: %s (%d)", pid<0?"fork":"pipe", strerror(errno), errno); #endif - return 0; + return result; }