[gentoo-commits] proj/autodep:master commit in: logger/src/autodep/logfs/, logger/src/autodep/, logger/src/hook_lib/

[Александр Берсенев]

commit:     a211bf1d95a0adae7aa76539fcc9789aa0c1644c
Author:     Alexander Bersenev <bay <AT> hackerdom <DOT> ru>
AuthorDate: Fri Jul  1 02:04:09 2011 +0000
Commit:     Александр Берсенев <bay <AT> hackerdom <DOT> ru>
CommitDate: Fri Jul  1 02:04:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/autodep.git;a=commit;h=a211bf1d

fixed a very nasty issue with environment variables

---
 logger/src/autodep/logfs/fstracer.py |   17 ++-
 logger/src/autodep/showfsevents.py   |    1 +
 logger/src/hook_lib/file_hook.c      |  280 +++++++++++++++++++++++++++++-----
 3 files changed, 253 insertions(+), 45 deletions(-)

diff --git a/logger/src/autodep/logfs/fstracer.py b/logger/src/autodep/logfs/fstracer.py
index 7ceb36e..1b99f8e 100644
--- a/logger/src/autodep/logfs/fstracer.py
+++ b/logger/src/autodep/logfs/fstracer.py
@@ -132,10 +132,10 @@ def getfsevents(prog_name,arguments,approach="hooklib",filterproc=defaultfilter)
 
 	sock_listen.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 	sock_listen.bind(socketname)
-	sock_listen.listen(1024)
+	sock_listen.listen(64)
 	# enable connect a socket for anyone
 	os.chmod(tmpdir,stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR|stat.S_IROTH|stat.S_IWOTH|stat.S_IXOTH)
-	os.chmod(socketname,stat.S_IRUSR|stat.S_IWUSR|stat.S_IROTH|stat.S_IWOTH)
+	os.chmod(socketname,stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR|stat.S_IROTH|stat.S_IWOTH|stat.S_IXOTH)
 
   except socket.error, e:
     print "Failed to create a socket for exchange data with the logger: %s" % e
@@ -168,19 +168,26 @@ def getfsevents(prog_name,arguments,approach="hooklib",filterproc=defaultfilter)
 	  stop=0
 	  was_first_connect=False
 	  
+	  #print "fileno listen: %d",sock_listen.fileno()
+	  
 	  while stop==0:
 		sock_events = epoll.poll(3)
 		for fileno, sock_event in sock_events:
 		  if fileno == sock_listen.fileno():
+			#print "\n\nEVENT\n\n"
 			ret = sock_listen.accept()
+			#print ret
 			if ret is None:
+			#  print "\n\nPASS\n\n"
 			  pass
 			else:
 			  (client,addr)=ret
+			 # print client
 			  connects+=1; # client accepted
 			  was_first_connect=True
 			  epoll.register(client.fileno(), select.EPOLLIN)
 			  clients[client.fileno()]=client
+			  #print "opened %d" % client.fileno()
 		  #elif sock_event & select.EPOLLHUP:
 			#epoll.unregister(fileno)
 			#clients[fileno].close()
@@ -196,7 +203,7 @@ def getfsevents(prog_name,arguments,approach="hooklib",filterproc=defaultfilter)
 			  clients[fileno].close()
 			  del clients[fileno]
 			  connects-=1
-			  #print "closing!!"
+			  #print "closed %d"%fileno
 			  continue
 			
 			message=record.split("\0")
@@ -258,12 +265,14 @@ def getfsevents(prog_name,arguments,approach="hooklib",filterproc=defaultfilter)
 		  return []
 		if len(clients)==0 and iszombie(pid):
 		 break
+	  
+	  #print "\n\nRETURNING!!!!\n\n"
+  
 
 	  os.wait()
   
 	  epoll.unregister(sock_listen.fileno())
 	  epoll.close()
 	  sock_listen.close()
-	
   return events
 

diff --git a/logger/src/autodep/showfsevents.py b/logger/src/autodep/showfsevents.py
index 2b04709..20264e1 100755
--- a/logger/src/autodep/showfsevents.py
+++ b/logger/src/autodep/showfsevents.py
@@ -14,6 +14,7 @@ if len(sys.argv)<2:
   
 events=logfs.fstracer.getfsevents(sys.argv[1], sys.argv[1:],approach="hooklib")
 print "Program finished, analyzing dependencies"
+#exit(0);
 # get unique filenames
 filenames={}
 for stage in events:

diff --git a/logger/src/hook_lib/file_hook.c b/logger/src/hook_lib/file_hook.c
index 7c846e2..2958cb7 100644
--- a/logger/src/hook_lib/file_hook.c
+++ b/logger/src/hook_lib/file_hook.c
@@ -22,6 +22,8 @@
 #define MAXFILEBUFFLEN 2048
 
 #define MAXSOCKETMSGLEN 8192
+#define MAXENVSIZE 65536
+#define MAXENVITEMSIZE 256
 
 //extern int errorno;
 
@@ -31,16 +33,27 @@ int (*_open)(const char * pathname, int flags, ...);
 int (*_open64)(const char * pathname, int flags, ...);
 FILE * (*_fopen)(const char *path, const char *mode);
 FILE * (*_fopen64)(const char *path, const char *mode);
-int (*_execve)(const char *filename, char *const argv[],char *const envp[]);
 ssize_t (*_read)(int fd, void *buf, size_t count);
 ssize_t (*_write)(int fd, const void *buf, size_t count);
 size_t (*_fread)(void *ptr, size_t size, size_t nmemb, FILE *stream);
 size_t (*_fwrite)(const void *ptr, size_t size, size_t nmemb, FILE *stream);
 
+int (*_execve)(const char *filename, char *const argv[],char *const envp[]);
+int (*_execv)(const char *path, char *const argv[]);
+int (*_execvp)(const char *file, char *const argv[]);
+int (*_fexecve)(int fd, char *const argv[], char *const envp[]);
+
+int (*_system)(const char *command);
+
+pid_t (*_fork)();
+
+int (*_setenv)(const char *name, const char *value, int overwrite);
 int (*_close)(int fd); // we hooking this, because some programs closes our socket
 
 int log_socket=-1;
 
+char log_socket_orig[MAXSOCKETPATHLEN];
+
 void __doinit(){
   _open = (int (*)(const char * pathname, int flags, ...)) dlsym(RTLD_NEXT, "open");
   _open64 = (int (*)(const char * pathname, int flags, ...)) dlsym(RTLD_NEXT, "open64");
@@ -51,52 +64,70 @@ void __doinit(){
   _read= (ssize_t (*)(int fd, void *buf, size_t count)) dlsym(RTLD_NEXT, "read");
   _write= (ssize_t (*)(int fd, const void *buf, size_t count)) dlsym(RTLD_NEXT, "write");
   
+  _fork = (pid_t (*)()) dlsym(RTLD_NEXT, "fork");
   _execve = (int (*)(const char *filename, char *const argv[],char *const envp[])) dlsym(RTLD_NEXT, "execve");
+  _execv = (int (*)(const char *path, char *const argv[])) dlsym(RTLD_NEXT, "execv");
+  _execvp = (int (*)(const char *file, char *const argv[])) dlsym(RTLD_NEXT, "execvp");
 
+  _fexecve = (int (*)(int fd, char *const argv[], char *const envp[])) dlsym(RTLD_NEXT, "fexecve");
+
+  _system = (int (*)(const char *command)) dlsym(RTLD_NEXT, "system");
+  
+  
+  _setenv=(int (*)(const char *name, const char *value, int overwrite)) dlsym(RTLD_NEXT, "setenv");
   _close= (int (*)(int fd)) dlsym(RTLD_NEXT, "close");
 
   
   if(_open==NULL || _open64==NULL || 
 	 _fopen==NULL || _fopen64==NULL || 
-	 execve==NULL || _read==NULL || _write==NULL || close==NULL) {
+	  _read==NULL || _write==NULL ||
+	  _fork==NULL || _execve==NULL || _execv==NULL || _fexecve==NULL ||  _execvp==NULL ||
+	  _system==NULL || _setenv==NULL || _close==NULL) {
 	  fprintf(stderr,"Failed to load original functions of hook\n");
 	  exit(1);
   }
   
   
   char *log_socket_name=getenv("LOG_SOCKET");
+  
   if(log_socket_name==NULL) {
 	fprintf(stderr,"LOG_SOCKET environment variable isn't defined."
 					"Are this library launched by server?\n");
 
 	exit(1);
-  } else {
-	if(strlen(log_socket_name)>=MAXSOCKETPATHLEN) {
-	  fprintf(stderr,"Unable to create a unix-socket %s: socket name is too long,exiting\n", log_socket_name);
-	  exit(1);
-	}
-		
-	log_socket=socket(AF_UNIX, SOCK_SEQPACKET, 0);
-	if(log_socket==-1) {
-	  fprintf(stderr,"Unable to create a unix-socket %s: %s\n", log_socket_name, strerror(errno));
-	  exit(1);
-	}
-	
-	struct sockaddr_un serveraddr;
-	memset(&serveraddr, 0, sizeof(serveraddr));
-	serveraddr.sun_family = AF_UNIX;
-	strcpy(serveraddr.sun_path, log_socket_name);
-	
-	int ret=connect(log_socket, (struct sockaddr *)&serveraddr, SUN_LEN(&serveraddr));
-	if(ret==-1) {
-	  fprintf(stderr,"Unable to connect a unix-socket: %s\n", strerror(errno));
-	  exit(1);
-	}
-  }  
+  }
+  strcpy(log_socket_orig,getenv("LOG_SOCKET"));
+  //fprintf(stderr,"%d %s\n",getpid(),log_socket_name);
+
+
+  if(strlen(log_socket_name)>=MAXSOCKETPATHLEN) {
+	fprintf(stderr,"Unable to create a unix-socket %s: socket name is too long,exiting\n", log_socket_name);
+	exit(1);
+  }
+	  
+  log_socket=socket(AF_UNIX, SOCK_SEQPACKET, 0);
+  if(log_socket==-1) {
+	fprintf(stderr,"Unable to create a unix-socket %s: %s\n", log_socket_name, strerror(errno));
+	exit(1);
+  }
+  
+  struct sockaddr_un serveraddr;
+  memset(&serveraddr, 0, sizeof(serveraddr));
+  serveraddr.sun_family = AF_UNIX;
+  strcpy(serveraddr.sun_path, log_socket_name);
+  
+
+  int ret=connect(log_socket, (struct sockaddr *)&serveraddr, SUN_LEN(&serveraddr));
+  if(ret==-1) {
+	fprintf(stderr,"Unable to connect a unix-socket %d %s: %s\n", getpid(),log_socket_name, strerror(errno));
+	fflush(stderr);
+	//execlp("/bin/bash","/bin/bash",NULL);
+	exit(1);
+  }
 }
 
 void __dofini() {
-  //close(log_socket); 
+  close(log_socket); 
 }
 
 void _init() {
@@ -110,7 +141,7 @@ void _fini() {
 /*
  * Format of log string: time event filename stage result/err
 */
-static void __raw_log_event(const char *event_type, const char *filename, char *result,int err, char* stage) {
+static int __raw_log_event(const char *event_type, const char *filename, char *result,int err, char* stage) {
   //printf("lololo:%s %s %s\n",event_type,filename,stage);
 
   char msg_buff[MAXSOCKETMSGLEN];
@@ -123,19 +154,20 @@ static void __raw_log_event(const char *event_type, const char *filename, char *
 	  (unsigned long long)time(NULL),0,event_type,0,filename,0,stage,0,result);	
   }
   
-  if(bytes_to_send>=MAXSOCKETMSGLEN) return;
-  if(send(log_socket,msg_buff,bytes_to_send,0)==-1) {
-	printf("BAYBAY!!!11 %d %d\n",log_socket, getpid());
-	sleep(100500);
-  }
+  if(bytes_to_send>=MAXSOCKETMSGLEN) 
+	return 0;
+  
+  if(send(log_socket,msg_buff,bytes_to_send,0)==-1) 
+	return 0;
   
+  return 1;
 }
 
 /*
  * Log an event
 */
-static void __log_event(const char *event_type, const char *filename, char *result,int err, char* stage) {
-  __raw_log_event(event_type,filename,result,err,stage);
+static int __log_event(const char *event_type, const char *filename, char *result,int err, char* stage) {
+  return __raw_log_event(event_type,filename,result,err,stage);
 }
 
 /*
@@ -167,7 +199,7 @@ ssize_t __get_path_by_fd(int fd, char *output, int output_len) {
 static int __is_event_allowed(const char *event_type,const char *filename, char* stage) {
   char answer[8];
   int bytes_recieved;
-
+  //printf("asking %s\n",filename);
   
   pthread_mutex_lock( &socketblock );
 
@@ -180,8 +212,11 @@ static int __is_event_allowed(const char *event_type,const char *filename, char*
 	return 1;
   else if(strcmp(answer,"DENY")==0)
 	return 0;
-  else 
+  else {
 	fprintf(stderr,"Protocol error, text should be ALLOW or DENY, got: %s",answer);
+  
+	exit(1);
+  }
   return 0;
 }
 
@@ -198,10 +233,10 @@ int open(const char * path, int flags, mode_t mode) {
 	}
 
 	
-    if(flags & O_CREAT)
+    //if(flags & O_CREAT)
         ret=_open(path, flags, mode);
-    else
-        ret=_open(path, flags, 0);
+    //else
+    //    ret=_open(path, flags, 0);
 
 	if(ret==-1)
 	  __log_event("open",fullpath,"ERR",errno,stage);
@@ -311,7 +346,27 @@ ssize_t write(int fd,const void *buf, size_t count){
   return ret;
 }
 
+pid_t fork(void) {
+  //fprintf(stderr,"prefork %s %s\n",getenv("LOG_SOCKET"),log_socket_orig);
 
+  //int succ=
+  setenv("LOG_SOCKET",log_socket_orig,1);
+  
+  //fprintf(stderr,"prefork %s%p%p%d %s\n",getenv("LOG_SOCKET"),_setenv,setenv,succ,log_socket_orig);
+
+  int ret=_fork();
+  // we must to handle fork for reconnect a socket
+  
+  if(ret==0) {
+
+	__dofini(); // reinit connection for clildren
+    __doinit(); // because now it is different processes
+  } else {
+	//fprintf(stderr,"fork new: %d LOG_SOCKET=%s\n", ret,getenv("LOG_SOCKET"));
+	//sleep(3);
+  }
+  return ret;
+}
 
 int execve(const char *filename, char *const argv[],
                   char *const envp[]) {
@@ -319,17 +374,160 @@ int execve(const char *filename, char *const argv[],
 	__log_event("open",filename,"OK",0,__get_stage());
   else
 	__log_event("open",filename,"ERR",2,__get_stage());
-	
   
+  //fprintf(stderr,"executing %s pid=%d", filename,getpid());
+  char *new_envp[MAXENVSIZE];
+  char new_ld_preload[MAXENVITEMSIZE];
+  char new_log_socket[MAXENVITEMSIZE];
+  
+  int ld_preload_valid=0;
+  int log_socket_valid=0;
+  int i;
+  for(i=0;envp[i];i++){
+	if(strncmp(envp[i],"LD_PRELOAD=",11)==0)
+	  if(strcmp(envp[i]+11,getenv("LD_PRELOAD"))==0) 
+		ld_preload_valid=1;
+	if(strncmp(envp[i],"LOG_SOCKET=",11)==0)
+	  if(strcmp(envp[i]+11,log_socket_orig)==0) 
+		log_socket_valid=1;
+  }
+  if(!ld_preload_valid || !log_socket_valid) {
+	snprintf(new_ld_preload,MAXENVITEMSIZE,"LD_PRELOAD=%s",getenv("LD_PRELOAD"));
+	snprintf(new_log_socket,MAXENVITEMSIZE,"LOG_SOCKET=%s",log_socket_orig);
+	for(i=0; envp[i] && i<MAXENVSIZE-3; i++) {
+	  if(strncmp(envp[i],"LD_PRELOAD=",11)==0) {
+		new_envp[i]=new_ld_preload;
+		ld_preload_valid=1;
+	  } else if(strncmp(envp[i],"LOG_SOCKET=",11)==0) {
+		new_envp[i]=new_log_socket;
+		log_socket_valid=1;
+	  } else {
+		new_envp[i]=envp[i];
+	  }
+	}
+
+	if(!ld_preload_valid) {
+	  new_envp[i]=new_ld_preload;
+	  i++;
+	}
+	if(!log_socket_valid) {
+	  new_envp[i]=new_log_socket;
+	  i++;
+	}
+	new_envp[i]=NULL;
+	envp=new_envp;
+//	for(i=0;envp[i];i++){
+//	  printf("BAY: %s\n",envp[i]);
+//	}
+
+  }
+  
+  fflush(stderr);
   int ret=_execve(filename, argv, envp);
   
   return ret;
 }
 
+//int clone(int (*fn)(void *), void *child_stack,
+//                 int flags, void *arg, ...) {
+//	fprintf(stderr,"clone pid=%d",getpid());
+//	fflush(stderr);
+
+//	return -1;//_clone(fn,child_stack,flags,arg);
+//}
+
+
+/*int fexecve(int fd, char *const argv[], char *const envp[]) {
+	fprintf(stderr,"fexecuting pid=%d",getpid());
+	fflush(stderr);
+	return _fexecve(fd,argv,envp);
+}
+
+int execle(const char *path, const char *arg, ...) {
+	fprintf(stderr,"fexecluting pid=%d",getpid());
+	fflush(stderr);
+//
+	return 0;
+}
+
+int execl(const char *path, const char *arg, ...){
+	fprintf(stderr,"execluting 1 pid=%d",getpid());
+	fflush(stderr);
+//
+	return 0;  
+}
+
+int execv(const char *path, char *const argv[]){
+	fprintf(stderr,"execvuting 1 pid=%d",getpid());
+	fflush(stderr);
+	_execv(path,argv);
+	return 0;  
+}
+
+int execvp(const char *file, char *const argv[]){
+ 	fprintf(stderr,"execvpting 1 pid=%d",getpid());
+	fflush(stderr);
+
+	return _execvp(file,argv);
+	
+	return 0;  
+} 
+
+
+int execvpe(const char *file, char *const argv[],
+                  char *const envp[]){
+	fprintf(stderr,"execvpeting 1 pid=%d",getpid());
+	fflush(stderr);
+//
+	return 0;  
+}
+
+int execlp(const char *file, const char *arg, ...){
+	fprintf(stderr,"execlpeting 1 pid=%d",getpid());
+	fflush(stderr);
+//
+	return 0;  
+}
+
+int rexec(char **ahost, int inport, char *user,
+                 char *passwd, char *cmd, int *fd2p){
+ 	fprintf(stderr,"rexec 1 pid=%d",getpid());
+	fflush(stderr);
+//
+	return 0;  
+} 
+
+int system(const char *command) {
+ 	fprintf(stderr,"rexec 1 pid=%d cmd=%s",getpid(),command);
+	fflush(stderr);
+
+	return _system(command);
+	return 0;  
+  
+}*/
+
+
+
+int setenv(const char *name, const char *value, int overwrite) {
+	//printf ("   CHANGING name: %s, value: %s",name,value);
+	if(strcmp(name,"LD_PRELOAD")==0 ||
+	  strcmp(name,"LOG_SOCKET")==0) return -1;
+	int ret=_setenv(name,value,overwrite);
+	return ret;
+}
+
+//int putenv(char *string){
+// 	fprintf(stderr,"putenv 1 pid=%d cmd=%s",getpid(),string);
+//	fflush(stderr);
+//
+//	//return _system(command);
+//	return 0;    
+//}
+
+
 int close(int fd) {
   if(fd!=log_socket) {
 	return _close(fd);
   }
   return -1;
 }
-