Do not load calendar/addressbook plugins if not needed by rullzer · Pull Request #9268 · nextcloud/server

rullzer · 2018-04-23T07:53:11Z

Fixes#6711
Based on owncloud/core@f0fb21c

Signed-off-by: Roeland Jago Douma roeland@famdouma.nl

MorrisJobke · 2018-04-23T08:47:30Z

Does this also fix stuff like #8141? And #8827?

georgehrke · 2018-04-23T08:49:44Z

@MorrisJobke It should be as far as i can tell.

georgehrke · 2018-04-23T08:50:00Z

I will check when testing this pr.

rullzer · 2018-04-23T08:52:14Z

Yes it should

MorrisJobke

Tested, works and code makes sense 👍

MorrisJobke · 2018-04-23T10:18:17Z

CI fails :/

codecov · 2018-04-23T12:03:23Z

Codecov Report

Merging #9268 into master will decrease coverage by 22.57%.
The diff coverage is 3.07%.

@@ Coverage Diff @@## master #9268 +/- ##
=============================================
- Coverage 51.68% 29.11% -22.58% - Complexity 25691 25707 +16 
=============================================
Files 1634 1569 -65 Lines 95914 88082 -7832 Branches 1384 0 -1384 =============================================
- Hits 49571 25642 -23929 - Misses 46343 62440 +16097

Impacted Files	Coverage Δ	Complexity Δ
apps/dav/composer/composer/autoload_static.php	`0% <ø> (ø)`	`1 <0> (ø)`	⬇️
apps/dav/lib/Command/RemoveInvalidShares.php	`0% <0%> (ø)`	`6 <6> (?)`
apps/dav/lib/Connector/Sabre/Principal.php	`84.34% <0%> (-5.66%)`	`49 <0> (+2)`
apps/dav/composer/composer/autoload_classmap.php	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
apps/dav/lib/DAV/Sharing/Backend.php	`0% <0%> (-86.82%)`	`26 <5> (+2)`
lib/private/Repair.php	`30.88% <0%> (ø)`	`19 <0> (ø)`	⬇️
apps/dav/lib/Server.php	`0% <0%> (-44.67%)`	`22 <3> (+5)`
apps/dav/lib/CardDAV/AddressBook.php	`57.5% <100%> (ø)`	`28 <0> (ø)`	⬇️
apps/dav/lib/CalDAV/Calendar.php	`67.14% <100%> (-3.58%)`	`50 <0> (ø)`
apps/user_ldap/lib/Migration/UUIDFixUser.php	`0% <0%> (-100%)`	`1% <0%> (ø)`
... and 452 more

MorrisJobke · 2018-04-23T15:55:09Z

CI failure is due to a timeout :)

rullzer · 2018-04-25T20:15:43Z

One more review please :)

rullzer · 2018-05-01T13:10:28Z

Conflicts fixed and rebased.

MorrisJobke · 2018-05-07T13:46:26Z

@georgehrke @blizzz @nickvergessen @ChristophWurst @skjnldsv Reviews would be nice :)

blizzz

the repair step might lose valid shares when

Nextcloud is in maintenance mode
AND external user backends are used

since apps are not loaded in this context.

rullzer · 2018-05-08T11:07:49Z

@blizzz I can drop the repair job... but then we might have invalid shares....

blizzz · 2018-05-09T00:16:02Z

@blizzz I can drop the repair job... but then we might have invalid shares....

Or add a switch that prevents running in maintenance mode.

rullzer · 2018-05-24T07:32:04Z

@blizzz now they are only run if you run the expensive repair steps in case you run into it.

All our other repair steps are executed in maintenance mode so then it indeed would do 💥 in certain situations

blizzz · 2018-05-25T08:06:46Z

All our other repair steps are executed in maintenance mode so then it indeed would do 💥 in certain situations

Then it is better run as a seperate occ command, bound to apps, as i am afraid it would do more harm than good.

rullzer · 2018-05-25T09:15:41Z

Nah during upgrade.

Now it is. occ maintenance:repair - - expensive

Fixes#6711 Based on owncloud/core@f0fb21c Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

…ied to be valid owncloud/core@d3fb8fc Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

…ollection as well owncloud/core@9f2e643 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

owncloud/core@edacf22 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

rullzer · 2018-05-27T19:03:45Z

@blizzz ok one more time ;)

blizzz · 2018-05-28T09:43:31Z

looks good now, apart from tests

People that have issues can run it manually Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

MorrisJobke · 2018-05-31T15:22:54Z

 use OC\Template\JSCombiner;
 use OC\Template\SCSSCacher;
+use OCA\DAV\Connector\Sabre\Principal;
+use OCA\DAV\Repair\RemoveInvalidShares;


rullzer added bug enhancement 3. to review Waiting for reviews backport-request labels Apr 23, 2018

rullzer added this to the Nextcloud 14 milestone Apr 23, 2018

rullzer requested review from MorrisJobke, georgehrke, icewind1991 and nickvergessen April 23, 2018 07:53

rullzer mentioned this pull request Apr 23, 2018
only the first contact in a contactList.vcf downloaded nextcloud/desktop#138
Closed

MorrisJobke approved these changes Apr 23, 2018
View reviewed changes

rullzer force-pushed the bugfix/6711 branch from 01e3b47 to fe9d56fCompare April 23, 2018 12:45

MorrisJobke requested a review from blizzz April 26, 2018 07:45

rullzer force-pushed the bugfix/6711 branch from fe9d56f to d4c10b2Compare May 1, 2018 13:09

MorrisJobke requested a review from schiessle May 2, 2018 07:34

blizzz requested changes May 7, 2018
View reviewed changes

rullzer force-pushed the bugfix/6711 branch from d4c10b2 to da15e04Compare May 24, 2018 07:28

rullzer added 5 commits May 27, 2018 20:51

Do not load calendar/addressbook plugins if not needed
c5d5c7d
Fixes#6711 Based on owncloud/core@f0fb21c Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

When sharing calendars and addressbooks the principal has to be verif…
240006b
…ied to be valid owncloud/core@d3fb8fc Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

CalDAV and CardDAV plugins need to be registered for the principals c…
69e650d
…ollection as well owncloud/core@9f2e643 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Adding repair step which cleans shares of invalid principals
8bf8e92
owncloud/core@edacf22 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Fix tests
f9a64d3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

rullzer force-pushed the bugfix/6711 branch from da15e04 to d0b3615Compare May 27, 2018 19:03

blizzz approved these changes May 28, 2018
View reviewed changes

Move repairstep to a custom command
26c1e33
People that have issues can run it manually Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

rullzer force-pushed the bugfix/6711 branch from d0b3615 to 26c1e33Compare May 28, 2018 11:27

MorrisJobke merged commit 0947ddb into masterMay 28, 2018

MorrisJobke deleted the bugfix/6711 branch May 28, 2018 11:53

rullzer mentioned this pull request May 29, 2018
[stable13] Do not load calendar/addressbook plugins if not needed #9655
Merged

rullzer removed the backport-request label May 29, 2018

MorrisJobke reviewed May 31, 2018
View reviewed changes

MorrisJobke mentioned this pull request May 31, 2018
Remove not needed change #9704
Merged

Uh oh!

Uh oh!

Conversation

rullzer commented Apr 23, 2018

Uh oh!

MorrisJobke commented Apr 23, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

georgehrke commented Apr 23, 2018

Uh oh!

georgehrke commented Apr 23, 2018

Uh oh!

rullzer commented Apr 23, 2018

Uh oh!

MorrisJobke left a comment

Choose a reason for hiding this comment

Uh oh!

MorrisJobke commented Apr 23, 2018

Uh oh!

codecovBot commented Apr 23, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

MorrisJobke commented Apr 23, 2018

Uh oh!

rullzer commented Apr 25, 2018

Uh oh!

rullzer commented May 1, 2018

Uh oh!

MorrisJobke commented May 7, 2018

Uh oh!

blizzz left a comment

Choose a reason for hiding this comment

Uh oh!

rullzer commented May 8, 2018

Uh oh!

blizzz commented May 9, 2018

Uh oh!

rullzer commented May 24, 2018

Uh oh!

blizzz commented May 25, 2018

Uh oh!

rullzer commented May 25, 2018

Uh oh!

rullzer commented May 27, 2018

Uh oh!

blizzz commented May 28, 2018

Uh oh!

MorrisJobkeMay 31, 2018

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

MorrisJobke commented Apr 23, 2018•
edited
Loading

codecovBot commented Apr 23, 2018•
edited
Loading