Dont polute the log on DAV emaillogin#8002
Merged
MorrisJobke merged 2 commits intomasterfrom Jan 24, 2018
Merged
Conversation
* We first try the email as username but this fails * Then we get the uid from the email and try again We should not log the first attempt since it polutes the log with failed login attempts while the login actually is valid. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
rullzer
requested review from
ChristophWurst,
LukasReschke,
MorrisJobke,
icewind1991 and
nickvergessen
MorrisJobke
reviewed
Jan 23, 2018
tests/lib/User/SessionTest.php
Outdated
| use OCP\Lockdown\ILockdownManager; | ||
| use OCP\Security\ICrypto; | ||
| use OCP\Security\ISecureRandom; | ||
| use const ZipStreamer\INT64_LOW_MAP; |
rullzer
force-pushed
the
dont_polutelog_dav_emaillogin
branch
from
cffb73f to
ef127a3
Compare
icewind1991
requested changes
Jan 23, 2018
| $throttler->sleepDelay($request->getRemoteAddress(), 'login'); | ||
| } | ||
| return false; | ||
| } |
Member
There was a problem hiding this comment.
missing an else {return true;}?
Member
Author
There was a problem hiding this comment.
See
server/lib/private/User/Session.php
Line 434 in ef127a3
icewind1991
approved these changes
Jan 23, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
To test:
user1and set the email to somethingcurl -u <email>:<pass> <server>/remote.php/webdav -X PROPFINDBefore: get a log entry saying login failed
After: No log entry
I also fixed that the thorttler was not increased when the email login was also invalid.