backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00
Code Issues Projects Releases Activity

FrontendApp: forward HTTP status of CDX backend (#624)

Browse Source 
* FrontendApp: forward HTTP status of CDX backend to allow clients
to handle errors more easily

* WarcServer: keep the HTTP status lines short
- append the exception message only if the status isn't a string
  (WbException and inherited classes already have nice status string)
- avoid overlong status lines, eg.
   HTTP/1.1 404 Not Found No Captures found for: https://very-long.url/...
This commit is contained in:
Sebastian Nagel 2021-04-27 05:35:28 +02:00 committed by GitHub
parent c62b1bc987
commit 13ea5baee5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pywb/apps/frontendapp.py
View File

@ -404,10 +404,12 @@ class FrontEndApp(object):
try: try:
res = requests.get(cdx_url, stream=True) res = requests.get(cdx_url, stream=True)
status_line = '{} {}'.format(res.status_code, res.reason)
content_type = res.headers.get('Content-Type') content_type = res.headers.get('Content-Type')
return WbResponse.bin_stream(StreamIter(res.raw), return WbResponse.bin_stream(StreamIter(res.raw),
content_type=content_type) content_type=content_type,
status=status_line)
except Exception as e: except Exception as e:
return WbResponse.text_response('Error: ' + str(e), status='400 Bad Request') return WbResponse.text_response('Error: ' + str(e), status='400 Bad Request')

5
pywb/warcserver/basewarcserver.py
View File

@ -141,6 +141,9 @@ class BaseWarcServer(object):
out_headers['ResErrors'] = res[0] out_headers['ResErrors'] = res[0]
message = message.encode('utf-8') message = message.encode('utf-8')
message = str(status) + ' ' + message if isinstance(status, str):
message = status
else:
message = str(status) + ' ' + message
start_response(message, list(out_headers.items())) start_response(message, list(out_headers.items()))
return res return res