Skip to content

fix potential none reference and truncated response body when loading static files #10

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

Open
snowbldr wants to merge 16 commits into
base: master
Choose a base branch
from
Open

fix potential none reference and truncated response body when loading static files #10

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fef1c91
fix potential none reference
snowbldr Jan 4, 2021
38b38bf
initialize necessary variables in environ in case they didn't come fr…
snowbldr Jan 4, 2021
4910b24
Join all of the parts of the iterator to get the entire response inst…
snowbldr Jan 7, 2021
8fec411
base64 encode all response bodies
snowbldr Jan 20, 2021
34d5d3c
only base64 encode binary data
snowbldr Jan 21, 2021
9709318
use in instead of contains
snowbldr Jan 21, 2021
a8ca450
and not or...
snowbldr Jan 21, 2021
11ae551
also exclude javascript and anything with a charset because that's ob…
snowbldr Jan 21, 2021
9096747
dont' always set base64 encoded to true
snowbldr Jan 21, 2021
df0777f
don't base64 encode, it doesn't work...
snowbldr Jan 21, 2021
ab31c3c
debugging
snowbldr Jan 22, 2021
3572dcb
context is not serializable
snowbldr Jan 22, 2021
bc8af0a
don't pretty print because it's hard to read in cloudwatch
snowbldr Jan 24, 2021
114f2ad
print the response for debugging
snowbldr Jan 25, 2021
8da2e39
remove debug logging
snowbldr Jan 29, 2021
e097c7f
base64 encode response body it's it's not text
snowbldr Jan 29, 2021
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
45 changes: 32 additions & 13 deletions flask_lambda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# under the License.

import sys
import base64

try:
from urllib import urlencode
Expand All @@ -38,16 +39,21 @@


def make_environ(event):
environ = {}

for hdr_name, hdr_value in event['headers'].items():
hdr_name = hdr_name.replace('-', '_').upper()
if hdr_name in ['CONTENT_TYPE', 'CONTENT_LENGTH']:
environ[hdr_name] = hdr_value
continue

http_hdr_name = 'HTTP_%s' % hdr_name
environ[http_hdr_name] = hdr_value
environ = {
'HTTP_HOST': '',
'HTTP_X_FORWARDED_PORT': '',
'HTTP_X_FORWARDED_PROTO': ''
}

if event['headers'] is not None:
for hdr_name, hdr_value in event['headers'].items():
hdr_name = hdr_name.replace('-', '_').upper()
if hdr_name in ['CONTENT_TYPE', 'CONTENT_LENGTH']:
environ[hdr_name] = hdr_value
continue

http_hdr_name = 'HTTP_%s' % hdr_name
environ[http_hdr_name] = hdr_value

qs = event['queryStringParameters']

Expand Down Expand Up @@ -98,13 +104,26 @@ def __call__(self, event, context):

response = LambdaResponse()

body = next(self.wsgi_app(
body = b''.join(self.wsgi_app(
Copy link

@cooperaj cooperaj Jan 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change here fixed the issue we've been having for days.

204 response codes in Werkzeug break next as the iterator that's returned is wrong somehow. Doing this instead works just fine.

Copy link
Author

@snowbldr snowbldr Jan 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Glad to hear it. This had me stumped for a while too.

Copy link

@anthonyeden anthonyeden Aug 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this! Fixed an issue I was having with OPTIONS requests.

make_environ(event),
response.start_response
))

return {
res = {
'statusCode': response.status,
'headers': response.response_headers,
'body': body
'body': body,
'isBase64Encoded': False
}

content_type = response.response_headers['Content-Type']
if 'text' not in content_type \
and 'json' not in content_type \
and 'xml' not in content_type\
and 'javascript' not in content_type\
and 'charset=' not in content_type:
res['body'] = base64.b64encode(body).decode('utf-8')
res['isBase64Encoded'] = True

print(response.response_headers)
return res