Hopiu/django-axes
1
0
Fork 0
mirror of https://github.com/jazzband/django-axes.git synced 2026-05-03 05:04:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #121 from django-pci/revert-120-master

Browse source 
Revert "properly use username and IP when pulling attempts.
This commit is contained in:
Camilo Nova 2015-06-26 11:25:45 -05:00
commit 493184b3e7
2 changed files with 4 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
axes/decorators.py
View file

@ -238,12 +238,10 @@ def _get_user_attempts(request):
ip_address=ip, username=username, trusted=True
)
if not attempts:
if not attempts and not LOCK_OUT_BY_COMBINATION_USER_AND_IP:
params = {'ip_address': ip, 'trusted': False}
if USE_USER_AGENT:
params['user_agent'] = ua
if LOCK_OUT_BY_COMBINATION_USER_AND_IP:
params['username'] = username
attempts = AccessAttempt.objects.filter(**params)

37
axes/tests.py
View file

@ -2,12 +2,10 @@ import random
import string
import time
from django.conf import settings
from django.test import TestCase
from django.core.urlresolvers import NoReverseMatch, reverse
if not settings.configured:
settings.configure()
from django.contrib.auth.models import User
from django.core.urlresolvers import NoReverseMatch
from django.core.urlresolvers import reverse
from axes.decorators import COOLOFF_TIME
from axes.decorators import FAILURE_LIMIT
@ -16,7 +14,6 @@ from axes.signals import user_locked_out
from axes.utils import reset
class AccessAttemptTest(TestCase):
"""Test case using custom settings for testing
"""
@ -52,13 +49,6 @@ class AccessAttemptTest(TestCase):
def setUp(self):
"""Create a valid user for login
"""
try:
from django.contrib.auth import get_user_model
except ImportError: # django < 1.5
from django.contrib.auth.models import User
else:
User = get_user_model()
self.user = User.objects.create_superuser(
username='valid-username',
email='test@example.com',
@ -94,27 +84,6 @@ class AccessAttemptTest(TestCase):
response = self._login()
self.assertContains(response, self.LOCKED_MESSAGE)
def test_failure_username_ip(self):
"""Tests the login lock based on a combination of username
and IP address
"""
with self.settings(AXES_LOCK_OUT_BY_COMBINATION_USER_AND_IP=True):
for i in range(1, FAILURE_LIMIT): # test until one try before the limit
response = self._login()
# Check if we are in the same login page
self.assertContains(response, self.LOGIN_FORM_KEY)
# So, we shouldn't have gotten a lock-out yet.
# But we should get one now
response = self._login()
self.assertContains(response, self.LOCKED_MESSAGE)
self.user.username='other-user'
self.user.save()
response = self._login()
self.test_valid_login()
def test_valid_login(self):
"""Tests a valid login for a real username
"""