Skip to content

Fix an exception with 0-size test cases in the viewer handler. #666

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
mbarbella-chromium merged 3 commits into from
Jul 9, 2019
+12 −5
Merged

Fix an exception with 0-size test cases in the viewer handler. #666

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
843dc8d
Fix an exception with 0-size test cases in the viewer handler.
mbarbella-chromium Jul 9, 2019
4220729
Remove unicode hack.
mbarbella-chromium Jul 9, 2019
e46d25e
Revert "Remove unicode hack."
mbarbella-chromium Jul 9, 2019
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
17 changes: 12 additions & 5 deletions src/appengine/handlers/viewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,20 @@ def get(self):
if not access.has_access():
raise helpers.AccessDeniedException()

if blobs.get_blob_size(key) > MAX_ALLOWED_CONTENT_SIZE:
blob_size = blobs.get_blob_size(key)
if blob_size > MAX_ALLOWED_CONTENT_SIZE:
raise helpers.EarlyExitException('Content exceeds max allowed size.', 400)

try:
content = unicode(blobs.read_key(key), errors='replace')
except Exception:
raise helpers.EarlyExitException('Failed to read content.', 400)
# TODO(mbarbella): Workaround for an issue in the Cloud Storage API. Remove
# once it is fixed properly upstream:
# https://github.com/googleapis/google-cloud-python/issues/6572
if blob_size:
try:
content = unicode(blobs.read_key(key), errors='replace')
Copy link
Collaborator

@inferno-chromium inferno-chromium Jul 9, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

maybe remove this unicode replacement hack along the way and fix https://bugs.chromium.org/p/chromium/issues/detail?id=920160 :) stage to make sure it works.

Copy link
Contributor Author

@mbarbella-chromium mbarbella-chromium Jul 9, 2019

Choose a reason for hiding this comment

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

SGTM.

Copy link
Contributor Author

@mbarbella-chromium mbarbella-chromium Jul 9, 2019

Choose a reason for hiding this comment

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

Seems to cause issues later in template rendering, which I guess explains why we had the hack initially. I'm going to leave it out of this change.

except Exception:
raise helpers.EarlyExitException('Failed to read content.', 400)
else:
content = u''

line_count = len(content.splitlines())
size = len(content)
Expand Down