Skip to content

Commit 841bb14

Browse files
twizmwazintwizmwazin
authored
Remove file dumping to remote host (#60)
1 parent b2a7b49 commit 841bb14

8 files changed

+16
-87
lines changed

‎tests/test_detourbackend_aarch64.py‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -296,20 +296,12 @@ def run_one(self, filename, patches, set_oep=None, inputvalue=None, expected_out
296296
res = p.communicate(inputvalue)
297297
if expected_output:
298298
if res[0] != expected_output:
299-
self.fail(f"AssertionError: {res[0]} != {expected_output}, binary dumped: {self.dump_file(tmp_file)}")
300-
# self.assertEqual(res[0], expected_output)
299+
self.fail(f"AssertionError: {res[0]} != {expected_output}")
301300
if expected_returnCode:
302301
if p.returncode != expected_returnCode:
303-
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}, binary dumped: {self.dump_file(tmp_file)}")
304-
#self.assertEqual(p.returncode, expected_returnCode)
302+
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}")
305303
return backend
306304

307-
def dump_file(self, file):
308-
with open(file, 'rb') as f:
309-
data = f.read()
310-
response = requests.put('https://transfer.sh/bin', data=data)
311-
return response.text
312-
313305
if __name__ == "__main__":
314306
logging.getLogger("patcherex.backends.DetourBackend").setLevel("INFO")
315307
logging.getLogger("patcherex.test.test_detourbackend").setLevel("INFO")

‎tests/test_detourbackend_arm.py‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import os
55
import subprocess
66
import unittest
7-
import requests
87

98
import shellphish_qemu
109

@@ -286,20 +285,12 @@ def run_test(self, filename, patches, set_oep=None, inputvalue=None, expected_ou
286285
res = p.communicate(inputvalue)
287286
if expected_output:
288287
if res[0] != expected_output:
289-
self.fail(f"AssertionError: {res[0]} != {expected_output}, binary dumped: {self.dump_file(tmp_file)}")
290-
# self.assertEqual(res[0], expected_output)
288+
self.fail(f"AssertionError: {res[0]} != {expected_output}")
291289
if expected_returnCode:
292290
if p.returncode != expected_returnCode:
293-
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}, binary dumped: {self.dump_file(tmp_file)}")
294-
#self.assertEqual(p.returncode, expected_returnCode)
291+
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}")
295292
return backend
296293

297-
def dump_file(self, file):
298-
with open(file, 'rb') as f:
299-
data = f.read()
300-
response = requests.put('https://transfer.sh/bin', data=data)
301-
return response.text
302-
303294
if __name__ == "__main__":
304295
logging.getLogger("patcherex.backends.DetourBackend").setLevel("INFO")
305296
logging.getLogger("patcherex.test.test_detourbackend").setLevel("INFO")

‎tests/test_detourbackend_i386.py‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import os
55
import subprocess
66
import unittest
7-
import requests
87

98
import shellphish_qemu
109

@@ -303,20 +302,12 @@ def run_test(self, filename, patches, set_oep=None, inputvalue=None, expected_ou
303302
res = p.communicate(inputvalue)
304303
if expected_output:
305304
if res[0] != expected_output:
306-
self.fail(f"AssertionError: {res[0]} != {expected_output}, binary dumped: {self.dump_file(tmp_file)}")
307-
# self.assertEqual(res[0], expected_output)
305+
self.fail(f"AssertionError: {res[0]} != {expected_output}")
308306
if expected_returnCode:
309307
if p.returncode != expected_returnCode:
310-
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}, binary dumped: {self.dump_file(tmp_file)}")
311-
#self.assertEqual(p.returncode, expected_returnCode)
308+
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}")
312309
return backend
313310

314-
def dump_file(self, file):
315-
with open(file, 'rb') as f:
316-
data = f.read()
317-
response = requests.put('https://transfer.sh/bin', data=data)
318-
return response.text
319-
320311
if __name__ == "__main__":
321312
logging.getLogger("patcherex.backends.DetourBackend").setLevel("INFO")
322313
logging.getLogger("patcherex.test.test_detourbackend").setLevel("INFO")

‎tests/test_detourbackend_mips.py‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import os
55
import subprocess
66
import unittest
7-
import requests
87

98
import shellphish_qemu
109

@@ -288,20 +287,12 @@ def run_test(self, filename, patches, set_oep=None, inputvalue=None, expected_ou
288287
res = p.communicate(inputvalue)
289288
if expected_output:
290289
if res[0] != expected_output:
291-
self.fail(f"AssertionError: {res[0]} != {expected_output}, binary dumped: {self.dump_file(tmp_file)}")
292-
# self.assertEqual(res[0], expected_output)
290+
self.fail(f"AssertionError: {res[0]} != {expected_output}")
293291
if expected_returnCode:
294292
if p.returncode != expected_returnCode:
295-
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}, binary dumped: {self.dump_file(tmp_file)}")
296-
#self.assertEqual(p.returncode, expected_returnCode)
293+
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}")
297294
return backend
298295

299-
def dump_file(self, file):
300-
with open(file, 'rb') as f:
301-
data = f.read()
302-
response = requests.put('https://transfer.sh/bin', data=data)
303-
return response.text
304-
305296
if __name__ == "__main__":
306297
logging.getLogger("patcherex.backends.DetourBackend").setLevel("INFO")
307298
logging.getLogger("patcherex.test.test_detourbackend").setLevel("INFO")

‎tests/test_detourbackend_mips64.py‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import os
55
import subprocess
66
import unittest
7-
import requests
87

98
import shellphish_qemu
109

@@ -288,20 +287,12 @@ def run_test(self, filename, patches, set_oep=None, inputvalue=None, expected_ou
288287
res = p.communicate(inputvalue)
289288
if expected_output:
290289
if res[0] != expected_output:
291-
self.fail(f"AssertionError: {res[0]} != {expected_output}, binary dumped: {self.dump_file(tmp_file)}")
292-
# self.assertEqual(res[0], expected_output)
290+
self.fail(f"AssertionError: {res[0]} != {expected_output}")
293291
if expected_returnCode:
294292
if p.returncode != expected_returnCode:
295-
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}, binary dumped: {self.dump_file(tmp_file)}")
296-
#self.assertEqual(p.returncode, expected_returnCode)
293+
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}")
297294
return backend
298295

299-
def dump_file(self, file):
300-
with open(file, 'rb') as f:
301-
data = f.read()
302-
response = requests.put('https://transfer.sh/bin', data=data)
303-
return response.text
304-
305296
if __name__ == "__main__":
306297
logging.getLogger("patcherex.backends.DetourBackend").setLevel("INFO")
307298
logging.getLogger("patcherex.test.test_detourbackend").setLevel("INFO")

‎tests/test_detourbackend_ppc.py‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import os
55
import subprocess
66
import unittest
7-
import requests
87

98
import shellphish_qemu
109

@@ -298,20 +297,12 @@ def run_test(self, filename, patches, set_oep=None, inputvalue=None, expected_ou
298297
res = p.communicate(inputvalue)
299298
if expected_output:
300299
if res[0] != expected_output:
301-
self.fail(f"AssertionError: {res[0]} != {expected_output}, binary dumped: {self.dump_file(tmp_file)}")
302-
# self.assertEqual(res[0], expected_output)
300+
self.fail(f"AssertionError: {res[0]} != {expected_output}")
303301
if expected_returnCode:
304302
if p.returncode != expected_returnCode:
305-
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}, binary dumped: {self.dump_file(tmp_file)}")
306-
#self.assertEqual(p.returncode, expected_returnCode)
303+
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}")
307304
return backend
308305

309-
def dump_file(self, file):
310-
with open(file, 'rb') as f:
311-
data = f.read()
312-
response = requests.put('https://transfer.sh/bin', data=data)
313-
return response.text
314-
315306
if __name__ == "__main__":
316307
logging.getLogger("patcherex.backends.DetourBackend").setLevel("INFO")
317308
logging.getLogger("patcherex.test.test_detourbackend").setLevel("INFO")

‎tests/test_detourbackend_ppc64.py‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import os
55
import subprocess
66
import unittest
7-
import requests
87

98
import shellphish_qemu
109

@@ -300,20 +299,12 @@ def run_test(self, filename, patches, set_oep=None, inputvalue=None, expected_ou
300299
res = p.communicate(inputvalue)
301300
if expected_output:
302301
if res[0] != expected_output:
303-
self.fail(f"AssertionError: {res[0]} != {expected_output}, binary dumped: {self.dump_file(tmp_file)}")
304-
# self.assertEqual(res[0], expected_output)
302+
self.fail(f"AssertionError: {res[0]} != {expected_output}")
305303
if expected_returnCode:
306304
if p.returncode != expected_returnCode:
307-
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}, binary dumped: {self.dump_file(tmp_file)}")
308-
#self.assertEqual(p.returncode, expected_returnCode)
305+
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}")
309306
return backend
310307

311-
def dump_file(self, file):
312-
with open(file, 'rb') as f:
313-
data = f.read()
314-
response = requests.put('https://transfer.sh/bin', data=data)
315-
return response.text
316-
317308
if __name__ == "__main__":
318309
logging.getLogger("patcherex.backends.DetourBackend").setLevel("INFO")
319310
logging.getLogger("patcherex.test.test_detourbackend").setLevel("INFO")

‎tests/test_detourbackend_x86-64.py‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import os
55
import subprocess
66
import unittest
7-
import requests
87

98
import patcherex
109
from patcherex.backends.detourbackend import DetourBackend
@@ -136,20 +135,12 @@ def run_test(self, filename, patches, set_oep=None, inputvalue=None, expected_ou
136135
res = p.communicate(inputvalue)
137136
if expected_output:
138137
if res[0] != expected_output:
139-
self.fail(f"AssertionError: {res[0]} != {expected_output}, binary dumped: {self.dump_file(tmp_file)}")
140-
# self.assertEqual(res[0], expected_output)
138+
self.fail(f"AssertionError: {res[0]} != {expected_output}")
141139
if expected_returnCode:
142140
if p.returncode != expected_returnCode:
143-
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}, binary dumped: {self.dump_file(tmp_file)}")
144-
#self.assertEqual(p.returncode, expected_returnCode)
141+
self.fail(f"AssertionError: {p.returncode} != {expected_returnCode}")
145142
return backend
146143

147-
def dump_file(self, file):
148-
with open(file, 'rb') as f:
149-
data = f.read()
150-
response = requests.put('https://transfer.sh/bin', data=data)
151-
return response.text
152-
153144
if __name__ == "__main__":
154145
logging.getLogger("patcherex.backends.DetourBackend").setLevel("INFO")
155146
logging.getLogger("patcherex.test.test_detourbackend").setLevel("INFO")

0 commit comments

Comments
 (0)