summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordusoleil <howcansocksbereal@gmail.com>2021-09-01 00:18:09 -0400
committerdusoleil <howcansocksbereal@gmail.com>2021-09-01 00:18:09 -0400
commit3a937fe7bda97d17cd710f7b8c1fa9101be410fa (patch)
treecfd21a120e3b34a9745dcf23b6b709e0aec20c68
parent5c6a5aba81037ca276d2cf6fae53d2e9647524c4 (diff)
downloadsploit-3a937fe7bda97d17cd710f7b8c1fa9101be410fa.tar.gz
sploit-3a937fe7bda97d17cd710f7b8c1fa9101be410fa.zip
Move "Read Rest of Output" Out of Destructor
With the "read rest of output" code in the Comm destructor, it would continue to read output even in situations where some error happened and we expect sploit to die or when the user presses Ctrl+C to end sploit. By moving it to the end of the script running code in main, it behaves more intuitively. Signed-off-by: dusoleil <howcansocksbereal@gmail.com>
-rw-r--r--sploit/comm.py4
-rw-r--r--sploit/main.py2
2 files changed, 2 insertions, 4 deletions
diff --git a/sploit/comm.py b/sploit/comm.py
index 040ddd6..59f8498 100644
--- a/sploit/comm.py
+++ b/sploit/comm.py
@@ -12,10 +12,6 @@ class Comm:
def __init__(self, backend):
self.back = backend
- def __del__(self):
- for line in self.back.stdin:
- log(line)
-
def read(self, size):
data = self.back.stdin.read(size)
log(data)
diff --git a/sploit/main.py b/sploit/main.py
index 1ef2316..b1ddf13 100644
--- a/sploit/main.py
+++ b/sploit/main.py
@@ -41,4 +41,6 @@ def runscript(script,comm):
print("Running Script...")
exec(open(script).read())
print("Script Finished!")
+ for line in comm.back.stdin:
+ log(line)