--- parser3/src/main/pa_exec.C 2003/03/18 15:14:18 1.48.2.18.2.1 +++ parser3/src/main/pa_exec.C 2003/11/20 15:35:31 1.53 @@ -7,7 +7,7 @@ @todo setrlimit */ -static const char* IDENT_EXEC_C="$Date: 2003/03/18 15:14:18 $"; +static const char* IDENT_EXEC_C="$Date: 2003/11/20 15:35:31 $"; #include "pa_config_includes.h" @@ -33,95 +33,93 @@ static DWORD CreateHiddenConsoleProcess( LPHANDLE phOutRead, LPHANDLE phErrRead) { - DWORD result=0; + DWORD result=0; BOOL fCreated; - STARTUPINFO si; - SECURITY_ATTRIBUTES sa={0}; - HANDLE hInRead; - HANDLE hOutWrite; - HANDLE hErrWrite; - - // Create pipes - // initialize security attributes for handle inheritance (for WinNT) - sa.nLength=sizeof(sa); - sa.bInheritHandle=TRUE; - sa.lpSecurityDescriptor=NULL; - - // create STDIN pipe - if(!CreatePipe(&hInRead, phInWrite, &sa, 0)) - goto error; - - // create STDOUT pipe - if(!CreatePipe(phOutRead, &hOutWrite, &sa, 0)) - goto error; - - // create STDERR pipe - if(!CreatePipe(phErrRead, &hErrWrite, &sa, 0)) - goto error; - - // process startup information - memset(&si, 0, sizeof(si)); - si.cb=sizeof(si); - si.dwFlags=STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES; - // child process' console must be hidden for Win95 compatibility - si.wShowWindow=SW_HIDE; - // assign "other" sides of pipes - si.hStdInput=hInRead; - si.hStdOutput=hOutWrite; - si.hStdError=hErrWrite; - + STARTUPINFO si; + SECURITY_ATTRIBUTES sa={0}; + HANDLE hInRead; + HANDLE hOutWrite; + HANDLE hErrWrite; + + // Create pipes + // initialize security attributes for handle inheritance (for WinNT) + sa.nLength=sizeof(sa); + sa.bInheritHandle=TRUE; + sa.lpSecurityDescriptor=NULL; + + // create STDIN pipe + if(!CreatePipe(&hInRead, phInWrite, &sa, 0)) + goto error; + + // create STDOUT pipe + if(!CreatePipe(phOutRead, &hOutWrite, &sa, 0)) + goto error; + + // create STDERR pipe + if(!CreatePipe(phErrRead, &hErrWrite, &sa, 0)) + goto error; + + // process startup information + memset(&si, 0, sizeof(si)); + si.cb=sizeof(si); + si.dwFlags=STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES; + // child process' console must be hidden for Win95 compatibility + si.wShowWindow=SW_HIDE; + // assign "other" sides of pipes + si.hStdInput=hInRead; + si.hStdOutput=hOutWrite; + si.hStdError=hErrWrite; + // calculating script's directory char dir[MAX_STRING]; strncpy(dir, szCmdLine, MAX_STRING-1); dir[MAX_STRING-1]=0; lsplit(dir,' '); // trim arguments rsplit(dir,'/'); rsplit(dir,'\\'); // trim filename chdir(dir); - - // Create a child process (suspended) - fCreated=CreateProcess(NULL, - (LPTSTR)szCmdLine, - NULL, - NULL, - TRUE, - CREATE_NO_WINDOW, - szEnv, - dir, - &si, - ppi); + + // Create a child process (suspended) + fCreated=CreateProcess(NULL, + (LPTSTR)szCmdLine, + NULL, + NULL, + TRUE, + CREATE_NO_WINDOW, + szEnv, + dir, + &si, + ppi); if(!fCreated) result=GetLastError(); - - CloseHandle(hInRead); - CloseHandle(hOutWrite); - CloseHandle(hErrWrite); - - if(!fCreated) - goto error; - - return result; - + + CloseHandle(hInRead); + CloseHandle(hOutWrite); + CloseHandle(hErrWrite); + + if(!fCreated) + goto error; + + return result; + error: if(!result/*yet*/) result=GetLastError(); // get it - - CloseHandle(*phInWrite); - CloseHandle(*phOutRead); - CloseHandle(*phErrRead); - - return result; + + CloseHandle(*phInWrite); + CloseHandle(*phOutRead); + CloseHandle(*phErrRead); + + return result; } -static const String& read_pipeHANDLE hOutRead, const char* file_spec, - String::Untaint_lang lang){ - const String& result(new String); +static void read_pipe(String& result, HANDLE hOutRead, String::Language lang){ while(true) { - char *buf=new char[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); - } - return result; + buf[size]=0; + result.append_know_length(buf, size, lang); + } } static const char* buildCommand(const char* file_spec_cstr, const ArrayString& argv) { @@ -137,7 +135,7 @@ static const char* buildCommand(const ch 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(pa_strdup(begin, end-begin)); string << " " << file_spec_cstr; result=string.cstr(); } @@ -151,7 +149,7 @@ static const char* buildCommand(const ch } { // appending argv String string(result); - for(int i=0; iAPPEND(buf, size, lang, file_spec, 0); - } - return result; + buf[length]=0; + result.append_know_length(buf, length, lang); + } } #endif @@ -296,30 +293,34 @@ static const String& read_pipeint file, #ifndef DOXYGEN struct Append_env_pair_info { #ifdef WIN32 - String* string; + 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::UL_UNSPECIFIED +///@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_AS_IS("", 1, 0, 0); // zero byte + info->string << key << "=" << value; + info->string.append_know_length("\1", 1, String::L_AS_IS); // placeholder for of zero byte #else - String string; - string << key << "=" << value; + String::Body body; + body << key << "=" << value; - *(info->env_ref++)=string.cstr(*info->pool, String::UL_UNSPECIFIED); + *(info->env_ref++)=body.cstrm(); #endif } /// @todonow unix part to smart_ptr PA_exec_result pa_exec( - bool forced_allow, + bool +#ifdef NO_PA_EXEC + forced_allow +#endif + , const String& file_spec, const HashStringString* env, const ArrayString& argv, @@ -329,26 +330,28 @@ PA_exec_result pa_exec( #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; - const char* cmd=buildCommand(file_spec->cstr(String::UL_FILE_SPEC), argv); - const char* env_cstr; + const char* cmd=buildCommand(file_spec.cstr(String::L_FILE_SPEC), argv); + char* env_cstr=0; if(env) { String string; - Append_env_pair_info info={&string}; + Append_env_pair_info info(string); env->for_each(append_env_pair, &info); - env_cstr=info.string->cstr(String::UL_UNSPECIFIED); + env_cstr=info.string.cstrm(String::L_UNSPECIFIED); + for(char* replacer=env_cstr; *replacer; replacer++) + if(*replacer=='\1') + *replacer=0; } if(DWORD error=CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) { char szErrorDesc[MAX_STRING]; - const 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), @@ -357,21 +360,21 @@ PA_exec_result pa_exec( 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(); 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); - result.out=read_pipe(pool, hOutRead, file_spec_cstr, String::UL_AS_IS); + read_pipe(result.out, hOutRead, String::L_AS_IS); CloseHandle(hOutRead); - result.err=read_pipe(pool, 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 @@ -385,6 +388,9 @@ from http://www.apache.org/websrc/cvsweb #else + // execve needs non const + char* file_spec_cstr=file_spec.cstrm(String::L_FILE_SPEC); + int pipe_write, pipe_read, pipe_err; #ifdef PA_SAFE_MODE @@ -392,34 +398,29 @@ from http://www.apache.org/websrc/cvsweb 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_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); + &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}; + 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, + &file_spec, "too many arguments (%d > max %d)", argv_size, argv_max); for(int i=0; icstr(); + argv_cstrs[1+i]=argv[i]->cstrm(); argv_cstrs[1+argv_size]=0; char **env_cstrs; if(env) { - env_cstrs=new char *[env->count()+1/*0*/]; - Append_env_pair_info info={&pool, env_cstrs}; + 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 @@ -431,20 +432,20 @@ from http://www.apache.org/websrc/cvsweb &pipe_write, &pipe_read, &pipe_err); if(pid>0) { // in child - if(in.size()) {// there is some in data + if(in.length()) {// there is some in data const char* in_cstr=in.cstr(); - write(pipe_write, in_cstr, in.size()); + write(pipe_write, in_cstr, in.length()); } close(pipe_write); - result.out=read_pipe(pool, pipe_read, file_spec_cstr, String::UL_AS_IS); + read_pipe(result.out, pipe_read, String::L_AS_IS); close(pipe_read); - result.err=read_pipe(pool, pipe_err, file_spec_cstr, String::UL_TAINTED); + read_pipe(result.err, pipe_err, String::L_TAINTED); close(pipe_err); result.status=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