Skip to content

Fix #9864: Decrease $maxDelay in Throttler.php - #9875

Merged
MorrisJobke merged 1 commit into
nextcloud:masterfrom
wiyh12nf89x:Issue#9864_WebDAV_timeout_fix_maxDelay
Jun 15, 2018
Merged

Fix #9864: Decrease $maxDelay in Throttler.php#9875
MorrisJobke merged 1 commit into
nextcloud:masterfrom
wiyh12nf89x:Issue#9864_WebDAV_timeout_fix_maxDelay

Conversation

@wiyh12nf89x

@wiyh12nf89xwiyh12nf89x commented Jun 15, 2018

Copy link
Copy Markdown

Fix#9864

Signed-off-by: Mark Berezovsky xpnf@yandex.ru

Signed-off-by: Mark Berezovsky <xpnf@yandex.ru>
@codecov

codecovBot commented Jun 15, 2018

Copy link
Copy Markdown

Codecov Report

Merging #9875 into master will not change coverage.
The diff coverage is 0%.

@@ Coverage Diff @@## master #9875 +/- ##
=========================================
Coverage 51.92% 51.92% Complexity 25787 25787 =========================================
Files 1637 1637 Lines 95453 95453 Branches 1318 1318 =========================================
Hits 49566 49566 Misses 45887 45887
Impacted FilesCoverage ΔComplexity Δ
lib/private/Security/Bruteforce/Throttler.php38.13% <0%> (ø)27 <0> (ø)⬇️
apps/files_trashbin/lib/Expiration.php90.32% <0%> (-1.62%)29% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php72.7% <0%> (+0.24%)136% <0%> (ø)⬇️

@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.

Makes sense 👍

@MorrisJobkeMorrisJobke added enhancement security papercut Annoying recurring UX issue with possibly simple fix. labels Jun 15, 2018
@MorrisJobkeMorrisJobke added this to the Nextcloud 14 milestone Jun 15, 2018
@MorrisJobkeMorrisJobke added the 3. to review Waiting for reviews label Jun 15, 2018
@MorrisJobke
MorrisJobke merged commit a0496b2 into nextcloud:masterJun 15, 2018
@brunob

Copy link
Copy Markdown

Hi, this fix has not been merged to branch 13, and i can confirm that it fixes the problem of NC client sync with NC server 13.0.11 (like described in some of the issues pointed #9864 (comment)). Could this patch be merged to branch 13 ?

@MorrisJobke

Copy link
Copy Markdown
Member

Hi, this fix has not been merged to branch 13, and i can confirm that it fixes the problem of NC client sync with NC server 13.0.11 (like described in some of the issues pointed #9864 (comment)). Could this patch be merged to branch 13 ?

13 is close to end of life (last release in ~1,5 week). We try to minimize the amount of back ports to those and focus on security related backports. We highly recommend to upgrade to Nextcloud 14+.

@wiyh12nf89x

Copy link
Copy Markdown
Author

Hi, this fix has not been merged to branch 13, and i can confirm that it fixes the problem of NC client sync with NC server 13.0.11 (like described in some of the issues pointed #9864 (comment)). Could this patch be merged to branch 13 ?

Anyways, you can just manually change the variable value after you have installed/upgraded the server:
sed -i -- 's/\$maxDelay = 30/\$maxDelay = 25/g' /path-to-server/lib/private/Security/Bruteforce/Throttler.php

@brunob

Copy link
Copy Markdown

@MorrisJobke nice point, but since it will be the last release of this branch it could be the opportunity to prevent a blocking client sync bug. Anyway, thx for the answer ;)

@MorrisJobke

Copy link
Copy Markdown
Member

/backport to stable13

@MorrisJobke

Copy link
Copy Markdown
Member

@MorrisJobke nice point, but since it will be the last release of this branch it could be the opportunity to prevent a blocking client sync bug. Anyway, thx for the answer ;)

Fine with me if it is a pure cherry-pick :)

@backportbot-nextcloud

Copy link
Copy Markdown

backport to stable13 in #14224

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsenhancementpapercutAnnoying recurring UX issue with possibly simple fix.security

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@wiyh12nf89x@brunob@MorrisJobke@skjnldsv