Merge pull request #193 from knownsec/dev-rewel

Dev rewel
knownsec · Jun 22, 2021 · e31d1ae · e31d1ae
2 parents 6b7207c + 6eba1f2
commit e31d1ae
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 10 deletions.
diff --git a/pocsuite3/shellcodes/data/java/reverse_tcp/Payload.class b/pocsuite3/shellcodes/data/java/reverse_tcp/Payload.class
diff --git a/pocsuite3/shellcodes/tools/ld.exe b/pocsuite3/shellcodes/tools/ld.exe
diff --git a/pocsuite3/shellcodes/tools/ld.gold.exe b/pocsuite3/shellcodes/tools/ld.gold.exe
diff --git a/pocsuite3/shellcodes/tools/ld64.exe b/pocsuite3/shellcodes/tools/ld64.exe
diff --git a/pocsuite3/shellcodes/tools/libwinpthread-1.dll b/pocsuite3/shellcodes/tools/libwinpthread-1.dll
diff --git a/pocsuite3/shellcodes/tools/nasm.exe b/pocsuite3/shellcodes/tools/nasm.exe
diff --git a/pocsuite3/shellcodes/tools/objdump.exe b/pocsuite3/shellcodes/tools/objdump.exe
diff --git a/setup.py b/setup.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 import os
 try:
     from setuptools import setup, find_packages

diff --git a/tests/test_httpserver.py b/tests/test_httpserver.py
@@ -46,9 +46,9 @@ def test_ipv4(self):
         try:
             logger.info('Test http server in ipv4')
             PHTTPServer._instance = None
-            httpd = PHTTPServer(bind_ip='0.0.0.0', bind_port=666, requestHandler=BaseRequestHandler)
+            httpd = PHTTPServer(bind_ip='0.0.0.0', bind_port=6666, requestHandler=BaseRequestHandler)
             httpd.start()
-            url = '{}://{}:{}/'.format('http', get_host_ip(), 666)
+            url = '{}://{}:{}/'.format('http', get_host_ip(), 6666)
             resp = requests.get(url)
             self.assertEqual(resp.status_code, 200)
         except Exception:
@@ -60,9 +60,9 @@ def test_ipv6(self):
         try:
             logger.info('Test http server in ipv6')
             PHTTPServer._instance = None
-            httpd = PHTTPServer(bind_ip='::', bind_port=666, requestHandler=BaseRequestHandler)
+            httpd = PHTTPServer(bind_ip='::', bind_port=6666, requestHandler=BaseRequestHandler)
             httpd.start()
-            url = '{}://{}:{}/'.format('http', '[{}]'.format(get_host_ipv6()), 666)
+            url = '{}://{}:{}/'.format('http', '[{}]'.format(get_host_ipv6()), 6666)
             resp = requests.get(url)
             self.assertEqual(resp.status_code, 200)
         except Exception:
@@ -74,13 +74,13 @@ def test_ipv4_https(self):
         try:
             logger.info('Test https server in ipv4')
             PHTTPServer._instance = None
-            httpd = PHTTPServer(bind_ip='0.0.0.0', bind_port=666, use_https=True,
+            httpd = PHTTPServer(bind_ip='0.0.0.0', bind_port=6666, use_https=True,
                                 requestHandler=BaseRequestHandler)
             httpd.start()
-            url = '{}://{}:{}/'.format('https', get_host_ip(), 666)
+            url = '{}://{}:{}/'.format('https', get_host_ip(), 6666)
             requests.get(url)
         except requests.exceptions.SSLError:
-            url = '{}://{}:{}/'.format('https', get_host_ip(), 666)
+            url = '{}://{}:{}/'.format('https', get_host_ip(), 6666)
             resp = requests.get(url, verify=False)
             self.assertEqual(resp.status_code, 200)
         except Exception:
@@ -92,13 +92,13 @@ def test_ipv6_https(self):
         try:
             logger.info('Test https server in ipv6')
             PHTTPServer._instance = None
-            httpd = PHTTPServer(bind_ip='::', bind_port=666, use_https=True,
+            httpd = PHTTPServer(bind_ip='::', bind_port=6666, use_https=True,
                                 requestHandler=BaseRequestHandler)
             httpd.start()
-            url = '{}://{}:{}/'.format('https', '[{}]'.format(get_host_ipv6()), 666)
+            url = '{}://{}:{}/'.format('https', '[{}]'.format(get_host_ipv6()), 6666)
             requests.get(url)
         except requests.exceptions.SSLError:
-            url = '{}://{}:{}/'.format('https', '[{}]'.format(get_host_ipv6()), 666)
+            url = '{}://{}:{}/'.format('https', '[{}]'.format(get_host_ipv6()), 6666)
             resp = requests.get(url, verify=False)
             self.assertEqual(resp.status_code, 200)
         except Exception: