From 8e8bfab7894cb58a8dbb86f5cff278c655ab619b Mon Sep 17 00:00:00 2001 From: Steve Meinel Date: Thu, 12 May 2016 15:14:23 -0700 Subject: [PATCH 1/4] BUGFIX: Missing migration --- axes/migrations/0003_auto_20160322_0929.py | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 axes/migrations/0003_auto_20160322_0929.py diff --git a/axes/migrations/0003_auto_20160322_0929.py b/axes/migrations/0003_auto_20160322_0929.py new file mode 100644 index 0000000..b47d693 --- /dev/null +++ b/axes/migrations/0003_auto_20160322_0929.py @@ -0,0 +1,59 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('axes', '0002_auto_20151217_2044'), + ] + + operations = [ + migrations.AlterField( + model_name='accessattempt', + name='failures_since_start', + field=models.PositiveIntegerField(verbose_name='Failed Logins'), + ), + migrations.AlterField( + model_name='accessattempt', + name='get_data', + field=models.TextField(verbose_name='GET Data'), + ), + migrations.AlterField( + model_name='accessattempt', + name='http_accept', + field=models.CharField(verbose_name='HTTP Accept', max_length=1025), + ), + migrations.AlterField( + model_name='accessattempt', + name='ip_address', + field=models.GenericIPAddressField(null=True, verbose_name='IP Address', db_index=True), + ), + migrations.AlterField( + model_name='accessattempt', + name='path_info', + field=models.CharField(verbose_name='Path', max_length=255), + ), + migrations.AlterField( + model_name='accessattempt', + name='post_data', + field=models.TextField(verbose_name='POST Data'), + ), + migrations.AlterField( + model_name='accesslog', + name='http_accept', + field=models.CharField(verbose_name='HTTP Accept', max_length=1025), + ), + migrations.AlterField( + model_name='accesslog', + name='ip_address', + field=models.GenericIPAddressField(null=True, verbose_name='IP Address', db_index=True), + ), + migrations.AlterField( + model_name='accesslog', + name='path_info', + field=models.CharField(verbose_name='Path', max_length=255), + ), + ] From 21d974b1dda5de08419b400bd0a6df7720c37421 Mon Sep 17 00:00:00 2001 From: Camilo Nova Date: Fri, 13 May 2016 08:08:25 -0500 Subject: [PATCH 2/4] Release 1.6.1 --- CHANGES.txt | 30 ++++++++++++++++++++++++++++++ setup.py | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 30f5fc0..5025ed3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,36 @@ Changes ======= +1.6.1 (2016-05-13) +------------------ + +- Fixes whitelist check when BEHIND_REVERSE_PROXY + [Patrick Hagemeister] + +- Made migrations py3 compatible + [mvdwaeter] + +- Fixing #126, possibly breaking compatibility with Django<=1.7 + [int-ua] + +- Add note for upgrading users about new migration files + [kelseyq] + +- Fixes #148 + [camilonova] + +- Decorate auth_views.login only once + [teeberg] + +- Set IP public/private classifier to be compliant with RFC 1918. + [SilasX] + +- Issue #155. Lockout response status code changed to 403. + [Артур Муллахметов] + +- BUGFIX: Missing migration + [smeinel] + 1.6.0 (2016-01-07) ------------------ diff --git a/setup.py b/setup.py index ad65f9a..7470e78 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ import os from setuptools import setup, find_packages -VERSION = '1.6.0' +VERSION = '1.6.1' setup( name='django-axes', From dfc2a50f2c3317e3f75dbcc40fe9e7309cc4010d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Luter?= Date: Fri, 20 May 2016 17:44:20 +0200 Subject: [PATCH 3/4] use render shortcut for rendering LOCKOUT_TEMPLATE --- axes/decorators.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/axes/decorators.py b/axes/decorators.py index 21cb6b6..6ab7ea8 100644 --- a/axes/decorators.py +++ b/axes/decorators.py @@ -8,6 +8,7 @@ from django.contrib.auth import logout from django.core.exceptions import ObjectDoesNotExist from django.http import HttpResponse from django.http import HttpResponseRedirect +from django.shortcuts import render from django.template.loader import get_template from django.utils import timezone as datetime from django.utils.translation import ugettext_lazy @@ -356,9 +357,7 @@ def lockout_response(request): 'failure_limit': FAILURE_LIMIT, 'username': request.POST.get(USERNAME_FORM_FIELD, '') } - template = get_template(LOCKOUT_TEMPLATE) - content = template.render(context, request) - return HttpResponse(content, status=403) + return render(request, LOCKOUT_TEMPLATE, context, status=403) LOCKOUT_URL = get_lockout_url() if LOCKOUT_URL: From 677fa3986bb14ed03b1080840a313dd6532f330b Mon Sep 17 00:00:00 2001 From: Yohan Graterol Date: Mon, 23 May 2016 08:02:33 -0500 Subject: [PATCH 4/4] Added app_label for RemovedInDjango19Warning --- axes/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/axes/models.py b/axes/models.py index eb2f4f4..4ad0373 100644 --- a/axes/models.py +++ b/axes/models.py @@ -41,6 +41,7 @@ class CommonAccess(models.Model): ) class Meta: + app_label = 'axes' abstract = True ordering = ['-attempt_time']