Skip to content

Better error when url leads to bad results #44

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
merged 1 commit into from
Feb 14, 2018
Merged

Better error when url leads to bad results #44

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
9 changes: 9 additions & 0 deletions package/cloudshell/cm/customscript/domain/script_downloader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,17 @@ def download(self, url, auth):
file_txt += ''.join(chunk)
self.cancel_sampler.throw_if_canceled()

self._validate_response(response, file_txt)

return ScriptFile(name=file_name, text=file_txt)

def _validate_response(self, response, content):
if response.status_code < 200 or response.status_code > 300:
raise Exception('Failed to download script file: '+str(response.status_code)+' '+response.reason)

if content.lstrip('\n\r').lower().startswith('<!doctype html>'):
raise Exception('Failed to download script file: url points to an html file')

def _get_filename(self, response):
file_name = None
for header_value, pattern in self.filename_patterns.iteritems():
Expand Down