Do not crash on an invalid WebService id or an unknown WebService slug

fixes #6015
This commit is contained in:
Benjamin Dauvergne 2014-12-04 00:21:37 +01:00
parent ffd71df9a8
commit 9b7d3cec1b
1 changed files with 5 additions and 2 deletions

View File

@ -108,8 +108,11 @@ class Authorize(Authorize):
def ws_proxy(request, ws_id):
try:
ws = models.WebService.objects.get(id=ws_id)
except models.WebService.DoesNotExist:
ws = models.WebService.objects.get(slug=ws_id)
except (ValueError, models.WebService.DoesNotExist):
try:
ws = models.WebService.objects.get(slug=ws_id)
except models.WebService.DoesNotExist:
return Response({'error': 'web service id not found'}, status=404)
ctx = RequestContext(request)
url = ws.get_url(ctx)
logger.debug('proxy to URL %r', url)