sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-26 03:23:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add missing httpVersion in request render, avoid encoding to base64 unless binary data is included

Browse Source
This commit is contained in:
Louis-Philippe Huberdeau 2017-06-29 10:14:20 -04:00
parent dd19527e9c
commit b6969df52a
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/utils/collect.py
View File

@ -108,6 +108,7 @@ class Request:
def toDict(self): def toDict(self):
out = { out = {
"httpVersion": self.httpVersion,
"method": self.method, "method": self.method,
"url": self.url, "url": self.url,
"headers": [dict(name=key, value=value) for key, value in self.headers.items()], "headers": [dict(name=key, value=value) for key, value in self.headers.items()],
@ -160,16 +161,22 @@ class Response:
raw=raw) raw=raw)
def toDict(self): def toDict(self):
content = {
"mimeType": self.headers.get('Content-Type'),
"text": self.content,
}
binary = set(['\0', '\1'])
if any(c in binary for c in self.content):
content["encoding"] = "base64"
content["text"] = base64.b64encode(self.content)
return { return {
"httpVersion": self.httpVersion, "httpVersion": self.httpVersion,
"status": self.status, "status": self.status,
"statusText": self.statusText, "statusText": self.statusText,
"headers": [dict(name=key, value=value) for key, value in self.headers.items()], "headers": [dict(name=key, value=value) for key, value in self.headers.items()],
"content": { "content": content,
"mimeType": self.headers.get('Content-Type'),
"encoding": "base64",
"text": base64.b64encode(self.content),
},
"comment": self.comment, "comment": self.comment,
} }
@ -241,6 +248,7 @@ if __name__ == '__main__':
self.assertEqual("http://example.com/test.php", out["url"]) self.assertEqual("http://example.com/test.php", out["url"])
self.assertIn({"name": "Host", "value": "example.com"}, out["headers"]) self.assertIn({"name": "Host", "value": "example.com"}, out["headers"])
self.assertEqual("Hello World", out["comment"]) self.assertEqual("Hello World", out["comment"])
self.assertEqual("HTTP/1.1", out["httpVersion"])
def test_render_with_post_body(self): def test_render_with_post_body(self):
req = Request(method="POST", req = Request(method="POST",
@ -276,15 +284,26 @@ if __name__ == '__main__':
resp = Response(status=200, statusText="OK", resp = Response(status=200, statusText="OK",
httpVersion="HTTP/1.1", httpVersion="HTTP/1.1",
headers={"Content-Type": "text/html"}, headers={"Content-Type": "text/html"},
content="<html><body>Hello</body></html>\n") content="<html>\n<body>Hello</body>\n</html>")
out = resp.toDict() out = resp.toDict()
self.assertEqual(200, out["status"]) self.assertEqual(200, out["status"])
self.assertEqual("OK", out["statusText"]) self.assertEqual("OK", out["statusText"])
self.assertIn({"name": "Content-Type", "value": "text/html"}, out["headers"]) self.assertIn({"name": "Content-Type", "value": "text/html"}, out["headers"])
self.assertEqual(out["content"], { self.assertEqual(out["content"], {
"mimeType": "text/html", "mimeType": "text/html",
"text": "<html>\n<body>Hello</body>\n</html>",
})
def test_simple_body_contains_binary_data(self):
resp = Response(status=200, statusText="OK",
httpVersion="HTTP/1.1",
headers={"Content-Type": "application/octet-stream"},
content="test\0abc")
out = resp.toDict()
self.assertEqual(out["content"], {
"encoding": "base64", "encoding": "base64",
"text": "PGh0bWw+PGJvZHk+SGVsbG88L2JvZHk+PC9odG1sPgo=", "mimeType": "application/octet-stream",
"text": "dGVzdABhYmM=",
}) })
unittest.main(buffer=False) unittest.main(buffer=False)