Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User and ip lockout #40

Merged
merged 6 commits into from
May 4, 2015
Merged

Conversation

mrbaboon
Copy link
Contributor

Allow username and IP to be mutually exclusive when performing lockouts. This resolves an issue where you may have many users behind a single IP (common amongst our enterprise customers) where 1 user forgetting their password will lock out their peers.

The setting changes the lockout checks to evaluate if the IP failure limit and the username failure limit has been reached before issuing the lockout.

Any suggestions or comments are more than welcome!

@landscape-bot
Copy link

Code Health
Repository health decreased by 0.26% when pulling b583f6f on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

@landscape-bot
Copy link

Code Health
Code quality remained the same when pulling 319027c on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 92.18% when pulling 319027c on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

3 similar comments
@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 92.18% when pulling 319027c on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 92.18% when pulling 319027c on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 92.18% when pulling 319027c on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 92.18% when pulling 319027c on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

2 similar comments
@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 92.18% when pulling 319027c on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 92.18% when pulling 319027c on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

@kencochrane
Copy link
Collaborator

@mrbaboon thank you, I'll take a look at this PR shortly.

@kencochrane
Copy link
Collaborator

LGTM

@marcusmartins @shin- let me know if it looks good to you.

@shin-
Copy link
Collaborator

shin- commented Apr 24, 2015

LGTM

@marcusmartins
Copy link
Collaborator

The code LGTM but we should add some docs on usage and behavior.

@mrbaboon
Copy link
Contributor Author

@marcusmartins I agree, oversight on my part. I'll add the docs in later today or tomorrow then we can close it out.

@mrbaboon
Copy link
Contributor Author

Docs are added!

@landscape-bot
Copy link

Code Health
Code quality remained the same when pulling 11cf1da on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 92.18% when pulling 11cf1da on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

2 similar comments
@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 92.18% when pulling 11cf1da on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 92.18% when pulling 11cf1da on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

@@ -13,7 +13,7 @@ backend best fits their needs.
Build status
------------

[![Build Status](https://travis-ci.org/kencochrane/django-defender.svg)](https://travis-ci.org/kencochrane/django-defender) [![Coverage Status](https://img.shields.io/coveralls/kencochrane/django-defender.svg)](https://coveralls.io/r/kencochrane/django-defender)[![Code Health](https://landscape.io/github/kencochrane/django-defender/master/landscape.svg)](https://landscape.io/github/kencochrane/django-defender/master)
[![Build Status](https://travis-ci.org/mrbaboon/django-defender.svg)](https://travis-ci.org/mrbaboon/django-defender) [![Coverage Status](https://img.shields.io/coveralls/kencochrane/django-defender.svg)](https://coveralls.io/r/kencochrane/django-defender)[![Code Health](https://landscape.io/github/kencochrane/django-defender/master/landscape.svg)](https://landscape.io/github/kencochrane/django-defender/master)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably don't need to change to your status icon, keeping it kencochrane would be best so that it works on master.

@mrbaboon
Copy link
Contributor Author

mrbaboon commented May 4, 2015

Ah yes, sorry, missed that in my diff, good catch!

@landscape-bot
Copy link

Code Health
Code quality remained the same when pulling 4757528 on mrbaboon:UserAndIPLockout into a381060 on kencochrane:master.

@kencochrane
Copy link
Collaborator

THank you.

kencochrane added a commit that referenced this pull request May 4, 2015
@kencochrane kencochrane merged commit 5fb01ae into jazzband:master May 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants