--- parser3/src/main/pa_exec.C	2002/03/11 08:00:01	1.29
+++ parser3/src/main/pa_exec.C	2002/03/25 11:55:26	1.32
@@ -4,7 +4,7 @@
 	Copyright(c) 2000,2001, 2002 ArtLebedev Group(http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_exec.C,v 1.29 2002/03/11 08:00:01 paf Exp $
+	$Id: pa_exec.C,v 1.32 2002/03/25 11:55:26 paf Exp $
 
 
 	@todo setrlimit
@@ -70,15 +70,21 @@ static BOOL WINAPI CreateHiddenConsolePr
     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;
+	rsplit(dir,'/'); rsplit(dir,'\\'); // trim filename
+	chdir(dir);
+
     // Create a child process (suspended)
     fCreated=CreateProcess(NULL,
                               (LPTSTR)szCmdLine,
                               NULL,
                               NULL,
                               TRUE,
-                              0, //todo CREATE_NO_WINDOW,
+                              CREATE_NO_WINDOW,
                               szEnv,
-                              NULL,
+                              dir,
                               &si,
                               ppi);
 
@@ -103,8 +109,7 @@ static void read_pipe(String& result, HA
 	while(true) {
 		char *buf=(char *)result.pool().malloc(MAX_STRING);
 		unsigned long size;
-		ReadFile(hOutRead, buf, MAX_STRING, &size, NULL);
-		if(!size) 
+		if(!ReadFile(hOutRead, buf, MAX_STRING, &size, NULL) || !size) 
 			break;
 		result.APPEND_AS_IS(buf, size, file_spec, 0);
     }
@@ -154,7 +159,7 @@ static const char *buildCommand(Pool& po
 
 #else
 
-static int execve_piped(const char *path, 
+static int execve_piped(const char *file_spec_cstr, 
 			char * const argv[], char * const env[],
 			int *pipe_in, int *pipe_out, int *pipe_err) {
 	int pid;
@@ -229,7 +234,14 @@ static int execve_piped(const char *path
 		/* HP-UX SIGCHLD fix goes here, if someone will remind me what it is... */
 		signal(SIGCHLD, SIG_DFL);	/* Was that it? */
 	
-		execve(path, argv, env);
+		// chdir to script's directory
+		char dir[MAX_STRING];
+		strncpy(dir, file_spec_cstr, MAX_STRING-1); dir[MAX_STRING-1]=0;
+		rsplit(dir,'/'); // trim filename
+		chdir(dir);
+
+		//  execute
+		execve(file_spec_cstr, argv, env);
 		exit(-errno);
 	}
 	
@@ -265,7 +277,7 @@ static void read_pipe(String& result, in
 	while(true) {
 		char *buf=(char *)result.pool().malloc(MAX_STRING);
 		size_t size=read(file, buf, MAX_STRING);
-		if(!size) 
+		if(!size)
 			break;
 		result.APPEND_AS_IS(buf, size, file_spec, 0);
     }
@@ -273,6 +285,7 @@ static void read_pipe(String& result, in
 
 #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) {
 #ifdef WIN32
 	String& string=*static_cast<String *>(info);
@@ -287,27 +300,24 @@ static void append_env_pair(const Hash::
 	**env_ref=string.cstr();  (*env_ref)++;
 #endif
 }
-int pa_exec(const String& file_spec, 
+
+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();
 
 #ifdef NO_PA_EXECS
-
-	throw Exception(0, 0,
-		&file_spec,
-		"parser execs are disabled [recompile parser without --disable-execs configure option]");
-
-#else
+	if(!forced_allow)
+		throw Exception(0, 0,
+			&file_spec,
+			"parser execs are disabled [recompile parser without --disable-execs configure option]");
+#endif
 
 #ifdef WIN32
 
-	char pwd[MAX_STRING];
-	GetCurrentDirectory(sizeof(pwd), pwd);
-	char *dir=file_spec.cstr(String::UL_FILE_SPEC);
-	rsplit(dir, '/'); SetCurrentDirectory(dir);
-
 	PROCESS_INFORMATION pi;	
 	HANDLE hInWrite, hOutRead, hErrRead;
 	char *file_spec_cstr=file_spec.cstr(String::UL_FILE_SPEC); 
@@ -319,8 +329,6 @@ int pa_exec(const String& file_spec,
 		env_cstr=string.cstr();
 	}
 	if(CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) {
-		SetCurrentDirectory(pwd);
-
 		const char *in_cstr=in.cstr();
 		DWORD written_size;
 		WriteFile(hInWrite, in_cstr, in.size(), &written_size, NULL);
@@ -342,8 +350,6 @@ from http://www.apache.org/websrc/cvsweb
 		CloseHandle(pi.hProcess);
         CloseHandle(pi.hThread);
 	} else {
-		SetCurrentDirectory(pwd);
-
 		DWORD error=GetLastError();
 		char szErrorDesc[MAX_STRING];
 		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error,
@@ -364,6 +370,24 @@ 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
+	if(!forced_allow) {
+		struct stat finfo;
+		if(stat(file_spec_cstr, &finfo)!=0)
+			throw Exception(0, 0, 
+					&file_spec, 
+					"stat failed: %s (%d), actual filename '%s'", 
+						strerror(errno), errno, file_spec_cstr);
+
+		if(finfo.st_gid/*foreign?*/!=getegid())
+			throw Exception(0, 0,
+				&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);
+	}
+#endif
+
 	char *argv_cstrs[1+10+1]={file_spec_cstr, 0};
 	if(argv) {
 		const int argv_size=argv->size();
@@ -384,17 +408,11 @@ from http://www.apache.org/websrc/cvsweb
 		env->for_each(append_env_pair, &env_ref);
 		*env_ref=0;
 	}
-	const char *pwd=getcwd(NULL, 0);
-	char dir[MAX_STRING];
-	strncpy(dir, file_spec_cstr, MAX_STRING);
-	rsplit(dir,'/'); // trim filename
-    chdir(dir);
+
 	int pid=execve_piped(
 		file_spec_cstr,
 		argv_cstrs, env_cstrs,
 		&pipe_write, &pipe_read, &pipe_err);
-    if (pwd) 
-		chdir(pwd);
 	if(pid) {
 		// in child
 		const char *in_cstr=in.cstr();
@@ -411,7 +429,6 @@ from http://www.apache.org/websrc/cvsweb
 			&file_spec,
 			"pipe error");
 #endif
-#endif
 
 	return 0;
 }