external-repos/ivatar
1
0
Fork 0
mirror of https://git.linux-kernel.at/oliver/ivatar.git synced 2025-11-18 05:58:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into 'master'

Browse Source 
Redir to deadbeef if hash is wrong

See merge request oliver/ivatar!140
This commit is contained in:
Oliver Falk
2019-03-21 16:39:57 +01:00
parent 2f691d57e9 911d0b56a5
commit 02aba96a87
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ivatar/test_views.py
View File

@@ -61,5 +61,8 @@ class Tester(TestCase): # pylint: disable=too-many-public-methods
""" """
Test incorrect digest Test incorrect digest
""" """
response = self.client.get('/avatar/%s' % 'x'*65) response = self.client.get('/avatar/%s' % 'x'*65, follow=True)
self.assertEqual(response.status_code, 200, 'no 200 ok?') self.assertRedirects(
response=response,
expected_url='/static/img/deadbeef.png',
msg_prefix='Why does an invalid hash not redirect to deadbeef?')

6
ivatar/urls.py
View File

@@ -24,11 +24,7 @@ urlpatterns = [ # pylint: disable=invalid-name
url(r'avatar/$', AvatarImageView.as_view(), name='avatar_view'), url(r'avatar/$', AvatarImageView.as_view(), name='avatar_view'),
url( url(
r'avatar/(?P<digest>\w*)', r'avatar/(?P<digest>\w*)',
TemplateView.as_view( RedirectView.as_view(url='/static/img/deadbeef.png'), name='invalid_hash'),
template_name='error.html',
extra_context={
'errormessage': 'Incorrect digest length',
})),
url( url(
r'gravatarproxy/(?P<digest>\w*)', r'gravatarproxy/(?P<digest>\w*)',
GravatarProxyView.as_view(), name='gravatarproxy'), GravatarProxyView.as_view(), name='gravatarproxy'),