Skip to content

[stable13] Dont polute the log on DAV emaillogin - #8045

Merged
rullzer merged 2 commits into
stable13from
8002_13
Feb 6, 2018
Merged

[stable13] Dont polute the log on DAV emaillogin#8045
rullzer merged 2 commits into
stable13from
8002_13

Conversation

@rullzer

@rullzerrullzer commented Jan 25, 2018

Copy link
Copy Markdown
Member

Backport of #8002

@rullzer
Don't polute log when loggin into dav with email
9dfd354
* 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
Fix tests
2bed7a7
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzerrullzer added enhancement 3. to review Waiting for reviews labels Jan 25, 2018
@rullzerrullzer added this to the Nextcloud 13.0.1 milestone Jan 25, 2018
@codecov

codecovBot commented Jan 25, 2018•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #8045 into stable13 will increase coverage by 0.16%.
The diff coverage is n/a.

@@ Coverage Diff @@## stable13 #8045 +/- ##
=============================================
+ Coverage 51.23% 51.4% +0.16% + Complexity 24981 24979 -2 
=============================================
Files 1607 1599 -8 Lines 95049 94727 -322 Branches 1376 1376 =============================================
- Hits 48696 48691 -5 + Misses 46353 46036 -317
Impacted FilesCoverage ΔComplexity Δ
lib/versioncheck.php
...s/user_ldap/lib/Controller/ConfigAPIController.php
apps/dav/lib/Migration/CalDAVRemoveEmptyValue.php
apps/user_ldap/lib/Wizard.php
...files_trashbin/composer/composer/autoload_psr4.php
apps/dav/lib/CardDAV/ContactsManager.php
apps/files_versions/composer/autoload.php
...pps/encryption/composer/composer/autoload_real.php
apps/dav/lib/CalDAV/CalDavBackend.php
.../private/App/AppStore/Bundles/EnterpriseBundle.php
... and 3194 more

MorrisJobke
MorrisJobke approved these changes Jan 31, 2018
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested and works 👍

@rullzer

rullzer commented Feb 6, 2018

Copy link
Copy Markdown
MemberAuthor

Review time! we can merge 13.0.1 stuff!

@ChristophWurstChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Feb 6, 2018
@rullzer
rullzer merged commit b55b1b5 into stable13Feb 6, 2018
@rullzer
rullzer deleted the 8002_13 branch February 6, 2018 14:36
@MorrisJobkeMorrisJobke mentioned this pull request Mar 9, 2018
Merged
10 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@icewind1991icewind1991icewind1991 approved these changes
@nickvergessennickvergessenAwaiting requested review from nickvergessen
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishenhancement

Projects

None yet

Milestone

Nextcloud 13.0.1

Development

Successfully merging this pull request may close these issues.

4 participants

@rullzer@MorrisJobke@icewind1991@ChristophWurst