From 07ba1c5a05e21d133c30944b0f79375da3be0cc3 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 4 Mar 2020 13:35:07 +0100 Subject: [PATCH 01/42] Cache some Gravatar results (failed fetch + default to reduce the number of requests and therfore roundtrip --- ivatar/views.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ivatar/views.py b/ivatar/views.py index f1efbbe..ab489d9 100644 --- a/ivatar/views.py +++ b/ivatar/views.py @@ -10,6 +10,7 @@ from ssl import SSLError from django.views.generic.base import TemplateView, View from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound from django.core.exceptions import ObjectDoesNotExist +from django.core.cache import cache from django.utils.translation import ugettext_lazy as _ from django.urls import reverse_lazy from django.db.models import Q @@ -147,8 +148,6 @@ class AvatarImageView(TemplateView): + '?s=%i' % size + '&default=%s&f=y' % default return HttpResponseRedirect(url) - - if str(default) == str(404): return HttpResponseNotFound(_('

Image not found

')) @@ -291,10 +290,14 @@ class GravatarProxyView(View): # redirect to our default instead. gravatar_test_url = 'https://secure.gravatar.com/avatar/' + kwargs['digest'] \ + '?s=%i' % 50 + if cache.get(gravatar_test_url) == 'default': + print("Cached Gravatar response: Default.") + return redir_default(default) try: testdata = urlopen(gravatar_test_url, timeout=URL_TIMEOUT) data = BytesIO(testdata.read()) if hashlib.md5(data.read()).hexdigest() == '71bc262d627971d13fe6f3180b93062a': + cache.set(gravatar_test_url, 'default', 60) return redir_default(default) except Exception as exc: print('Gravatar test url fetch failed: %s' % exc) @@ -303,22 +306,29 @@ class GravatarProxyView(View): + '?s=%i' % size + '&d=%s' % default try: + if cache.get(gravatar_url) == 'err': + print('Cached Gravatar fetch failed with URL error') + return redir_default(default) + gravatarimagedata = urlopen(gravatar_url, timeout=URL_TIMEOUT) except HTTPError as exc: if exc.code != 404 and exc.code != 503: print( 'Gravatar fetch failed with an unexpected %s HTTP error' % exc.code) + cache.set(gravatar_url, 'err', 30) return redir_default(default) except URLError as exc: print( 'Gravatar fetch failed with URL error: %s' % exc.reason) + cache.set(gravatar_url, 'err', 30) return redir_default(default) except SSLError as exc: print( 'Gravatar fetch failed with SSL error: %s' % exc.reason) + cache.set(gravatar_url, 'err', 30) return redir_default(default) try: data = BytesIO(gravatarimagedata.read()) From 476bddb21c13fdc6ab9d6913bd092cd4bc99d9d7 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 4 Mar 2020 14:23:58 +0100 Subject: [PATCH 02/42] A caching HttpResponse in order to reduce the roundtrip (a lot) --- config.py | 5 +++++ ivatar/views.py | 46 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/config.py b/config.py index 598182c..e195e08 100644 --- a/config.py +++ b/config.py @@ -185,6 +185,11 @@ CACHES = { 'LOCATION': [ '127.0.0.1:11211', ], + }, + 'filesystem': { + 'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', + 'LOCATION': '/var/tmp/ivatar_cache', + 'TIMEOUT': 300, } } diff --git a/ivatar/views.py b/ivatar/views.py index ab489d9..efe8ea3 100644 --- a/ivatar/views.py +++ b/ivatar/views.py @@ -10,7 +10,7 @@ from ssl import SSLError from django.views.generic.base import TemplateView, View from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound from django.core.exceptions import ObjectDoesNotExist -from django.core.cache import cache +from django.core.cache import cache, caches from django.utils.translation import ugettext_lazy as _ from django.urls import reverse_lazy from django.db.models import Q @@ -55,6 +55,17 @@ def get_size(request, size=DEFAULT_AVATAR_SIZE): return size +class CachingHttpResponse(HttpResponse): + def __init__(self, uri, content=b'', content_type=None, status=200, reason=None, charset=None): + caches['filesystem'].set(uri, { + 'content': content, + 'content_type': content_type, + 'status': status, + 'reason': reason, + 'charset': charset + }) + return super().__init__(content, content_type, status, reason, charset) + class AvatarImageView(TemplateView): ''' View to return (binary) image, based on OpenID/Email (both by digest) @@ -78,6 +89,18 @@ class AvatarImageView(TemplateView): forcedefault = False gravatarredirect = False gravatarproxy = True + uri = request.build_absolute_uri() + + # Check the cache first + centry = caches['filesystem'].get(uri) + if centry: + # For DEBUG purpose only print('Cached entry for %s' % uri) + return HttpResponse( + centry['content'], + content_type=centry['content_type'], + status=centry['status'], + reason = centry['reason'], + charset = centry['charset']) # In case no digest at all is provided, return to home page if not 'digest' in kwargs: @@ -156,7 +179,8 @@ class AvatarImageView(TemplateView): data = BytesIO() monsterdata.save(data, 'PNG', quality=JPEG_QUALITY) data.seek(0) - response = HttpResponse( + response = CachingHttpResponse( + uri, data, content_type='image/png') response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE @@ -171,7 +195,8 @@ class AvatarImageView(TemplateView): data = BytesIO() robohash.img.save(data, format='png') data.seek(0) - response = HttpResponse( + response = CachingHttpResponse( + uri, data, content_type='image/png') response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE @@ -184,7 +209,8 @@ class AvatarImageView(TemplateView): img = img.resize((size, size), Image.ANTIALIAS) img.save(data, 'PNG', quality=JPEG_QUALITY) data.seek(0) - response = HttpResponse( + response = CachingHttpResponse( + uri, data, content_type='image/png') response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE @@ -196,7 +222,8 @@ class AvatarImageView(TemplateView): img = paganobj.img.resize((size, size), Image.ANTIALIAS) img.save(data, 'PNG', quality=JPEG_QUALITY) data.seek(0) - response = HttpResponse( + response = CachingHttpResponse( + uri, data, content_type='image/png') response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE @@ -210,7 +237,8 @@ class AvatarImageView(TemplateView): data = BytesIO() img.save(data, 'PNG', quality=JPEG_QUALITY) data.seek(0) - response = HttpResponse( + response = CachingHttpResponse( + uri, data, content_type='image/png') response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE @@ -250,7 +278,8 @@ class AvatarImageView(TemplateView): obj.save() if imgformat == 'jpg': imgformat = 'jpeg' - response = HttpResponse( + response = CachingHttpResponse( + uri, data, content_type='image/%s' % imgformat) response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE @@ -334,7 +363,8 @@ class GravatarProxyView(View): data = BytesIO(gravatarimagedata.read()) img = Image.open(data) data.seek(0) - response = HttpResponse( + response = CachingHttpResponse( + uri, data.read(), content_type='image/%s' % file_format(img.format)) response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE From b463f9f95a59cbe0ca575dbccea7e4b7d20e9b93 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 4 Mar 2020 14:30:28 +0100 Subject: [PATCH 03/42] Add setting to easily be able to disable the response caching --- config.py | 4 +++- ivatar/views.py | 36 +++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/config.py b/config.py index e195e08..d49cedf 100644 --- a/config.py +++ b/config.py @@ -194,5 +194,7 @@ CACHES = { } # This is 5 minutes caching for generated/resized images, -# so the sites don't hit ivatar so much +# so the sites don't hit ivatar so much - it's what's set in the HTTP header CACHE_IMAGES_MAX_AGE = 5 * 60 + +CACHE_RESPONSE = False diff --git a/ivatar/views.py b/ivatar/views.py index efe8ea3..ebb4e94 100644 --- a/ivatar/views.py +++ b/ivatar/views.py @@ -23,7 +23,7 @@ from pydenticon5 import Pydenticon5 import pagan from robohash import Robohash -from ivatar.settings import AVATAR_MAX_SIZE, JPEG_QUALITY, DEFAULT_AVATAR_SIZE +from ivatar.settings import AVATAR_MAX_SIZE, JPEG_QUALITY, DEFAULT_AVATAR_SIZE, CACHE_RESPONSE from ivatar.settings import CACHE_IMAGES_MAX_AGE from . ivataraccount.models import ConfirmedEmail, ConfirmedOpenId from . ivataraccount.models import pil_format, file_format @@ -57,13 +57,14 @@ def get_size(request, size=DEFAULT_AVATAR_SIZE): class CachingHttpResponse(HttpResponse): def __init__(self, uri, content=b'', content_type=None, status=200, reason=None, charset=None): - caches['filesystem'].set(uri, { - 'content': content, - 'content_type': content_type, - 'status': status, - 'reason': reason, - 'charset': charset - }) + if CACHE_RESPONSE: + caches['filesystem'].set(uri, { + 'content': content, + 'content_type': content_type, + 'status': status, + 'reason': reason, + 'charset': charset + }) return super().__init__(content, content_type, status, reason, charset) class AvatarImageView(TemplateView): @@ -92,15 +93,16 @@ class AvatarImageView(TemplateView): uri = request.build_absolute_uri() # Check the cache first - centry = caches['filesystem'].get(uri) - if centry: - # For DEBUG purpose only print('Cached entry for %s' % uri) - return HttpResponse( - centry['content'], - content_type=centry['content_type'], - status=centry['status'], - reason = centry['reason'], - charset = centry['charset']) + if CACHE_RESPONSE: + centry = caches['filesystem'].get(uri) + if centry: + # For DEBUG purpose only print('Cached entry for %s' % uri) + return HttpResponse( + centry['content'], + content_type=centry['content_type'], + status=centry['status'], + reason = centry['reason'], + charset = centry['charset']) # In case no digest at all is provided, return to home page if not 'digest' in kwargs: From 6bc0390b48d1ae31e56fa25ff1496e71d5d909bf Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 4 Mar 2020 15:11:05 +0100 Subject: [PATCH 04/42] Fix some debug prints + HttpResponse for Gravatar --- config.py | 7 ++++--- ivatar/views.py | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config.py b/config.py index d49cedf..ea17ac4 100644 --- a/config.py +++ b/config.py @@ -143,9 +143,6 @@ if 'POSTGRESQL_DATABASE' in os.environ: 'HOST': 'postgresql', } -if os.path.isfile(os.path.join(BASE_DIR, 'config_local.py')): - from config_local import * # noqa # flake8: noqa # NOQA # pragma: no cover - SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer' USE_X_FORWARDED_HOST = True @@ -198,3 +195,7 @@ CACHES = { CACHE_IMAGES_MAX_AGE = 5 * 60 CACHE_RESPONSE = False + +# This MUST BE THE LAST! +if os.path.isfile(os.path.join(BASE_DIR, 'config_local.py')): + from config_local import * # noqa # flake8: noqa # NOQA # pragma: no cover diff --git a/ivatar/views.py b/ivatar/views.py index ebb4e94..a206bfc 100644 --- a/ivatar/views.py +++ b/ivatar/views.py @@ -322,7 +322,8 @@ class GravatarProxyView(View): gravatar_test_url = 'https://secure.gravatar.com/avatar/' + kwargs['digest'] \ + '?s=%i' % 50 if cache.get(gravatar_test_url) == 'default': - print("Cached Gravatar response: Default.") + # DEBUG only + # print("Cached Gravatar response: Default.") return redir_default(default) try: testdata = urlopen(gravatar_test_url, timeout=URL_TIMEOUT) @@ -365,8 +366,7 @@ class GravatarProxyView(View): data = BytesIO(gravatarimagedata.read()) img = Image.open(data) data.seek(0) - response = CachingHttpResponse( - uri, + response = HttpResponse( data.read(), content_type='image/%s' % file_format(img.format)) response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE From 060a664d26c1677e014e29347598a75a26431b2d Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 4 Mar 2020 15:25:18 +0100 Subject: [PATCH 05/42] Make response caching default and increase cache timeout to 15 minutes --- config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index ea17ac4..948b1b1 100644 --- a/config.py +++ b/config.py @@ -186,7 +186,7 @@ CACHES = { 'filesystem': { 'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', 'LOCATION': '/var/tmp/ivatar_cache', - 'TIMEOUT': 300, + 'TIMEOUT': 900, # 15 minutes } } @@ -194,7 +194,7 @@ CACHES = { # so the sites don't hit ivatar so much - it's what's set in the HTTP header CACHE_IMAGES_MAX_AGE = 5 * 60 -CACHE_RESPONSE = False +CACHE_RESPONSE = True # This MUST BE THE LAST! if os.path.isfile(os.path.join(BASE_DIR, 'config_local.py')): From ea900c0109d52bf98a9726a28268e91c5cfb3d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Sch=C3=B6nsgibl?= Date: Sun, 12 Apr 2020 20:54:52 +0200 Subject: [PATCH 06/42] Update libravatar_base.css --- ivatar/static/css/libravatar_base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivatar/static/css/libravatar_base.css b/ivatar/static/css/libravatar_base.css index cb0d569..19b5037 100644 --- a/ivatar/static/css/libravatar_base.css +++ b/ivatar/static/css/libravatar_base.css @@ -670,7 +670,7 @@ color:#335ECF; } footer { height: 8rem; - position: absolute; + position: relative; bottom: 0; } footer .container { From 2535cefa6ca709137d17873f72e9d733558ced8d Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Tue, 21 Apr 2020 16:07:53 +0200 Subject: [PATCH 07/42] New avatar option mmng (Mistery Man Next Generation (NextGen). Related to #63 --- ivatar/tools/forms.py | 1 + ivatar/utils.py | 56 +++++++++++++++++++++++++++++++++++++++++++ ivatar/views.py | 13 ++++++++++ 3 files changed, 70 insertions(+) diff --git a/ivatar/tools/forms.py b/ivatar/tools/forms.py index e136f82..84e603e 100644 --- a/ivatar/tools/forms.py +++ b/ivatar/tools/forms.py @@ -69,6 +69,7 @@ class CheckForm(forms.Form): ('monsterid', _('Monster style')), ('identicon', _('Identicon style')), ('mm', _('Mystery man')), + ('mmng', _('Mystery man NextGen')), ('none', _('None')), ], ) diff --git a/ivatar/utils.py b/ivatar/utils.py index 877412d..ae4c8f4 100644 --- a/ivatar/utils.py +++ b/ivatar/utils.py @@ -3,6 +3,7 @@ Simple module providing reusable random_string function ''' import random import string +from PIL import Image, ImageDraw def random_string(length=10): @@ -33,3 +34,58 @@ def openid_variations(openid): var2 = openid.replace('http://', 'https://') var3 = var2[0:-1] return (openid, var1, var2, var3) + +def mm_ng(hash, size=80, add_red=0, add_green=0, add_blue=0): + ''' + Return an MM (mystery man) image, based on a given hash + add some red, green or blue, if specified + ''' + + # Make sure the lightest bg color we paint is e0, else + # we do not see the MM any more + if hash[0] == 'f': hash = 'e0' + + # How large is the circle? + circlesize = size*0.6 + + # Coordinates for the circle + start_x = int(size*0.2) + end_x = start_x+circlesize + start_y = int(size*0.05) + end_y = start_y+circlesize + + # All are the same, based on the input hash + # this should always result in a "gray-ish" background + red = hash[0:2] + green = hash[0:2] + blue = hash[0:2] + + # Add some red (i/a) and make sure it's not over 255 + red = hex(int(red, 16)+add_red).replace('0x', '') + if int(red, 16)>255: red='ff' + + # Add some green (i/a) and make sure it's not over 255 + green = hex(int(green, 16)+add_green).replace('0x', '') + if int(green, 16)>255: green='ff' + + # Add some blue (i/a) and make sure it's not over 255 + blue = hex(int(blue, 16)+add_blue).replace('0x', '') + if int(blue, 16)>255: blue='ff' + + # Assemable the bg color "string" in webnotation. Eg. '#d3d3d3' + bg_color = '#' + red + green + blue + + # Image + image = Image.new('RGB', (size, size)) + draw = ImageDraw.Draw(image) + + # Draw background + draw.rectangle(((0,0), (size, size)), fill=bg_color) + + # Draw MMs head + draw.ellipse((start_x, start_y, end_x, end_y), fill='white') + + # Draw MMs 'body' + draw.polygon(((start_x+circlesize/2, size/2.5), (size*0.15, size), (size-size*0.15, size)), fill='white') + + return image diff --git a/ivatar/views.py b/ivatar/views.py index a206bfc..4c97939 100644 --- a/ivatar/views.py +++ b/ivatar/views.py @@ -27,6 +27,7 @@ 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 +from . utils import mm_ng URL_TIMEOUT = 5 # in seconds @@ -246,6 +247,18 @@ class AvatarImageView(TemplateView): response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE return response + if str(default) == 'mmng': + mmngimg = mm_ng(hash=kwargs['digest'], size=size) + data = BytesIO() + mmngimg.save(data, 'PNG', quality=JPEG_QUALITY) + data.seek(0) + response = CachingHttpResponse( + uri, + 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 static_img = path.join('static', 'img', 'mm', '%s%s' % (str(size), '.png')) From 91d1193e23d60432da783b02d137f6b0351d5805 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Thu, 23 Apr 2020 10:52:14 +0200 Subject: [PATCH 08/42] Allow + and - in mail addr (before the @ - Issue #65 --- ivatar/ivataraccount/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivatar/ivataraccount/urls.py b/ivatar/ivataraccount/urls.py index eff7b6b..f3bfbfa 100644 --- a/ivatar/ivataraccount/urls.py +++ b/ivatar/ivataraccount/urls.py @@ -100,7 +100,7 @@ urlpatterns = [ # pylint: disable=invalid-name r'import_photo/$', ImportPhotoView.as_view(), name='import_photo'), url( - r'import_photo/(?P[\w.]+@[\w.]+.[\w.]+)', + r'import_photo/(?P[\w.+-]+@[\w.]+.[\w.]+)', ImportPhotoView.as_view(), name='import_photo'), url( r'import_photo/(?P\d+)', From 0262ad850f6a7274c8ad7988cb61a08a3c12ae98 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 6 May 2020 13:07:19 +0200 Subject: [PATCH 09/42] Fix some pylint issues and issue with single digit colors --- ivatar/utils.py | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/ivatar/utils.py b/ivatar/utils.py index ae4c8f4..3ed3f03 100644 --- a/ivatar/utils.py +++ b/ivatar/utils.py @@ -35,7 +35,7 @@ def openid_variations(openid): var3 = var2[0:-1] return (openid, var1, var2, var3) -def mm_ng(hash, size=80, add_red=0, add_green=0, add_blue=0): +def mm_ng(idhash, size=80, add_red=0, add_green=0, add_blue=0): #pylint: disable=too-many-locals ''' Return an MM (mystery man) image, based on a given hash add some red, green or blue, if specified @@ -43,7 +43,8 @@ def mm_ng(hash, size=80, add_red=0, add_green=0, add_blue=0): # Make sure the lightest bg color we paint is e0, else # we do not see the MM any more - if hash[0] == 'f': hash = 'e0' + if idhash[0] == 'f': + idhash = 'e0' # How large is the circle? circlesize = size*0.6 @@ -56,21 +57,30 @@ def mm_ng(hash, size=80, add_red=0, add_green=0, add_blue=0): # All are the same, based on the input hash # this should always result in a "gray-ish" background - red = hash[0:2] - green = hash[0:2] - blue = hash[0:2] + red = idhash[0:2] + green = idhash[0:2] + blue = idhash[0:2] # Add some red (i/a) and make sure it's not over 255 red = hex(int(red, 16)+add_red).replace('0x', '') - if int(red, 16)>255: red='ff' + if int(red, 16) > 255: + red = 'ff' + if len(red) == 1: + red = '0%s' % red # Add some green (i/a) and make sure it's not over 255 green = hex(int(green, 16)+add_green).replace('0x', '') - if int(green, 16)>255: green='ff' + if int(green, 16) > 255: + green = 'ff' + if len(green) == 1: + green = '0%s' % green # Add some blue (i/a) and make sure it's not over 255 blue = hex(int(blue, 16)+add_blue).replace('0x', '') - if int(blue, 16)>255: blue='ff' + if int(blue, 16) > 255: + blue = 'ff' + if len(blue) == 1: + blue = '0%s' % blue # Assemable the bg color "string" in webnotation. Eg. '#d3d3d3' bg_color = '#' + red + green + blue @@ -80,12 +90,16 @@ def mm_ng(hash, size=80, add_red=0, add_green=0, add_blue=0): draw = ImageDraw.Draw(image) # Draw background - draw.rectangle(((0,0), (size, size)), fill=bg_color) + draw.rectangle(((0, 0), (size, size)), fill=bg_color) # Draw MMs head draw.ellipse((start_x, start_y, end_x, end_y), fill='white') # Draw MMs 'body' - draw.polygon(((start_x+circlesize/2, size/2.5), (size*0.15, size), (size-size*0.15, size)), fill='white') + draw.polygon(( + (start_x+circlesize/2, size/2.5), + (size*0.15, size), + (size-size*0.15, size)), + fill='white') return image From feab5f6156355d6a6ec9adac1e942d4f24fe5eed Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 6 May 2020 13:11:21 +0200 Subject: [PATCH 10/42] Fix pylint warnings --- ivatar/views.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ivatar/views.py b/ivatar/views.py index 4c97939..95af253 100644 --- a/ivatar/views.py +++ b/ivatar/views.py @@ -99,14 +99,14 @@ class AvatarImageView(TemplateView): if centry: # For DEBUG purpose only print('Cached entry for %s' % uri) return HttpResponse( - centry['content'], - content_type=centry['content_type'], - status=centry['status'], - reason = centry['reason'], - charset = centry['charset']) + centry['content'], + content_type=centry['content_type'], + status=centry['status'], + reason=centry['reason'], + charset=centry['charset']) # In case no digest at all is provided, return to home page - if not 'digest' in kwargs: + if 'digest' not in kwargs: return HttpResponseRedirect(reverse_lazy('home')) if 'd' in request.GET: @@ -248,7 +248,7 @@ class AvatarImageView(TemplateView): return response if str(default) == 'mmng': - mmngimg = mm_ng(hash=kwargs['digest'], size=size) + mmngimg = mm_ng(idhash=kwargs['digest'], size=size) data = BytesIO() mmngimg.save(data, 'PNG', quality=JPEG_QUALITY) data.seek(0) From 31bc906fda524c3970c7aeed401b0a4186b7a516 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 11 May 2020 10:10:26 +0200 Subject: [PATCH 11/42] Missing context data (max_photos). Fixes #66 Signed-off-by: Oliver Falk --- ivatar/ivataraccount/templates/profile.html | 11 +++++++---- ivatar/ivataraccount/views.py | 12 ++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ivatar/ivataraccount/templates/profile.html b/ivatar/ivataraccount/templates/profile.html index 03c4f0a..c4ee0fb 100644 --- a/ivatar/ivataraccount/templates/profile.html +++ b/ivatar/ivataraccount/templates/profile.html @@ -155,10 +155,13 @@ outline: inherit; {% endif %} {% if not max_photos %} -

-{% trans 'Upload a new photo' %}  -{% trans 'Import photo from other services' %} -

+

+ {% trans 'Upload a new photo' %}  + {% trans 'Import photo from other services' %} +

+{% else %} + {% trans "You've reached the maximum number of allowed images!" %}
+ {% trans "No further images can be uploaded." %} {% endif %}
{% endblock content %} diff --git a/ivatar/ivataraccount/views.py b/ivatar/ivataraccount/views.py index 6a83cd5..db18795 100644 --- a/ivatar/ivataraccount/views.py +++ b/ivatar/ivataraccount/views.py @@ -898,6 +898,18 @@ class ProfileView(TemplateView): self._confirm_claimed_openid() return super().get(self, request, args, kwargs) + def get_context_data(self, **kwargs): + ''' + Provide additional context data, like if max_photos is reached + already or not. + ''' + context = super().get_context_data(**kwargs) + context['max_photos'] = False + if self.request.user: + if self.request.user.photo_set.all().count() >= MAX_NUM_PHOTOS: + context['max_photos'] = True + return context + def _confirm_claimed_openid(self): openids = self.request.user.useropenid_set.all() # If there is only one OpenID, we eventually need to add it to the user account From e74365e78845330d78c63e0526fb26ee9423fecd Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 11 May 2020 13:25:41 +0200 Subject: [PATCH 12/42] Now that this source is 2 years old, time to upgrade the version Signed-off-by: Oliver Falk --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index 948b1b1..0b57119 100644 --- a/config.py +++ b/config.py @@ -52,7 +52,7 @@ OPENID_CREATE_USERS = True OPENID_UPDATE_DETAILS_FROM_SREG = True SITE_NAME = os.environ.get('SITE_NAME', 'libravatar') -IVATAR_VERSION = '1.3' +IVATAR_VERSION = '1.4' SECURE_BASE_URL = os.environ.get('SECURE_BASE_URL', 'https://avatars.linux-kernel.at/avatar/') BASE_URL = os.environ.get('BASE_URL', 'http://avatars.linux-kernel.at/avatar/') From 625cd290c0b7b136371643ec88f17a5fab8e530f Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 11 May 2020 13:26:34 +0200 Subject: [PATCH 13/42] Finally, update to the user information page - Allow update of mail address (allows to choose from the confirmed mail addresses) - Allow update of first and last name Closes: #59 Signed-off-by: Oliver Falk --- .../ivataraccount/templates/preferences.html | 58 +++++++++++++------ ivatar/ivataraccount/views.py | 27 +++++++++ 2 files changed, 66 insertions(+), 19 deletions(-) diff --git a/ivatar/ivataraccount/templates/preferences.html b/ivatar/ivataraccount/templates/preferences.html index 76612a4..ea563ac 100644 --- a/ivatar/ivataraccount/templates/preferences.html +++ b/ivatar/ivataraccount/templates/preferences.html @@ -7,36 +7,56 @@ {% block content %}

{% trans 'Account settings' %}

-
- - -
+ + +
{% csrf_token %} +
+ + + + + + + +
+ + +
-
+
-

{% trans 'Permanently delete your account' %}

+ +

{% trans 'Permanently delete your account' %}

{% endblock content %} diff --git a/ivatar/ivataraccount/views.py b/ivatar/ivataraccount/views.py index db18795..bcdc7b4 100644 --- a/ivatar/ivataraccount/views.py +++ b/ivatar/ivataraccount/views.py @@ -731,6 +731,9 @@ class UserPreferenceView(FormView, UpdateView): success_url = reverse_lazy('user_preference') def post(self, request, *args, **kwargs): # pylint: disable=unused-argument + ''' + Process POST-ed data from this form + ''' userpref = None try: userpref = self.request.user.userpreference @@ -738,6 +741,30 @@ class UserPreferenceView(FormView, UpdateView): userpref = UserPreference(user=self.request.user) userpref.theme = request.POST['theme'] userpref.save() + try: + if request.POST['email'] != self.request.user.email: + addresses = list(self.request.user.confirmedemail_set.all().values_list('email', flat=True)) + if request.POST['email'] not in addresses: + messages.error(self.request, _('Mail address not allowed: %s' % request.POST['email'])) + else: + self.request.user.email = request.POST['email'] + self.request.user.save() + messages.info(self.request, _('Mail address changed.')) + except Exception as e: # pylint: disable=broad-except + messages.error(self.request, _('Error setting new mail address: %s' % e)) + + try: + if request.POST['first_name'] or request.POST['last_name']: + if request.POST['first_name'] != self.request.user.first_name: + self.request.user.first_name = request.POST['first_name'] + messages.info(self.request, _('First name changed.')) + if request.POST['last_name'] != self.request.user.last_name: + self.request.user.last_name = request.POST['last_name'] + messages.info(self.request, _('Last name changed.')) + self.request.user.save() + except Exception as e: # pylint: disable=broad-except + messages.error(self.request, _('Error setting names: %s' % e)) + return HttpResponseRedirect(reverse_lazy('user_preference')) From c83453077e029b8e5142af265aa13b0d3c440288 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Fri, 19 Jun 2020 12:36:08 +0200 Subject: [PATCH 14/42] Enhance the password reset functionality and add appropriate unit tests --- ivatar/ivataraccount/test_views.py | 77 ++++++++++++++++++++++++++++++ ivatar/ivataraccount/views.py | 45 +++++++++++++---- 2 files changed, 114 insertions(+), 8 deletions(-) diff --git a/ivatar/ivataraccount/test_views.py b/ivatar/ivataraccount/test_views.py index 4a68d54..0b9ca67 100644 --- a/ivatar/ivataraccount/test_views.py +++ b/ivatar/ivataraccount/test_views.py @@ -10,6 +10,7 @@ import django from django.test import TestCase from django.test import Client from django.urls import reverse +from django.core import mail from django.contrib.auth.models import User from django.contrib.auth import authenticate import hashlib @@ -1513,3 +1514,79 @@ class Tester(TestCase): # pylint: disable=too-many-public-methods 200, 'First and last name not correctly listed in profile page', ) + + def test_password_reset_page(self): + ''' + Just test if the password reset page come up correctly + ''' + response = self.client.get(reverse('password_reset')) + self.assertEqual(response.status_code, 200, 'no 200 ok?') + + def test_password_reset_wo_mail(self): + ''' + Test if the password reset doesn't error out + if the mail address doesn't exist + ''' + # Avoid sending out mails + settings.EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend' + + # Empty database / eliminate existing users + User.objects.all().delete() + url = reverse('password_reset') + response = self.client.post( + url, { + 'email': 'asdf@asdf.local', + }, + follow=True, + ) + self.assertEqual(response.status_code, 200, 'password reset page not working?') + self.assertEqual(len(mail.outbox), 0, 'user does not exist, there should be no mail in the outbox!') + + def test_password_reset_w_mail(self): + ''' + Test if the password reset works correctly with email in + User object + ''' + # Avoid sending out mails + settings.EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend' + + url = reverse('password_reset') + # Our test user doesn't have an email address by default - but we need one set + self.user.email = 'asdf@asdf.local' + self.user.save() + response = self.client.post( + url, { + 'email': self.user.email, + }, + follow=True, + ) + self.assertEqual(response.status_code, 200, 'password reset page not working?') + self.assertEqual(len(mail.outbox), 1, 'User exists, there should be a mail in the outbox!') + self.assertEqual(mail.outbox[0].to[0], self.user.email, 'Sending mails to the wrong \ + mail address?') + + def test_password_reset_w_confirmed_mail(self): + ''' + Test if the password reset works correctly with confirmed + mail + ''' + # Avoid sending out mails + settings.EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend' + + url = reverse('password_reset') + # Our test user doesn't have a confirmed mail identity - add one + self.user.confirmedemail_set.create(email='asdf@asdf.local') + self.user.save() + + response = self.client.post( + url, { + 'email': self.user.confirmedemail_set.first().email, + }, + follow=True, + ) + # Since the object is touched in another process, we need to refresh it + self.user.refresh_from_db() + self.assertEqual(response.status_code, 200, 'password reset page not working?') + self.assertEqual(self.user.email, self.user.confirmedemail_set.first().email, 'The password reset view, should have corrected this!') + self.assertEqual(len(mail.outbox), 1, 'user exists, there should be a mail in the outbox!') + self.assertEqual(mail.outbox[0].to[0], self.user.email, 'why are we sending mails to the wrong mail address?') diff --git a/ivatar/ivataraccount/views.py b/ivatar/ivataraccount/views.py index bcdc7b4..ab78a25 100644 --- a/ivatar/ivataraccount/views.py +++ b/ivatar/ivataraccount/views.py @@ -963,18 +963,47 @@ class PasswordResetView(PasswordResetViewOriginal): ''' Since we have the mail addresses in ConfirmedEmail model, we need to set the email on the user object in order for the - PasswordResetView class to pick up the correct user + PasswordResetView class to pick up the correct user. + In case we have the mail address in the User objecct, we still + need to assign a random password in order for PasswordResetView + class to pick up the user - else it will silently do nothing. ''' if 'email' in request.POST: + user = None + + # Try to find the user via the normal user class try: - confirmed_email = ConfirmedEmail.objects.get(email=request.POST['email']) - confirmed_email.user.email = confirmed_email.email - if not confirmed_email.user.password or confirmed_email.user.password == '!': - random_pass = User.objects.make_random_password() - confirmed_email.user.set_pasword(random_pass) - confirmed_email.user.save() - except Exception as exc: + user = User.objects.get(email=request.POST['email']) + except ObjectDoesNotExist as exc: # pylint: disable=unused-variable + # keep this for debugging only + # print('Exception: %s' % exc) pass + + # If we didn't find the user in the previous step, + # try the ConfirmedEmail class instead. + # If we find the user there, we need to set the mail + # attribute on the user object accordingly + if not user: + try: + confirmed_email = ConfirmedEmail.objects.get(email=request.POST['email']) + user = confirmed_email.user + user.email = confirmed_email.email + user.save() + except ObjectDoesNotExist as exc: # pylint: disable=unused-variable + # keep this for debugging only + # print('Exception: %s' % exc) + pass + + # If we found the user, set a random password. Else, the + # ResetPasswordView class will silently ignore the password + # reset request + if user: + if not user.password or user.password == '!': + random_pass = User.objects.make_random_password() + user.set_password(random_pass) + user.save() + + # Whatever happens above, let the original function handle the rest return super().post(self, request, args, kwargs) From 03e495de24e9837e59155ea9fc8bb94711064fe4 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 22 Jun 2020 11:11:24 +0200 Subject: [PATCH 15/42] More happyness for pylint --- ivatar/tools/views.py | 82 +++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/ivatar/tools/views.py b/ivatar/tools/views.py index 545fcc6..a2adf8d 100644 --- a/ivatar/tools/views.py +++ b/ivatar/tools/views.py @@ -2,6 +2,8 @@ View classes for ivatar/tools/ ''' from socket import inet_ntop, AF_INET6 +import hashlib +import random from django.views.generic.edit import FormView from django.urls import reverse_lazy as reverse @@ -12,10 +14,9 @@ import DNS from libravatar import libravatar_url, parse_user_identity from libravatar import SECURE_BASE_URL as LIBRAVATAR_SECURE_BASE_URL from libravatar import BASE_URL as LIBRAVATAR_BASE_URL -import hashlib -from .forms import CheckDomainForm, CheckForm from ivatar.settings import SECURE_BASE_URL, BASE_URL +from .forms import CheckDomainForm, CheckForm # pylint: disable=relative-beyond-top-level class CheckDomainView(FormView): @@ -32,12 +33,20 @@ class CheckDomainView(FormView): domain = form.cleaned_data['domain'] result['avatar_server_http'] = lookup_avatar_server(domain, False) if result['avatar_server_http']: - result['avatar_server_http_ipv4'] = lookup_ip_address(result['avatar_server_http'], False) - result['avatar_server_http_ipv6'] = lookup_ip_address(result['avatar_server_http'], True) + result['avatar_server_http_ipv4'] = lookup_ip_address( + result['avatar_server_http'], + False) + result['avatar_server_http_ipv6'] = lookup_ip_address( + result['avatar_server_http'], + True) result['avatar_server_https'] = lookup_avatar_server(domain, True) if result['avatar_server_https']: - result['avatar_server_https_ipv4'] = lookup_ip_address(result['avatar_server_https'], False) - result['avatar_server_https_ipv6'] = lookup_ip_address(result['avatar_server_https'], True) + result['avatar_server_https_ipv4'] = lookup_ip_address( + result['avatar_server_https'], + False) + result['avatar_server_https_ipv6'] = lookup_ip_address( + result['avatar_server_https'], + True) return render(self.request, self.template_name, { 'form': form, 'result': result, @@ -75,21 +84,21 @@ class CheckView(FormView): size = form.cleaned_data['size'] if form.cleaned_data['mail']: mailurl = libravatar_url( - email=form.cleaned_data['mail'], - size=size, - default=default_url) + email=form.cleaned_data['mail'], + size=size, + default=default_url) mailurl = mailurl.replace(LIBRAVATAR_BASE_URL, BASE_URL) mailurl_secure = libravatar_url( - email=form.cleaned_data['mail'], - size=size, - https=True, - default=default_url) + email=form.cleaned_data['mail'], + size=size, + https=True, + default=default_url) mailurl_secure = mailurl_secure.replace( - LIBRAVATAR_SECURE_BASE_URL, - SECURE_BASE_URL) + LIBRAVATAR_SECURE_BASE_URL, + SECURE_BASE_URL) mail_hash = parse_user_identity( - email=form.cleaned_data['mail'], - openid=None)[0] + email=form.cleaned_data['mail'], + openid=None)[0] hash_obj = hashlib.new('sha256') hash_obj.update(form.cleaned_data['mail'].encode('utf-8')) mail_hash256 = hash_obj.hexdigest() @@ -97,24 +106,25 @@ class CheckView(FormView): mail_hash, mail_hash256) if form.cleaned_data['openid']: - if not form.cleaned_data['openid'].startswith('http://') and not form.cleaned_data['openid'].startswith('https://'): + if not form.cleaned_data['openid'].startswith('http://') and \ + not form.cleaned_data['openid'].startswith('https://'): form.cleaned_data['openid'] = 'http://%s' % form.cleaned_data['openid'] openidurl = libravatar_url( - openid=form.cleaned_data['openid'], - size=size, - default=default_url) + openid=form.cleaned_data['openid'], + size=size, + default=default_url) openidurl = openidurl.replace(LIBRAVATAR_BASE_URL, BASE_URL) openidurl_secure = libravatar_url( - openid=form.cleaned_data['openid'], - size=size, - https=True, - default=default_url) + openid=form.cleaned_data['openid'], + size=size, + https=True, + default=default_url) openidurl_secure = openidurl_secure.replace( - LIBRAVATAR_SECURE_BASE_URL, - SECURE_BASE_URL) + LIBRAVATAR_SECURE_BASE_URL, + SECURE_BASE_URL) openid_hash = parse_user_identity( - openid=form.cleaned_data['openid'], - email=None)[0] + openid=form.cleaned_data['openid'], + email=None)[0] return render(self.request, self.template_name, { 'form': form, @@ -166,7 +176,8 @@ def lookup_avatar_server(domain, https): records = [] for answer in dns_request.answers: - if ('data' not in answer) or (not answer['data']) or (not answer['typename']) or (answer['typename'] != 'SRV'): + if ('data' not in answer) or (not answer['data']) or \ + (not answer['typename']) or (answer['typename'] != 'SRV'): continue record = {'priority': int(answer['data'][0]), 'weight': int(answer['data'][1]), @@ -203,7 +214,10 @@ def srv_hostname(records): if ret['priority'] > top_priority: # ignore the record (ret has lower priority) continue - elif ret['priority'] < top_priority: + + # Take care - this if is only a if, if the above if + # uses continue at the end. else it should be an elsif + if ret['priority'] < top_priority: # reset the aretay (ret has higher priority) top_priority = ret['priority'] total_weight = 0 @@ -218,7 +232,7 @@ def srv_hostname(records): priority_records.insert(0, (0, ret)) if len(priority_records) == 1: - unused, ret = priority_records[0] + unused, ret = priority_records[0] # pylint: disable=unused-variable return (ret['target'], ret['port']) # Select first record according to RFC2782 weight ordering algorithm (page 3) @@ -261,7 +275,7 @@ def lookup_ip_address(hostname, ipv6): if ipv6: return inet_ntop(AF_INET6, answer['data']) - else: - return answer['data'] + + return answer['data'] return None From 652f11289ba55b20b3a204f7cc28d81a8eefd6ff Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 31 Aug 2020 09:13:26 +0200 Subject: [PATCH 16/42] Add AGPL license --- LICENSE | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 661 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..be3f7b2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. From 3bee6ed05f9f1fb564db8fc6ea790c15efe19f46 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 31 Aug 2020 09:14:05 +0200 Subject: [PATCH 17/42] Differentiate if mail has been added by yourself or someone else (in the error message) --- ivatar/ivataraccount/forms.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ivatar/ivataraccount/forms.py b/ivatar/ivataraccount/forms.py index 21acf57..2f98dfe 100644 --- a/ivatar/ivataraccount/forms.py +++ b/ivatar/ivataraccount/forms.py @@ -62,12 +62,14 @@ class AddEmailForm(forms.Form): _('Address already added, currently unconfirmed')) return False - # Check whether or not the email is already confirmed by someone - if ConfirmedEmail.objects.filter( - email=self.cleaned_data['email']).exists(): - self.add_error( - 'email', - _('Address already confirmed (by someone else)')) + # Check whether or not the email is already confirmed (by someone) + check_mail = ConfirmedEmail.objects.filter( + email=self.cleaned_data['email']) + if check_mail.exists(): + msg = _('Address already confirmed (by someone else)') + if check_mail.first().user == request.user: + msg = _('Address already confirmed (by you)') + self.add_error('email', msg) return False unconfirmed = UnconfirmedEmail() From 64edc0aa610172579cb543a2824fa4a1099b19be Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 31 Aug 2020 09:39:17 +0200 Subject: [PATCH 18/42] Add test for 3bee6ed05f9f1fb564db8fc6ea790c15efe19f46 --- ivatar/ivataraccount/test_views.py | 31 ++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/ivatar/ivataraccount/test_views.py b/ivatar/ivataraccount/test_views.py index 0b9ca67..5f5349b 100644 --- a/ivatar/ivataraccount/test_views.py +++ b/ivatar/ivataraccount/test_views.py @@ -25,7 +25,7 @@ django.setup() # pylint: disable=wrong-import-position from ivatar import settings from ivatar.ivataraccount.forms import MAX_NUM_UNCONFIRMED_EMAILS_DEFAULT -from ivatar.ivataraccount.models import Photo, ConfirmedOpenId +from ivatar.ivataraccount.models import Photo, ConfirmedOpenId, ConfirmedEmail from ivatar.utils import random_string # pylint: enable=wrong-import-position @@ -452,7 +452,7 @@ class Tester(TestCase): # pylint: disable=too-many-public-methods 'email', 'Address already added, currently unconfirmed') - def test_add_already_confirmed_email(self): # pylint: disable=invalid-name + def test_add_already_confirmed_email_self(self): # pylint: disable=invalid-name ''' Request adding mail address that is already confirmed (by someone) ''' @@ -460,6 +460,33 @@ class Tester(TestCase): # pylint: disable=too-many-public-methods # Should set EMAIL_BACKEND, so no need to do it here self.test_confirm_email() + response = self.client.post( + reverse('add_email'), { + 'email': self.email, + }, + follow=True, + ) + self.assertFormError( + response, + 'form', + 'email', + 'Address already confirmed (by you)') + + def test_add_already_confirmed_email_other(self): # pylint: disable=invalid-name + ''' + Request adding mail address that is already confirmed (by someone) + ''' + # Create test mail and confirm it, reuse test code + # Should set EMAIL_BACKEND, so no need to do it here + self.test_confirm_email() + + # Create another user and assign the mail address to that one + # in order to test the correct error message + otheruser = User.objects.create(username='otheruser') + confirmedemail = ConfirmedEmail.objects.last() + confirmedemail.user = otheruser + confirmedemail.save() + response = self.client.post( reverse('add_email'), { 'email': self.email, From ffbd0f91488f3f5c41d9ecc8e92e71dc0df3c5dd Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 31 Aug 2020 09:55:01 +0200 Subject: [PATCH 19/42] Explicit cast, to make sure we fetch the attribute; Should fix failed testing from 64edc0aa610172579cb543a2824fa4a1099b19be --- ivatar/ivataraccount/test_views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ivatar/ivataraccount/test_views.py b/ivatar/ivataraccount/test_views.py index 5f5349b..7bd9c90 100644 --- a/ivatar/ivataraccount/test_views.py +++ b/ivatar/ivataraccount/test_views.py @@ -956,11 +956,11 @@ class Tester(TestCase): # pylint: disable=too-many-public-methods args=[self.user.confirmedopenid_set.first().id]) # The get is for the view - test context data self.client.get(url, { - 'photo_id': self.user.photo_set.first().id, + 'photo_id': int(self.user.photo_set.first().id), }) # The post is for the actual assigning response = self.client.post(url, { - 'photo_id': self.user.photo_set.first().id, + 'photo_id': int(self.user.photo_set.first().id), }, follow=True) self.assertEqual(response.status_code, 200, 'cannot assign photo?') self.assertEqual( From 8f7f6983cd95591ddcfaf06db672b2a3feb67b05 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 31 Aug 2020 10:55:50 +0200 Subject: [PATCH 20/42] Something is fishy with Django 3.1 - needs futher and deeper investigation --- ivatar/ivataraccount/test_views.py | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ivatar/ivataraccount/test_views.py b/ivatar/ivataraccount/test_views.py index 7bd9c90..5f5349b 100644 --- a/ivatar/ivataraccount/test_views.py +++ b/ivatar/ivataraccount/test_views.py @@ -956,11 +956,11 @@ class Tester(TestCase): # pylint: disable=too-many-public-methods args=[self.user.confirmedopenid_set.first().id]) # The get is for the view - test context data self.client.get(url, { - 'photo_id': int(self.user.photo_set.first().id), + 'photo_id': self.user.photo_set.first().id, }) # The post is for the actual assigning response = self.client.post(url, { - 'photo_id': int(self.user.photo_set.first().id), + 'photo_id': self.user.photo_set.first().id, }, follow=True) self.assertEqual(response.status_code, 200, 'cannot assign photo?') self.assertEqual( diff --git a/requirements.txt b/requirements.txt index 760b3df..93dd272 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ autopep8 bcrypt defusedxml -Django +Django<3.1 django-auth-ldap django-bootstrap4 django-coverage-plugin From b4b81499ca95ed230a52c2f2aa8b34f9941ef73a Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Fri, 18 Sep 2020 11:35:04 +0200 Subject: [PATCH 21/42] Try build in CI with newer Django --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 93dd272..d8ae36a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ autopep8 bcrypt defusedxml -Django<3.1 +Django<3.2 django-auth-ldap django-bootstrap4 django-coverage-plugin From 92035d7e1596067963ed98d0f0916d8f5b6a359f Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Tue, 29 Sep 2020 13:58:39 +0200 Subject: [PATCH 22/42] Make pylint happier --- config.py | 2 +- ivatar/middleware.py | 2 +- ivatar/test_static_pages.py | 17 +---------------- ivatar/test_views.py | 17 +---------------- ivatar/test_wsgi.py | 2 +- ivatar/urls.py | 11 ++++++----- ivatar/views.py | 25 ++++++++++++++----------- 7 files changed, 25 insertions(+), 51 deletions(-) diff --git a/config.py b/config.py index 0b57119..895ddf5 100644 --- a/config.py +++ b/config.py @@ -108,7 +108,7 @@ else: 'MAILGUN_SENDER_DOMAIN': os.environ['IVATAR_MAILGUN_SENDER_DOMAIN'], } EMAIL_BACKEND = 'anymail.backends.mailgun.EmailBackend' # pragma: no cover - except Exception as exc: + except Exception as exc: # pragma: nocover EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' SERVER_EMAIL = os.environ.get('SERVER_EMAIL', 'ivatar@mg.linux-kernel.at') diff --git a/ivatar/middleware.py b/ivatar/middleware.py index 6f6e066..2f052be 100644 --- a/ivatar/middleware.py +++ b/ivatar/middleware.py @@ -9,7 +9,7 @@ class MultipleProxyMiddleware(MiddlewareMixin): # pylint: disable=too-few-publi with multiple proxies """ - def process_request(self, request): + def process_request(self, request): # pylint: disable=no-self-use """ Rewrites the proxy headers so that forwarded server is used if available. diff --git a/ivatar/test_static_pages.py b/ivatar/test_static_pages.py index 5191509..89596c0 100644 --- a/ivatar/test_static_pages.py +++ b/ivatar/test_static_pages.py @@ -2,32 +2,18 @@ Test our views in ivatar.ivataraccount.views and ivatar.views ''' # pylint: disable=too-many-lines -from urllib.parse import urlsplit -from io import BytesIO -import io import os import django from django.test import TestCase from django.test import Client from django.urls import reverse from django.contrib.auth.models import User -from django.contrib.auth import authenticate -import hashlib -from libravatar import libravatar_url - -from PIL import Image +from ivatar.utils import random_string os.environ['DJANGO_SETTINGS_MODULE'] = 'ivatar.settings' django.setup() -# pylint: disable=wrong-import-position -from ivatar import settings -from ivatar.ivataraccount.forms import MAX_NUM_UNCONFIRMED_EMAILS_DEFAULT -from ivatar.ivataraccount.models import Photo, ConfirmedOpenId -from ivatar.utils import random_string -# pylint: enable=wrong-import-position - class Tester(TestCase): # pylint: disable=too-many-public-methods ''' @@ -77,4 +63,3 @@ class Tester(TestCase): # pylint: disable=too-many-public-methods """ response = self.client.get(reverse('security')) self.assertEqual(response.status_code, 200, 'no 200 ok?') - diff --git a/ivatar/test_views.py b/ivatar/test_views.py index cc18515..5631b8f 100644 --- a/ivatar/test_views.py +++ b/ivatar/test_views.py @@ -2,32 +2,17 @@ Test our views in ivatar.ivataraccount.views and ivatar.views ''' # pylint: disable=too-many-lines -from urllib.parse import urlsplit -from io import BytesIO -import io import os import django from django.test import TestCase from django.test import Client -from django.urls import reverse from django.contrib.auth.models import User -from django.contrib.auth import authenticate -import hashlib -from libravatar import libravatar_url - -from PIL import Image +from ivatar.utils import random_string os.environ['DJANGO_SETTINGS_MODULE'] = 'ivatar.settings' django.setup() -# pylint: disable=wrong-import-position -from ivatar import settings -from ivatar.ivataraccount.forms import MAX_NUM_UNCONFIRMED_EMAILS_DEFAULT -from ivatar.ivataraccount.models import Photo, ConfirmedOpenId -from ivatar.utils import random_string -# pylint: enable=wrong-import-position - class Tester(TestCase): # pylint: disable=too-many-public-methods ''' diff --git a/ivatar/test_wsgi.py b/ivatar/test_wsgi.py index 2e016ba..e2da514 100644 --- a/ivatar/test_wsgi.py +++ b/ivatar/test_wsgi.py @@ -17,6 +17,6 @@ class TestCase(unittest.TestCase): ''' Run wsgi import ''' - import ivatar.wsgi + import ivatar.wsgi # pylint: disable=import-outside-toplevel self.assertEqual(ivatar.wsgi.application.__class__, django.core.handlers.wsgi.WSGIHandler) diff --git a/ivatar/urls.py b/ivatar/urls.py index 39d44db..df3b450 100644 --- a/ivatar/urls.py +++ b/ivatar/urls.py @@ -29,7 +29,8 @@ urlpatterns = [ # pylint: disable=invalid-name GravatarProxyView.as_view(), name='gravatarproxy'), url('description/', TemplateView.as_view(template_name='description.html'), name='description'), # The following two are TODO TODO TODO TODO TODO - url('run_your_own/', TemplateView.as_view(template_name='run_your_own.html'), name='run_your_own'), + url('run_your_own/', + TemplateView.as_view(template_name='run_your_own.html'), name='run_your_own'), url('features/', TemplateView.as_view(template_name='features.html'), name='features'), url('security/', TemplateView.as_view(template_name='security.html'), name='security'), url('privacy/', TemplateView.as_view(template_name='privacy.html'), name='privacy'), @@ -39,10 +40,10 @@ urlpatterns = [ # pylint: disable=invalid-name MAINTENANCE = False try: - if settings.MAINTENANCE: - MAINTENANCE = True -except: - pass + if settings.MAINTENANCE: + MAINTENANCE = True +except: # pylint: disable=bare-except + pass if MAINTENANCE: urlpatterns.append(url('', TemplateView.as_view(template_name='maintenance.html'), name='home')) diff --git a/ivatar/views.py b/ivatar/views.py index 95af253..fb79958 100644 --- a/ivatar/views.py +++ b/ivatar/views.py @@ -57,7 +57,10 @@ def get_size(request, size=DEFAULT_AVATAR_SIZE): class CachingHttpResponse(HttpResponse): - def __init__(self, uri, content=b'', content_type=None, status=200, reason=None, charset=None): + ''' + Handle caching of response + ''' + def __init__(self, uri, content=b'', content_type=None, status=200, reason=None, charset=None): # pylint: disable=too-many-arguments if CACHE_RESPONSE: caches['filesystem'].set(uri, { 'content': content, @@ -66,7 +69,7 @@ class CachingHttpResponse(HttpResponse): 'reason': reason, 'charset': charset }) - return super().__init__(content, content_type, status, reason, charset) + super().__init__(content, content_type, status, reason, charset) class AvatarImageView(TemplateView): ''' @@ -74,7 +77,7 @@ 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 + def options(self, request, *args, **kwargs): response = HttpResponse("", content_type='text/plain') response['Allow'] = "404 mm mp retro pagan wavatar monsterid robohash identicon" return response @@ -137,7 +140,7 @@ class AvatarImageView(TemplateView): except ObjectDoesNotExist: model = ConfirmedOpenId try: - d = kwargs['digest'] + d = kwargs['digest'] # pylint: disable=invalid-name # OpenID is tricky. http vs. https, versus trailing slash or not # However, some users eventually have added their variations already # and therfore we need to use filter() and first() @@ -146,7 +149,7 @@ class AvatarImageView(TemplateView): Q(alt_digest1=d) | Q(alt_digest2=d) | Q(alt_digest3=d)).first() - except: + except: # pylint: disable=bare-except pass @@ -212,7 +215,7 @@ class AvatarImageView(TemplateView): img = img.resize((size, size), Image.ANTIALIAS) img.save(data, 'PNG', quality=JPEG_QUALITY) data.seek(0) - response = CachingHttpResponse( + response = CachingHttpResponse( uri, data, content_type='image/png') @@ -233,7 +236,7 @@ class AvatarImageView(TemplateView): return response if str(default) == 'identicon': - p = Pydenticon5() + p = Pydenticon5() # pylint: disable=invalid-name # In order to make use of the whole 32 bytes digest, we need to redigest them. newdigest = hashlib.md5(bytes(kwargs['digest'], 'utf-8')).hexdigest() img = p.draw(newdigest, size, 0) @@ -306,7 +309,7 @@ class GravatarProxyView(View): ''' # TODO: Do cache images!! Memcached? - def get(self, request, *args, **kwargs): # pylint: disable=too-many-branches,too-many-statements,too-many-locals,no-self-use,unused-argument + def get(self, request, *args, **kwargs): # pylint: disable=too-many-branches,too-many-statements,too-many-locals,no-self-use,unused-argument,too-many-return-statements ''' Override get from parent class ''' @@ -314,7 +317,7 @@ class GravatarProxyView(View): url = reverse_lazy( 'avatar_view', args=[kwargs['digest']]) + '?s=%i' % size + '&forcedefault=y' - if default != None: + if default is not None: url += '&default=%s' % default return HttpResponseRedirect(url) @@ -325,7 +328,7 @@ class GravatarProxyView(View): try: if str(request.GET['default']) != 'None': default = request.GET['default'] - except: + except: # pylint: disable=bare-except pass if str(default) != 'wavatar': @@ -344,7 +347,7 @@ class GravatarProxyView(View): if hashlib.md5(data.read()).hexdigest() == '71bc262d627971d13fe6f3180b93062a': cache.set(gravatar_test_url, 'default', 60) return redir_default(default) - except Exception as exc: + except Exception as exc: # pylint: disable=broad-except print('Gravatar test url fetch failed: %s' % exc) gravatar_url = 'https://secure.gravatar.com/avatar/' + kwargs['digest'] \ From 33169da930335cdf799e38a71ee49199f63acf1b Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Fri, 13 Nov 2020 13:22:59 +0100 Subject: [PATCH 23/42] Add missing schemas --- schemas/export/0.1/export.xsd | 104 +++++++++++++++++++++++++++++++++ schemas/export/0.2/export.xsd | 105 ++++++++++++++++++++++++++++++++++ 2 files changed, 209 insertions(+) create mode 100644 schemas/export/0.1/export.xsd create mode 100644 schemas/export/0.2/export.xsd diff --git a/schemas/export/0.1/export.xsd b/schemas/export/0.1/export.xsd new file mode 100644 index 0000000..0b3bc2d --- /dev/null +++ b/schemas/export/0.1/export.xsd @@ -0,0 +1,104 @@ + + + + + + XML Schema for Libravatar user account exports. + Last Modifed 2011-04-09 + + + + + + + Container for emails, openids and photos elements. + This is the root element of the XML file. + + + + + + + + + + + + + + + + Empty element holding user account-related information. + + + + + + + + + + + + + + Container for confirmed email addresses. + + + + + + + + + + + Container for confirmed OpenID URLs. + + + + + + + + + + + Container for uploaded/imported photos. + + + + + + + + + + + Container for a base64 encoded photo. + + + + + + + + + + + + + + File type for the given photo. + + + + + + + + + diff --git a/schemas/export/0.2/export.xsd b/schemas/export/0.2/export.xsd new file mode 100644 index 0000000..f2d2d86 --- /dev/null +++ b/schemas/export/0.2/export.xsd @@ -0,0 +1,105 @@ + + + + + + XML Schema for Libravatar user account exports. + Last Modifed 2013-01-12 + + + + + + + Container for emails, openids and photos elements. + This is the root element of the XML file. + + + + + + + + + + + + + + + + Empty element holding user account-related information. + + + + + + + + + + + + + + Container for confirmed email addresses. + + + + + + + + + + + Container for confirmed OpenID URLs. + + + + + + + + + + + Container for uploaded/imported photos. + + + + + + + + + + + Container for a base64 encoded photo. + + + + + + + + + + + + + + File type for the given photo. + + + + + + + + + + From 635951ff4da0414f0228eba0f8355a11e99e8770 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Fri, 13 Nov 2020 13:36:16 +0100 Subject: [PATCH 24/42] Make pylint happier, enhance a few tests and add missing schemas --- LICENSE | 661 +++++++++++++++++++++++++++++ config.py | 2 +- ivatar/ivataraccount/forms.py | 14 +- ivatar/ivataraccount/test_views.py | 31 +- ivatar/middleware.py | 2 +- ivatar/test_static_pages.py | 17 +- ivatar/test_views.py | 17 +- ivatar/test_wsgi.py | 2 +- ivatar/tools/views.py | 82 ++-- ivatar/urls.py | 11 +- ivatar/views.py | 25 +- requirements.txt | 2 +- schemas/export/0.1/export.xsd | 104 +++++ schemas/export/0.2/export.xsd | 105 +++++ 14 files changed, 981 insertions(+), 94 deletions(-) create mode 100644 LICENSE create mode 100644 schemas/export/0.1/export.xsd create mode 100644 schemas/export/0.2/export.xsd diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..be3f7b2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/config.py b/config.py index 0b57119..895ddf5 100644 --- a/config.py +++ b/config.py @@ -108,7 +108,7 @@ else: 'MAILGUN_SENDER_DOMAIN': os.environ['IVATAR_MAILGUN_SENDER_DOMAIN'], } EMAIL_BACKEND = 'anymail.backends.mailgun.EmailBackend' # pragma: no cover - except Exception as exc: + except Exception as exc: # pragma: nocover EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' SERVER_EMAIL = os.environ.get('SERVER_EMAIL', 'ivatar@mg.linux-kernel.at') diff --git a/ivatar/ivataraccount/forms.py b/ivatar/ivataraccount/forms.py index 21acf57..2f98dfe 100644 --- a/ivatar/ivataraccount/forms.py +++ b/ivatar/ivataraccount/forms.py @@ -62,12 +62,14 @@ class AddEmailForm(forms.Form): _('Address already added, currently unconfirmed')) return False - # Check whether or not the email is already confirmed by someone - if ConfirmedEmail.objects.filter( - email=self.cleaned_data['email']).exists(): - self.add_error( - 'email', - _('Address already confirmed (by someone else)')) + # Check whether or not the email is already confirmed (by someone) + check_mail = ConfirmedEmail.objects.filter( + email=self.cleaned_data['email']) + if check_mail.exists(): + msg = _('Address already confirmed (by someone else)') + if check_mail.first().user == request.user: + msg = _('Address already confirmed (by you)') + self.add_error('email', msg) return False unconfirmed = UnconfirmedEmail() diff --git a/ivatar/ivataraccount/test_views.py b/ivatar/ivataraccount/test_views.py index 0b9ca67..5f5349b 100644 --- a/ivatar/ivataraccount/test_views.py +++ b/ivatar/ivataraccount/test_views.py @@ -25,7 +25,7 @@ django.setup() # pylint: disable=wrong-import-position from ivatar import settings from ivatar.ivataraccount.forms import MAX_NUM_UNCONFIRMED_EMAILS_DEFAULT -from ivatar.ivataraccount.models import Photo, ConfirmedOpenId +from ivatar.ivataraccount.models import Photo, ConfirmedOpenId, ConfirmedEmail from ivatar.utils import random_string # pylint: enable=wrong-import-position @@ -452,7 +452,7 @@ class Tester(TestCase): # pylint: disable=too-many-public-methods 'email', 'Address already added, currently unconfirmed') - def test_add_already_confirmed_email(self): # pylint: disable=invalid-name + def test_add_already_confirmed_email_self(self): # pylint: disable=invalid-name ''' Request adding mail address that is already confirmed (by someone) ''' @@ -460,6 +460,33 @@ class Tester(TestCase): # pylint: disable=too-many-public-methods # Should set EMAIL_BACKEND, so no need to do it here self.test_confirm_email() + response = self.client.post( + reverse('add_email'), { + 'email': self.email, + }, + follow=True, + ) + self.assertFormError( + response, + 'form', + 'email', + 'Address already confirmed (by you)') + + def test_add_already_confirmed_email_other(self): # pylint: disable=invalid-name + ''' + Request adding mail address that is already confirmed (by someone) + ''' + # Create test mail and confirm it, reuse test code + # Should set EMAIL_BACKEND, so no need to do it here + self.test_confirm_email() + + # Create another user and assign the mail address to that one + # in order to test the correct error message + otheruser = User.objects.create(username='otheruser') + confirmedemail = ConfirmedEmail.objects.last() + confirmedemail.user = otheruser + confirmedemail.save() + response = self.client.post( reverse('add_email'), { 'email': self.email, diff --git a/ivatar/middleware.py b/ivatar/middleware.py index 6f6e066..2f052be 100644 --- a/ivatar/middleware.py +++ b/ivatar/middleware.py @@ -9,7 +9,7 @@ class MultipleProxyMiddleware(MiddlewareMixin): # pylint: disable=too-few-publi with multiple proxies """ - def process_request(self, request): + def process_request(self, request): # pylint: disable=no-self-use """ Rewrites the proxy headers so that forwarded server is used if available. diff --git a/ivatar/test_static_pages.py b/ivatar/test_static_pages.py index 5191509..89596c0 100644 --- a/ivatar/test_static_pages.py +++ b/ivatar/test_static_pages.py @@ -2,32 +2,18 @@ Test our views in ivatar.ivataraccount.views and ivatar.views ''' # pylint: disable=too-many-lines -from urllib.parse import urlsplit -from io import BytesIO -import io import os import django from django.test import TestCase from django.test import Client from django.urls import reverse from django.contrib.auth.models import User -from django.contrib.auth import authenticate -import hashlib -from libravatar import libravatar_url - -from PIL import Image +from ivatar.utils import random_string os.environ['DJANGO_SETTINGS_MODULE'] = 'ivatar.settings' django.setup() -# pylint: disable=wrong-import-position -from ivatar import settings -from ivatar.ivataraccount.forms import MAX_NUM_UNCONFIRMED_EMAILS_DEFAULT -from ivatar.ivataraccount.models import Photo, ConfirmedOpenId -from ivatar.utils import random_string -# pylint: enable=wrong-import-position - class Tester(TestCase): # pylint: disable=too-many-public-methods ''' @@ -77,4 +63,3 @@ class Tester(TestCase): # pylint: disable=too-many-public-methods """ response = self.client.get(reverse('security')) self.assertEqual(response.status_code, 200, 'no 200 ok?') - diff --git a/ivatar/test_views.py b/ivatar/test_views.py index cc18515..5631b8f 100644 --- a/ivatar/test_views.py +++ b/ivatar/test_views.py @@ -2,32 +2,17 @@ Test our views in ivatar.ivataraccount.views and ivatar.views ''' # pylint: disable=too-many-lines -from urllib.parse import urlsplit -from io import BytesIO -import io import os import django from django.test import TestCase from django.test import Client -from django.urls import reverse from django.contrib.auth.models import User -from django.contrib.auth import authenticate -import hashlib -from libravatar import libravatar_url - -from PIL import Image +from ivatar.utils import random_string os.environ['DJANGO_SETTINGS_MODULE'] = 'ivatar.settings' django.setup() -# pylint: disable=wrong-import-position -from ivatar import settings -from ivatar.ivataraccount.forms import MAX_NUM_UNCONFIRMED_EMAILS_DEFAULT -from ivatar.ivataraccount.models import Photo, ConfirmedOpenId -from ivatar.utils import random_string -# pylint: enable=wrong-import-position - class Tester(TestCase): # pylint: disable=too-many-public-methods ''' diff --git a/ivatar/test_wsgi.py b/ivatar/test_wsgi.py index 2e016ba..e2da514 100644 --- a/ivatar/test_wsgi.py +++ b/ivatar/test_wsgi.py @@ -17,6 +17,6 @@ class TestCase(unittest.TestCase): ''' Run wsgi import ''' - import ivatar.wsgi + import ivatar.wsgi # pylint: disable=import-outside-toplevel self.assertEqual(ivatar.wsgi.application.__class__, django.core.handlers.wsgi.WSGIHandler) diff --git a/ivatar/tools/views.py b/ivatar/tools/views.py index 545fcc6..a2adf8d 100644 --- a/ivatar/tools/views.py +++ b/ivatar/tools/views.py @@ -2,6 +2,8 @@ View classes for ivatar/tools/ ''' from socket import inet_ntop, AF_INET6 +import hashlib +import random from django.views.generic.edit import FormView from django.urls import reverse_lazy as reverse @@ -12,10 +14,9 @@ import DNS from libravatar import libravatar_url, parse_user_identity from libravatar import SECURE_BASE_URL as LIBRAVATAR_SECURE_BASE_URL from libravatar import BASE_URL as LIBRAVATAR_BASE_URL -import hashlib -from .forms import CheckDomainForm, CheckForm from ivatar.settings import SECURE_BASE_URL, BASE_URL +from .forms import CheckDomainForm, CheckForm # pylint: disable=relative-beyond-top-level class CheckDomainView(FormView): @@ -32,12 +33,20 @@ class CheckDomainView(FormView): domain = form.cleaned_data['domain'] result['avatar_server_http'] = lookup_avatar_server(domain, False) if result['avatar_server_http']: - result['avatar_server_http_ipv4'] = lookup_ip_address(result['avatar_server_http'], False) - result['avatar_server_http_ipv6'] = lookup_ip_address(result['avatar_server_http'], True) + result['avatar_server_http_ipv4'] = lookup_ip_address( + result['avatar_server_http'], + False) + result['avatar_server_http_ipv6'] = lookup_ip_address( + result['avatar_server_http'], + True) result['avatar_server_https'] = lookup_avatar_server(domain, True) if result['avatar_server_https']: - result['avatar_server_https_ipv4'] = lookup_ip_address(result['avatar_server_https'], False) - result['avatar_server_https_ipv6'] = lookup_ip_address(result['avatar_server_https'], True) + result['avatar_server_https_ipv4'] = lookup_ip_address( + result['avatar_server_https'], + False) + result['avatar_server_https_ipv6'] = lookup_ip_address( + result['avatar_server_https'], + True) return render(self.request, self.template_name, { 'form': form, 'result': result, @@ -75,21 +84,21 @@ class CheckView(FormView): size = form.cleaned_data['size'] if form.cleaned_data['mail']: mailurl = libravatar_url( - email=form.cleaned_data['mail'], - size=size, - default=default_url) + email=form.cleaned_data['mail'], + size=size, + default=default_url) mailurl = mailurl.replace(LIBRAVATAR_BASE_URL, BASE_URL) mailurl_secure = libravatar_url( - email=form.cleaned_data['mail'], - size=size, - https=True, - default=default_url) + email=form.cleaned_data['mail'], + size=size, + https=True, + default=default_url) mailurl_secure = mailurl_secure.replace( - LIBRAVATAR_SECURE_BASE_URL, - SECURE_BASE_URL) + LIBRAVATAR_SECURE_BASE_URL, + SECURE_BASE_URL) mail_hash = parse_user_identity( - email=form.cleaned_data['mail'], - openid=None)[0] + email=form.cleaned_data['mail'], + openid=None)[0] hash_obj = hashlib.new('sha256') hash_obj.update(form.cleaned_data['mail'].encode('utf-8')) mail_hash256 = hash_obj.hexdigest() @@ -97,24 +106,25 @@ class CheckView(FormView): mail_hash, mail_hash256) if form.cleaned_data['openid']: - if not form.cleaned_data['openid'].startswith('http://') and not form.cleaned_data['openid'].startswith('https://'): + if not form.cleaned_data['openid'].startswith('http://') and \ + not form.cleaned_data['openid'].startswith('https://'): form.cleaned_data['openid'] = 'http://%s' % form.cleaned_data['openid'] openidurl = libravatar_url( - openid=form.cleaned_data['openid'], - size=size, - default=default_url) + openid=form.cleaned_data['openid'], + size=size, + default=default_url) openidurl = openidurl.replace(LIBRAVATAR_BASE_URL, BASE_URL) openidurl_secure = libravatar_url( - openid=form.cleaned_data['openid'], - size=size, - https=True, - default=default_url) + openid=form.cleaned_data['openid'], + size=size, + https=True, + default=default_url) openidurl_secure = openidurl_secure.replace( - LIBRAVATAR_SECURE_BASE_URL, - SECURE_BASE_URL) + LIBRAVATAR_SECURE_BASE_URL, + SECURE_BASE_URL) openid_hash = parse_user_identity( - openid=form.cleaned_data['openid'], - email=None)[0] + openid=form.cleaned_data['openid'], + email=None)[0] return render(self.request, self.template_name, { 'form': form, @@ -166,7 +176,8 @@ def lookup_avatar_server(domain, https): records = [] for answer in dns_request.answers: - if ('data' not in answer) or (not answer['data']) or (not answer['typename']) or (answer['typename'] != 'SRV'): + if ('data' not in answer) or (not answer['data']) or \ + (not answer['typename']) or (answer['typename'] != 'SRV'): continue record = {'priority': int(answer['data'][0]), 'weight': int(answer['data'][1]), @@ -203,7 +214,10 @@ def srv_hostname(records): if ret['priority'] > top_priority: # ignore the record (ret has lower priority) continue - elif ret['priority'] < top_priority: + + # Take care - this if is only a if, if the above if + # uses continue at the end. else it should be an elsif + if ret['priority'] < top_priority: # reset the aretay (ret has higher priority) top_priority = ret['priority'] total_weight = 0 @@ -218,7 +232,7 @@ def srv_hostname(records): priority_records.insert(0, (0, ret)) if len(priority_records) == 1: - unused, ret = priority_records[0] + unused, ret = priority_records[0] # pylint: disable=unused-variable return (ret['target'], ret['port']) # Select first record according to RFC2782 weight ordering algorithm (page 3) @@ -261,7 +275,7 @@ def lookup_ip_address(hostname, ipv6): if ipv6: return inet_ntop(AF_INET6, answer['data']) - else: - return answer['data'] + + return answer['data'] return None diff --git a/ivatar/urls.py b/ivatar/urls.py index 39d44db..df3b450 100644 --- a/ivatar/urls.py +++ b/ivatar/urls.py @@ -29,7 +29,8 @@ urlpatterns = [ # pylint: disable=invalid-name GravatarProxyView.as_view(), name='gravatarproxy'), url('description/', TemplateView.as_view(template_name='description.html'), name='description'), # The following two are TODO TODO TODO TODO TODO - url('run_your_own/', TemplateView.as_view(template_name='run_your_own.html'), name='run_your_own'), + url('run_your_own/', + TemplateView.as_view(template_name='run_your_own.html'), name='run_your_own'), url('features/', TemplateView.as_view(template_name='features.html'), name='features'), url('security/', TemplateView.as_view(template_name='security.html'), name='security'), url('privacy/', TemplateView.as_view(template_name='privacy.html'), name='privacy'), @@ -39,10 +40,10 @@ urlpatterns = [ # pylint: disable=invalid-name MAINTENANCE = False try: - if settings.MAINTENANCE: - MAINTENANCE = True -except: - pass + if settings.MAINTENANCE: + MAINTENANCE = True +except: # pylint: disable=bare-except + pass if MAINTENANCE: urlpatterns.append(url('', TemplateView.as_view(template_name='maintenance.html'), name='home')) diff --git a/ivatar/views.py b/ivatar/views.py index 95af253..fb79958 100644 --- a/ivatar/views.py +++ b/ivatar/views.py @@ -57,7 +57,10 @@ def get_size(request, size=DEFAULT_AVATAR_SIZE): class CachingHttpResponse(HttpResponse): - def __init__(self, uri, content=b'', content_type=None, status=200, reason=None, charset=None): + ''' + Handle caching of response + ''' + def __init__(self, uri, content=b'', content_type=None, status=200, reason=None, charset=None): # pylint: disable=too-many-arguments if CACHE_RESPONSE: caches['filesystem'].set(uri, { 'content': content, @@ -66,7 +69,7 @@ class CachingHttpResponse(HttpResponse): 'reason': reason, 'charset': charset }) - return super().__init__(content, content_type, status, reason, charset) + super().__init__(content, content_type, status, reason, charset) class AvatarImageView(TemplateView): ''' @@ -74,7 +77,7 @@ 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 + def options(self, request, *args, **kwargs): response = HttpResponse("", content_type='text/plain') response['Allow'] = "404 mm mp retro pagan wavatar monsterid robohash identicon" return response @@ -137,7 +140,7 @@ class AvatarImageView(TemplateView): except ObjectDoesNotExist: model = ConfirmedOpenId try: - d = kwargs['digest'] + d = kwargs['digest'] # pylint: disable=invalid-name # OpenID is tricky. http vs. https, versus trailing slash or not # However, some users eventually have added their variations already # and therfore we need to use filter() and first() @@ -146,7 +149,7 @@ class AvatarImageView(TemplateView): Q(alt_digest1=d) | Q(alt_digest2=d) | Q(alt_digest3=d)).first() - except: + except: # pylint: disable=bare-except pass @@ -212,7 +215,7 @@ class AvatarImageView(TemplateView): img = img.resize((size, size), Image.ANTIALIAS) img.save(data, 'PNG', quality=JPEG_QUALITY) data.seek(0) - response = CachingHttpResponse( + response = CachingHttpResponse( uri, data, content_type='image/png') @@ -233,7 +236,7 @@ class AvatarImageView(TemplateView): return response if str(default) == 'identicon': - p = Pydenticon5() + p = Pydenticon5() # pylint: disable=invalid-name # In order to make use of the whole 32 bytes digest, we need to redigest them. newdigest = hashlib.md5(bytes(kwargs['digest'], 'utf-8')).hexdigest() img = p.draw(newdigest, size, 0) @@ -306,7 +309,7 @@ class GravatarProxyView(View): ''' # TODO: Do cache images!! Memcached? - def get(self, request, *args, **kwargs): # pylint: disable=too-many-branches,too-many-statements,too-many-locals,no-self-use,unused-argument + def get(self, request, *args, **kwargs): # pylint: disable=too-many-branches,too-many-statements,too-many-locals,no-self-use,unused-argument,too-many-return-statements ''' Override get from parent class ''' @@ -314,7 +317,7 @@ class GravatarProxyView(View): url = reverse_lazy( 'avatar_view', args=[kwargs['digest']]) + '?s=%i' % size + '&forcedefault=y' - if default != None: + if default is not None: url += '&default=%s' % default return HttpResponseRedirect(url) @@ -325,7 +328,7 @@ class GravatarProxyView(View): try: if str(request.GET['default']) != 'None': default = request.GET['default'] - except: + except: # pylint: disable=bare-except pass if str(default) != 'wavatar': @@ -344,7 +347,7 @@ class GravatarProxyView(View): if hashlib.md5(data.read()).hexdigest() == '71bc262d627971d13fe6f3180b93062a': cache.set(gravatar_test_url, 'default', 60) return redir_default(default) - except Exception as exc: + except Exception as exc: # pylint: disable=broad-except print('Gravatar test url fetch failed: %s' % exc) gravatar_url = 'https://secure.gravatar.com/avatar/' + kwargs['digest'] \ diff --git a/requirements.txt b/requirements.txt index 760b3df..d8ae36a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ autopep8 bcrypt defusedxml -Django +Django<3.2 django-auth-ldap django-bootstrap4 django-coverage-plugin diff --git a/schemas/export/0.1/export.xsd b/schemas/export/0.1/export.xsd new file mode 100644 index 0000000..0b3bc2d --- /dev/null +++ b/schemas/export/0.1/export.xsd @@ -0,0 +1,104 @@ + + + + + + XML Schema for Libravatar user account exports. + Last Modifed 2011-04-09 + + + + + + + Container for emails, openids and photos elements. + This is the root element of the XML file. + + + + + + + + + + + + + + + + Empty element holding user account-related information. + + + + + + + + + + + + + + Container for confirmed email addresses. + + + + + + + + + + + Container for confirmed OpenID URLs. + + + + + + + + + + + Container for uploaded/imported photos. + + + + + + + + + + + Container for a base64 encoded photo. + + + + + + + + + + + + + + File type for the given photo. + + + + + + + + + diff --git a/schemas/export/0.2/export.xsd b/schemas/export/0.2/export.xsd new file mode 100644 index 0000000..f2d2d86 --- /dev/null +++ b/schemas/export/0.2/export.xsd @@ -0,0 +1,105 @@ + + + + + + XML Schema for Libravatar user account exports. + Last Modifed 2013-01-12 + + + + + + + Container for emails, openids and photos elements. + This is the root element of the XML file. + + + + + + + + + + + + + + + + Empty element holding user account-related information. + + + + + + + + + + + + + + Container for confirmed email addresses. + + + + + + + + + + + Container for confirmed OpenID URLs. + + + + + + + + + + + Container for uploaded/imported photos. + + + + + + + + + + + Container for a base64 encoded photo. + + + + + + + + + + + + + + File type for the given photo. + + + + + + + + + + From 57f4cc46aa4cf47ff46697c86672aab548c3d1d3 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 23 Dec 2020 15:09:37 +0100 Subject: [PATCH 25/42] Make sure we lower-case the field input; Resolves #77 --- ivatar/tools/forms.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ivatar/tools/forms.py b/ivatar/tools/forms.py index 84e603e..3e895a5 100644 --- a/ivatar/tools/forms.py +++ b/ivatar/tools/forms.py @@ -99,3 +99,12 @@ class CheckForm(forms.Form): if not mail and not openid: raise ValidationError(_('Either OpenID or mail must be specified')) return self.cleaned_data + + def clean_openid(self): + data = self.cleaned_data['openid'] + return data.lower() + + def clean_mail(self): + data = self.cleaned_data['mail'] + print(data) + return data.lower() From f924a8e9c08f41c5caeabf671e2f41f73cc5992c Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 23 Dec 2020 15:20:56 +0100 Subject: [PATCH 26/42] Use latest Django again --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d8ae36a..760b3df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ autopep8 bcrypt defusedxml -Django<3.2 +Django django-auth-ldap django-bootstrap4 django-coverage-plugin From 9a40beda13ede8e690a9b773f17b9dd20b281029 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 23 Dec 2020 15:21:12 +0100 Subject: [PATCH 27/42] Add aux tests --- ivatar/test_auxiliary.py | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 ivatar/test_auxiliary.py diff --git a/ivatar/test_auxiliary.py b/ivatar/test_auxiliary.py new file mode 100644 index 0000000..ddf8b2d --- /dev/null +++ b/ivatar/test_auxiliary.py @@ -0,0 +1,46 @@ +''' +Test various other parts of ivatar/libravatar in order +to increase the overall test coverage. Test in here, didn't +fit anywhere else. +''' + +from django.test import TestCase +from django.contrib.auth.models import User + +from ivatar.utils import random_string +from ivatar.ivataraccount.models import pil_format, UserPreference + + +class Tester(TestCase): + ''' + Main test class + ''' + user = None + username = random_string() + + def setUp(self): + ''' + Prepare tests. + - Create user + ''' + self.user = User.objects.create_user( + username=self.username, + ) + + def test_pil_format(self): + ''' + Test pil format function + ''' + self.assertEqual(pil_format('jpg'), 'JPEG') + self.assertEqual(pil_format('jpeg'), 'JPEG') + self.assertEqual(pil_format('png'), 'PNG') + self.assertEqual(pil_format('gif'), 'GIF') + self.assertEqual(pil_format('abc'), None) + + def test_userprefs_str(self): + ''' + Test if str representation of UserPreferences is as expected + ''' + up = UserPreference(theme='default', user=self.user) + print(up) + From 8450f42a200e16b038649dc91e3cb1651a67f771 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 30 Dec 2020 13:41:04 +0100 Subject: [PATCH 28/42] Implement simple stats feature --- ivatar/urls.py | 3 ++- ivatar/views.py | 27 ++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/ivatar/urls.py b/ivatar/urls.py index df3b450..96b4d22 100644 --- a/ivatar/urls.py +++ b/ivatar/urls.py @@ -7,7 +7,7 @@ from django.conf.urls import url from django.conf.urls.static import static from django.views.generic import TemplateView, RedirectView from ivatar import settings -from . views import AvatarImageView, GravatarProxyView +from . views import AvatarImageView, GravatarProxyView, StatsView urlpatterns = [ # pylint: disable=invalid-name path('admin/', admin.site.urls), @@ -36,6 +36,7 @@ urlpatterns = [ # pylint: disable=invalid-name url('privacy/', TemplateView.as_view(template_name='privacy.html'), name='privacy'), url('contact/', TemplateView.as_view(template_name='contact.html'), name='contact'), path('talk_to_us/', RedirectView.as_view(url='/contact'), name='talk_to_us'), + url('stats/', StatsView.as_view(), name='stats'), ] MAINTENANCE = False diff --git a/ivatar/views.py b/ivatar/views.py index fb79958..d3de012 100644 --- a/ivatar/views.py +++ b/ivatar/views.py @@ -8,12 +8,14 @@ from urllib.request import urlopen from urllib.error import HTTPError, URLError from ssl import SSLError from django.views.generic.base import TemplateView, View -from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound +from django.http import HttpResponse, HttpResponseRedirect +from django.http import HttpResponseNotFound, JsonResponse from django.core.exceptions import ObjectDoesNotExist from django.core.cache import cache, caches from django.utils.translation import ugettext_lazy as _ from django.urls import reverse_lazy from django.db.models import Q +from django.contrib.auth.models import User from PIL import Image @@ -23,7 +25,8 @@ from pydenticon5 import Pydenticon5 import pagan from robohash import Robohash -from ivatar.settings import AVATAR_MAX_SIZE, JPEG_QUALITY, DEFAULT_AVATAR_SIZE, CACHE_RESPONSE +from ivatar.settings import AVATAR_MAX_SIZE, JPEG_QUALITY, DEFAULT_AVATAR_SIZE +from ivatar.settings import CACHE_RESPONSE from ivatar.settings import CACHE_IMAGES_MAX_AGE from . ivataraccount.models import ConfirmedEmail, ConfirmedOpenId from . ivataraccount.models import pil_format, file_format @@ -60,7 +63,8 @@ class CachingHttpResponse(HttpResponse): ''' Handle caching of response ''' - def __init__(self, uri, content=b'', content_type=None, status=200, reason=None, charset=None): # pylint: disable=too-many-arguments + def __init__(self, uri, content=b'', content_type=None, status=200, # pylint: disable=too-many-arguments + reason=None, charset=None): if CACHE_RESPONSE: caches['filesystem'].set(uri, { 'content': content, @@ -394,3 +398,20 @@ class GravatarProxyView(View): # We shouldn't reach this point... But make sure we do something return redir_default(default) + + +class StatsView(TemplateView, JsonResponse): + ''' + Return stats + ''' + def get(self, request, *args, **kwargs): # pylint: disable=too-many-branches,too-many-statements,too-many-locals,no-self-use,unused-argument,too-many-return-statements + retval = { + 'users': User.objects.all().count(), + 'mails': ConfirmedEmail.objects.all().count(), + 'openids': ConfirmedOpenId.objects.all().count(), # pylint: disable=no-member + } + + if request.content_type == 'application/json': + return JsonResponse(retval) + + return HttpResponseRedirect(reverse_lazy('home')) From 7d9f2ead9a9144dc9e2dac773a7bd7d0eafabed8 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 31 Mar 2021 14:32:22 +0200 Subject: [PATCH 29/42] Fix issue where password isn't set, but the password doesn't only return exclamation mark, but also some random string --- ivatar/ivataraccount/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivatar/ivataraccount/views.py b/ivatar/ivataraccount/views.py index ab78a25..94c1b30 100644 --- a/ivatar/ivataraccount/views.py +++ b/ivatar/ivataraccount/views.py @@ -998,7 +998,7 @@ class PasswordResetView(PasswordResetViewOriginal): # ResetPasswordView class will silently ignore the password # reset request if user: - if not user.password or user.password == '!': + if not user.password or user.password.startswith('!'): random_pass = User.objects.make_random_password() user.set_password(random_pass) user.save() From 334da91881464c7f7d697651158f142019b684ed Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Tue, 13 Apr 2021 11:08:17 +0200 Subject: [PATCH 30/42] Add date with last try to send mail and the status --- .../migrations/0016_auto_20210413_0904.py | 23 +++++++++++++++++++ ivatar/ivataraccount/models.py | 14 ++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 ivatar/ivataraccount/migrations/0016_auto_20210413_0904.py diff --git a/ivatar/ivataraccount/migrations/0016_auto_20210413_0904.py b/ivatar/ivataraccount/migrations/0016_auto_20210413_0904.py new file mode 100644 index 0000000..d1cc066 --- /dev/null +++ b/ivatar/ivataraccount/migrations/0016_auto_20210413_0904.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.7 on 2021-04-13 09:04 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ivataraccount', '0015_auto_20200225_0934'), + ] + + operations = [ + migrations.AddField( + model_name='unconfirmedemail', + name='last_send_date', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AddField( + model_name='unconfirmedemail', + name='last_status', + field=models.TextField(blank=True, max_length=2047, null=True), + ), + ] diff --git a/ivatar/ivataraccount/models.py b/ivatar/ivataraccount/models.py index bc51d64..3f73fb1 100644 --- a/ivatar/ivataraccount/models.py +++ b/ivatar/ivataraccount/models.py @@ -347,6 +347,8 @@ class UnconfirmedEmail(BaseAccountModel): ''' email = models.EmailField(max_length=MAX_LENGTH_EMAIL) verification_key = models.CharField(max_length=64) + last_send_date = models.DateTimeField(null=True, blank=True) + last_status = models.TextField(max_length=2047, null=True, blank=True) class Meta: # pylint: disable=too-few-public-methods ''' @@ -382,11 +384,17 @@ class UnconfirmedEmail(BaseAccountModel): 'verification_link': link, 'site_name': SITE_NAME, }) + self.last_send_date = timezone.now() + self.last_status = 'OK' # if settings.DEBUG: # print('DEBUG: %s' % link) - send_mail( - email_subject, email_body, DEFAULT_FROM_EMAIL, - [self.email]) + try: + send_mail( + email_subject, email_body, DEFAULT_FROM_EMAIL, + [self.email]) + except Exception as e: + self.last_status = "%s" % e + self.save() return True def __str__(self): From c5f493178c1248ce5beb19d966096b3ab753f85b Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Thu, 15 Apr 2021 13:13:23 +0200 Subject: [PATCH 31/42] Fix overwriting verification key upon sending confirmation mail --- ivatar/ivataraccount/models.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ivatar/ivataraccount/models.py b/ivatar/ivataraccount/models.py index 3f73fb1..1d7b97a 100644 --- a/ivatar/ivataraccount/models.py +++ b/ivatar/ivataraccount/models.py @@ -359,11 +359,12 @@ class UnconfirmedEmail(BaseAccountModel): def save(self, force_insert=False, force_update=False, using=None, update_fields=None): - hash_object = hashlib.new('sha256') - hash_object.update( - urandom(1024) + self.user.username.encode('utf-8') # pylint: disable=no-member - ) # pylint: disable=no-member - self.verification_key = hash_object.hexdigest() + if not self.verification_key: + hash_object = hashlib.new('sha256') + hash_object.update( + urandom(1024) + self.user.username.encode('utf-8') # pylint: disable=no-member + ) # pylint: disable=no-member + self.verification_key = hash_object.hexdigest() super(UnconfirmedEmail, self).save( force_insert, force_update, From a346bc628589bfa3d0305d30df150def1611ae86 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 21 Apr 2021 15:15:02 +0200 Subject: [PATCH 32/42] JSON of course return json, but also normal web requests --- ivatar/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ivatar/views.py b/ivatar/views.py index d3de012..57f21f0 100644 --- a/ivatar/views.py +++ b/ivatar/views.py @@ -411,7 +411,8 @@ class StatsView(TemplateView, JsonResponse): 'openids': ConfirmedOpenId.objects.all().count(), # pylint: disable=no-member } - if request.content_type == 'application/json': + # JSON of course return json, but also normal web requests default to JSON + if request.content_type == 'application/json' or request.content_type == 'text/plain': return JsonResponse(retval) return HttpResponseRedirect(reverse_lazy('home')) From b52244b16791a388061edbd2c449e7a99ad246b2 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 21 Apr 2021 15:29:16 +0200 Subject: [PATCH 33/42] We also need to handle 'text/html' this way --- ivatar/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivatar/views.py b/ivatar/views.py index 57f21f0..09e474b 100644 --- a/ivatar/views.py +++ b/ivatar/views.py @@ -412,7 +412,7 @@ class StatsView(TemplateView, JsonResponse): } # JSON of course return json, but also normal web requests default to JSON - if request.content_type == 'application/json' or request.content_type == 'text/plain': + if request.content_type in ('application/json', 'text/plain', 'text/html'): return JsonResponse(retval) return HttpResponseRedirect(reverse_lazy('home')) From 5733448830ae71fa4b4f18f5b5a6f518e6fc4b65 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Wed, 21 Apr 2021 15:41:05 +0200 Subject: [PATCH 34/42] Just default to sending JSON - everything else seems not to work correctly --- ivatar/views.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ivatar/views.py b/ivatar/views.py index 09e474b..49a8b33 100644 --- a/ivatar/views.py +++ b/ivatar/views.py @@ -411,8 +411,4 @@ class StatsView(TemplateView, JsonResponse): 'openids': ConfirmedOpenId.objects.all().count(), # pylint: disable=no-member } - # JSON of course return json, but also normal web requests default to JSON - if request.content_type in ('application/json', 'text/plain', 'text/html'): - return JsonResponse(retval) - - return HttpResponseRedirect(reverse_lazy('home')) + return JsonResponse(retval) From ca9f83984a21b3ac1755605655c6195d09772c4a Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Thu, 22 Apr 2021 07:43:32 +0200 Subject: [PATCH 35/42] Add patch from #81 (install instruction for Pillow) --- INSTALL.md | 1 + 1 file changed, 1 insertion(+) diff --git a/INSTALL.md b/INSTALL.md index da3e500..ee596c4 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -23,6 +23,7 @@ cd ivatar virtualenv -p python3 .virtualenv source .virtualenv/bin/activate pip install -r requirements.txt +pip install pillow ~~~~ ## (SQL) Migrations From 73fca0b953628bc6d95f1dde0f528fa7e3c8bf1e Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Thu, 27 May 2021 02:05:27 +0200 Subject: [PATCH 36/42] Add newer version of matrix contact page This patch provides a first draft for the new matrix contact details. It'S not perfect yet, since the matrix room name is still cumbersome. However, this should be fixed in the future and currently the matrix.to link should manage most of the directions. --- templates/contact.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/templates/contact.html b/templates/contact.html index 6d02405..499bebe 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -14,9 +14,7 @@ There are a few ways to get in touch with the ivatar/libravatar developers:

IRC

-If you have an IRC client already, you can join #libravatar on chat.freenode.net. -
-Otherwise, you can use this simple web interface. +You can join the Libravatar community chat at #libravatar:shivering-isles.com. It is also bridged to #libravatar on irc.libera.chat for those prefering IRC.
Please keep in mind that you may live in a different timezone than most of the developers. So if you do not get a response, it's not because we're ignoring you, it's probably because we're sleeping :) From 552da91044535470ff30c2b80a813e128139162e Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Fri, 28 May 2021 15:19:51 +0200 Subject: [PATCH 37/42] Adapt for Django 3.2. See also: https://docs.djangoproject.com/en/3.2/releases/3.2/ --- .../migrations/0017_auto_20210528_1314.py | 48 +++++++++++++++++++ ivatar/settings.py | 2 + 2 files changed, 50 insertions(+) create mode 100644 ivatar/ivataraccount/migrations/0017_auto_20210528_1314.py diff --git a/ivatar/ivataraccount/migrations/0017_auto_20210528_1314.py b/ivatar/ivataraccount/migrations/0017_auto_20210528_1314.py new file mode 100644 index 0000000..411c08f --- /dev/null +++ b/ivatar/ivataraccount/migrations/0017_auto_20210528_1314.py @@ -0,0 +1,48 @@ +# Generated by Django 3.2.3 on 2021-05-28 13:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ivataraccount', '0016_auto_20210413_0904'), + ] + + operations = [ + migrations.AlterField( + model_name='confirmedemail', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='confirmedopenid', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='openidassociation', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='openidnonce', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='photo', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='unconfirmedemail', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='unconfirmedopenid', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + ] diff --git a/ivatar/settings.py b/ivatar/settings.py index 7546ee1..82cf3f0 100644 --- a/ivatar/settings.py +++ b/ivatar/settings.py @@ -118,4 +118,6 @@ PROJECT_ROOT = os.path.abspath( STATIC_URL = '/static/' STATIC_ROOT = os.path.join(BASE_DIR, 'static') +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' + from config import * # pylint: disable=wildcard-import,wrong-import-position,unused-wildcard-import From 7a53a182220973eb60b5a4acf3e5b92dcbaa3955 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Fri, 28 May 2021 13:46:03 +0000 Subject: [PATCH 38/42] Replace matrix room alias The new alias is `#libravatar:matrix.org` as it sounds way more official. --- templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/contact.html b/templates/contact.html index 499bebe..30040ab 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -14,7 +14,7 @@ There are a few ways to get in touch with the ivatar/libravatar developers:

IRC

-You can join the Libravatar community chat at #libravatar:shivering-isles.com. It is also bridged to #libravatar on irc.libera.chat for those prefering IRC. +You can join the Libravatar community chat at #libravatar:matrix.org. It is also bridged to #libravatar on irc.libera.chat for those prefering IRC.
Please keep in mind that you may live in a different timezone than most of the developers. So if you do not get a response, it's not because we're ignoring you, it's probably because we're sleeping :) From d9f4a4f63418e2da644097ba416a03a55fec4375 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Fri, 28 May 2021 18:10:01 +0200 Subject: [PATCH 39/42] Add link to libera.chat --- templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/contact.html b/templates/contact.html index 30040ab..65997d0 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -14,7 +14,7 @@ There are a few ways to get in touch with the ivatar/libravatar developers:

IRC

-You can join the Libravatar community chat at #libravatar:matrix.org. It is also bridged to #libravatar on irc.libera.chat for those prefering IRC. +You can join the Libravatar community chat at #libravatar:matrix.org. It is also bridged to #libravatar on irc.libera.chat for those prefering IRC.
Please keep in mind that you may live in a different timezone than most of the developers. So if you do not get a response, it's not because we're ignoring you, it's probably because we're sleeping :) From dcb36271795d309362d0f24c03cb1f5312b51866 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 31 May 2021 07:51:03 +0000 Subject: [PATCH 40/42] Fix reqs that ended up in master only --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d8ae36a..760b3df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ autopep8 bcrypt defusedxml -Django<3.2 +Django django-auth-ldap django-bootstrap4 django-coverage-plugin From 9defe7617a7c6babd25722add508a3a98b6057c1 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Fri, 11 Jun 2021 11:29:12 +0200 Subject: [PATCH 41/42] Ignore a few more files --- .coveragerc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.coveragerc b/.coveragerc index b023fc9..315f343 100644 --- a/.coveragerc +++ b/.coveragerc @@ -5,6 +5,11 @@ omit = node_modules/* .virtualenv/* import_libravatar.py + requirements.txt + static/admin/* + static/humans.txt + static/img/robots.txt + [html] extra_css = coverage_extra_style.css From 0c2f039ff4a4014a7f0081be95fd86bf6b98f3d7 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 6 Sep 2021 13:27:29 +0000 Subject: [PATCH 42/42] Fix CI/CD --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 854773c..9217ca8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,6 @@ -image: docker.io/ofalk/fedora31-python3 +image: + name: quay.io/rhn_support_ofalk/fedora34-python3 + entrypoint: [ '/bin/sh', '-c' ] before_script: - virtualenv -p python3 /tmp/.virtualenv