darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 14:09:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure pdf letter filename is ascii encoded and decoded

Browse Source 
S3 can only handle ascii characters, therefore for filename which could
include non ascii characters, for example a filename with the character
'£' in it, we must encode these using urllib before saving it as s3
metadata. We then also make sure that it comes back decoded when
presenting it to the user.
This commit is contained in:
David McDonald
2020-05-18 15:26:35 +01:00
parent 1fb31a8861
commit 7923760345
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/s3_client/s3_letter_upload_client.py
View File

@@ -21,10 +21,12 @@ def upload_letter_to_s3(
invalid_pages=None,
recipient=None
):
# Use of urllib.parse.quote encodes metadata into ascii, which is required by s3.
# Making sure data for displaying to users is decoded is taken care of by LetterMetadata
metadata = {
'status': status,
'page_count': str(page_count),
'filename': filename,
'filename': urllib.parse.quote(filename),
}
if message:
metadata['message'] = message
@@ -42,18 +44,8 @@ def upload_letter_to_s3(
)
def get_letter_pdf_and_metadata(service_id, file_id):
file_location = get_transient_letter_file_location(service_id, file_id)
s3 = resource('s3')
s3_object = s3.Object(current_app.config['TRANSIENT_UPLOADED_LETTERS'], file_location).get()
pdf = s3_object['Body'].read()
return pdf, LetterMetadata(s3_object['Metadata'])
class LetterMetadata:
KEYS_TO_DECODE = []
KEYS_TO_DECODE = ["filename"]
def __init__(self, metadata):
self._metadata = metadata
@@ -64,6 +56,16 @@ class LetterMetadata:
return self._metadata.get(key, default)
def get_letter_pdf_and_metadata(service_id, file_id):
file_location = get_transient_letter_file_location(service_id, file_id)
s3 = resource('s3')
s3_object = s3.Object(current_app.config['TRANSIENT_UPLOADED_LETTERS'], file_location).get()
pdf = s3_object['Body'].read()
return pdf, LetterMetadata(s3_object['Metadata'])
def get_letter_metadata(service_id, file_id):
file_location = get_transient_letter_file_location(service_id, file_id)
s3 = resource('s3')