{% if result.avatar_server_http %}
-
-{{result.avatar_server_http}}
+
+http://{{result.avatar_server_http}}
{% if result.avatar_server_http_ipv4 %}
{{ result.avatar_server_http_ipv4 }}
@@ -66,8 +65,8 @@
{% if result.avatar_server_https %}
-
-{{result.avatar_server_https}}
+
+https://{{result.avatar_server_https}}
{% if result.avatar_server_https_ipv4 %}
{{ result.avatar_server_https_ipv4 }}
diff --git a/ivatar/tools/urls.py b/ivatar/tools/urls.py
index 9605ed4..1a13b43 100644
--- a/ivatar/tools/urls.py
+++ b/ivatar/tools/urls.py
@@ -8,4 +8,5 @@ from . views import CheckView, CheckDomainView
urlpatterns = [ # pylint: disable=invalid-name
url('check/', CheckView.as_view(), name='tools_check'),
url('check_domain/', CheckDomainView.as_view(), name='tools_check_domain'),
+ url('check_domain$', CheckDomainView.as_view(), name='tools_check_domain'),
]
diff --git a/ivatar/urls.py b/ivatar/urls.py
index 1609c9f..7ba926b 100644
--- a/ivatar/urls.py
+++ b/ivatar/urls.py
@@ -21,13 +21,10 @@ urlpatterns = [ # pylint: disable=invalid-name
url(
r'avatar/(?P
\w{32})',
AvatarImageView.as_view(), name='avatar_view'),
+ url(r'avatar/$', AvatarImageView.as_view(), name='avatar_view'),
url(
r'avatar/(?P\w*)',
- TemplateView.as_view(
- template_name='error.html',
- extra_context={
- 'errormessage': 'Incorrect digest length',
- })),
+ RedirectView.as_view(url='/static/img/deadbeef.png'), name='invalid_hash'),
url(
r'gravatarproxy/(?P\w*)',
GravatarProxyView.as_view(), name='gravatarproxy'),
diff --git a/ivatar/views.py b/ivatar/views.py
index 4c3ca58..b8c2743 100644
--- a/ivatar/views.py
+++ b/ivatar/views.py
@@ -22,6 +22,7 @@ import pagan
from robohash import Robohash
from ivatar.settings import AVATAR_MAX_SIZE, JPEG_QUALITY, DEFAULT_AVATAR_SIZE
+from ivatar.settings import CACHE_IMAGES_MAX_AGE
from . ivataraccount.models import ConfirmedEmail, ConfirmedOpenId
from . ivataraccount.models import pil_format, file_format
@@ -58,6 +59,11 @@ class AvatarImageView(TemplateView):
'''
# TODO: Do cache resize images!! Memcached?
+ def options(self, request, *args, **kwargs): # pylint: disable=too-many-branches,too-many-statements,too-many-locals,too-many-return-statements
+ response = HttpResponse("", content_type='text/plain')
+ response['Allow'] = "404 mm mp retro pagan wavatar monsterid robohash identicon"
+ return response
+
def get(self, request, *args, **kwargs): # pylint: disable=too-many-branches,too-many-statements,too-many-locals,too-many-return-statements
'''
Override get from parent class
@@ -142,9 +148,11 @@ class AvatarImageView(TemplateView):
data = BytesIO()
monsterdata.save(data, 'PNG', quality=JPEG_QUALITY)
data.seek(0)
- return HttpResponse(
+ response = HttpResponse(
data,
content_type='image/png')
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
if str(default) == 'robohash':
roboset = 'any'
@@ -155,9 +163,11 @@ class AvatarImageView(TemplateView):
data = BytesIO()
robohash.img.save(data, format='png')
data.seek(0)
- return HttpResponse(
+ response = HttpResponse(
data,
content_type='image/png')
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
if str(default) == 'retro':
identicon = Identicon.render(kwargs['digest'])
@@ -166,9 +176,11 @@ class AvatarImageView(TemplateView):
img = img.resize((size, size), Image.ANTIALIAS)
img.save(data, 'PNG', quality=JPEG_QUALITY)
data.seek(0)
- return HttpResponse(
+ response = HttpResponse(
data,
content_type='image/png')
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
if str(default) == 'pagan':
paganobj = pagan.Avatar(kwargs['digest'])
@@ -176,9 +188,11 @@ class AvatarImageView(TemplateView):
img = paganobj.img.resize((size, size), Image.ANTIALIAS)
img.save(data, 'PNG', quality=JPEG_QUALITY)
data.seek(0)
- return HttpResponse(
+ response = HttpResponse(
data,
content_type='image/png')
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
if str(default) == 'identicon':
p = Pydenticon5()
@@ -188,9 +202,11 @@ class AvatarImageView(TemplateView):
data = BytesIO()
img.save(data, 'PNG', quality=JPEG_QUALITY)
data.seek(0)
- return HttpResponse(
+ response = HttpResponse(
data,
content_type='image/png')
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
if str(default) == 'mm' or str(default) == 'mp':
# If mm is explicitly given, we need to catch that
@@ -226,9 +242,11 @@ class AvatarImageView(TemplateView):
obj.save()
if imgformat == 'jpg':
imgformat = 'jpeg'
- return HttpResponse(
+ response = HttpResponse(
data,
content_type='image/%s' % imgformat)
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
class GravatarProxyView(View):
'''
@@ -297,9 +315,11 @@ class GravatarProxyView(View):
data = BytesIO(gravatarimagedata.read())
img = Image.open(data)
data.seek(0)
- return HttpResponse(
+ response = HttpResponse(
data.read(),
content_type='image/%s' % file_format(img.format))
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
except ValueError as exc:
print('Value error: %s' % exc)
diff --git a/libravatarproxy.py b/libravatarproxy.py
new file mode 100755
index 0000000..eb19fc8
--- /dev/null
+++ b/libravatarproxy.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+
+import urllib.request
+import sys
+import os
+
+sys.stderr.buffer.write(b'%s' % bytes(os.environ.get("QUERY_STRING", "No Query String in url"), 'utf-8'))
+
+link = 'https://www.libravatar.org/avatar/%s' % os.environ.get("QUERY_STRING", 'x'*32)
+sys.stderr.buffer.write(b'%s' % bytes(link, 'utf-8'))
+
+data = None
+with urllib.request.urlopen(link) as f:
+ data = f.read()
+
+for header in f.headers._headers:
+ if header[0] == 'Content-Type':
+ sys.stdout.buffer.write(b"%s: %s\n\n" % (bytes(header[0], 'utf-8'), bytes(header[1], 'utf-8')))
+ sys.stdout.flush()
+ break
+
+sys.stdout.buffer.write(data)
diff --git a/requirements.txt b/requirements.txt
index d2bdc99..760b3df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,7 +30,7 @@ wheel
yapf
django-anymail[mailgun]
mysqlclient
-psycopg2
+psycopg2-binary
notsetuptools
git+https://github.com/ofalk/monsterid.git
git+https://github.com/ofalk/Robohash.git@devel
diff --git a/templates/contact.html b/templates/contact.html
index af10e2a..5fdbfb5 100644
--- a/templates/contact.html
+++ b/templates/contact.html
@@ -30,6 +30,10 @@ If you've got a proposal to discuss or prefer to write to us, you can join our <
You can also put short notices to our attention on Identica or Twitter.
+Mastodon
+
+Our Mastodon profile is available on https://photog.social/@libravatar.
+
Email
Finally, if you need to email us: dev@libravatar.org
diff --git a/templates/header.html b/templates/header.html
index 5015f04..f197514 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -31,6 +31,7 @@
{% endif %}
{% endif %}
+
diff --git a/templates/home.html b/templates/home.html
index d517b0e..84ad794 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -37,7 +37,7 @@