Skip to content

fix(encoding): remove encoding for base64 encoded request #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fzipi merged 1 commit into from
Mar 24, 2021
Merged

fix(encoding): remove encoding for base64 encoded request #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions ftw/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,12 @@ def build_request(self):
'data': str(self.request_object.data),
'function': 'http.HttpResponse.build_request'
})
request = request.replace('#data#', util.ensure_str(data_bytes))
data = util.ensure_str(data_bytes)
else:
request = request.replace('#data#', '')
data = ''

request = request.replace('#data#', data).encode('utf-8', 'strict')

# If we have a Raw Request we should use that instead
if self.request_object.raw_request is not None:
if self.request_object.encoded_request is not None:
Expand All @@ -452,11 +455,12 @@ def build_request(self):
# We do this regardless of magic if you want to send a literal
# '\' 'r' or 'n' use encoded request.
request = request.decode('unicode_escape')

if self.request_object.encoded_request is not None:
request = base64.b64decode(self.request_object.encoded_request)
request = request.decode('unicode_escape')
# if we have an Encoded request we should use that
self.request = request.encode('utf-8', 'strict')

# Use the request created
self.request = util.ensure_binary(request)

def get_response(self):
"""
Expand Down
11 changes: 1 addition & 10 deletions test/integration/test_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ def test_both1():
def test_encoded1():
"""Test to make sure a encode request works"""
x = ruleset.Input(dest_addr='example.com',
encoded_request='R0VUIC8gSFRUUC8xLjFcclxuSG9zdDogZXhh'
'bXBsZS5jb21cclxuXHJcbg==')
encoded_request='R0VUIC8gSFRUUC8xLjENCkhvc3Q6IGV4YW1wbGUuY29tDQoNCgo=')
http_ua = http.HttpUA()
http_ua.send_request(x)
assert http_ua.response_object.status == 200
Expand Down Expand Up @@ -228,14 +227,6 @@ def test4():
assert http_ua.response_object.status == 200


def test5():
"""Basic GET without Host on 0.9 - Expect 505 version not supported"""
x = ruleset.Input(dest_addr='example.com', version='HTTP/0.9', headers={})
http_ua = http.HttpUA()
http_ua.send_request(x)
assert http_ua.response_object.status == 505


def test6():
"""Basic GET without Host with invalid version (request line) -
Expect 505 not supported"""
Expand Down