Roman/HackingScripts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
Roman Hergenreder 2023-10-16 17:44:22 +02:00
parent 1b2394f616
commit 29a3fd08d6
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fileserver.py
View File

@ -36,11 +36,11 @@ class FileServerRequestHandler(BaseHTTPRequestHandler):
# target += "?" if "?" not in target else "&" # target += "?" if "?" not in target else "&"
# target += queryStr # target += queryStr
contentLength = self.headers.get('Content-Length') content_length = self.headers.get('Content-Length')
data = None data = None
if contentLength and int(contentLength) > 0: if content_length and int(content_length) > 0:
data = self.rfile.read(int(contentLength)) data = self.rfile.read(int(content_length))
if "Host" in self.headers: if "Host" in self.headers:
del self.headers["Host"] del self.headers["Host"]
@ -114,11 +114,11 @@ class FileServerRequestHandler(BaseHTTPRequestHandler):
self.wfile.write(data) self.wfile.write(data)
if (path in self.server.dumpRequests or "/" in self.server.dumpRequests) and path != "/dummy": if (path in self.server.dumpRequests or "/" in self.server.dumpRequests) and path != "/dummy":
contentLength = self.headers.get('Content-Length') content_length = self.headers.get('Content-Length')
body = None body = None
if contentLength and int(contentLength) > 0: if content_length and int(content_length) > 0:
body = self.rfile.read(int(contentLength)) body = self.rfile.read(int(content_length))
print("===== Connection from:",self.client_address[0]) print("===== Connection from:",self.client_address[0])
print("%s %s %s" % (self.command, self.path, self.request_version)) print("%s %s %s" % (self.command, self.path, self.request_version))
@ -168,8 +168,9 @@ class HttpFileServer(HTTPServer):
headers = { headers = {
"Access-Control-Allow-Origin": "*", "Access-Control-Allow-Origin": "*",
} }
if mimeType: if mimeType:
headers["Content-Type"] = headers headers["Content-Type"] = mimeType
# return 200 - OK and data # return 200 - OK and data
self.addRoute(name, lambda req: (200, data, headers)) self.addRoute(name, lambda req: (200, data, headers))

12
util.py
View File

@ -107,13 +107,21 @@ def assert_not_empty(res, err=None):
exit_with_error(res, err) exit_with_error(res, err)
def assert_content_contains(res, data, err=None): def assert_content_contains(res, data, err=None):
util.assert_not_empty(res) assert_not_empty(res)
if isinstance(data, str) and data in res.text: if isinstance(data, str) and data in res.text:
return True return True
elif data in res.content: elif data in res.content:
return True return True
err = f"[-] '{res.url}' did not include '{data} in response" if err is None else err err = f"[-] '{res.url}' did not include '{data}' in response" if err is None else err
exit_with_error(res, err)
def assert_cookie_present(res, cookie_name, err=None):
assert_header_present(res, "Set-Cookie")
if cookie_name in res.cookies:
return True
err = f"[-] '{res.url}' did not set-cookie '{cookie_name}'" if err is None else err
exit_with_error(res, err) exit_with_error(res, err)
def assert_json_path(res, path, value, err=None): def assert_json_path(res, path, value, err=None):