Fix duplicated UUID migration issue #30981

blizzz · 2022-02-02T21:55:04Z

invalidate duplicated UUIDs in migration step
make it possible to re-run migration step for broken setup
occ command to let Nextcloud try to update UUIDs to current value¹
add a warning in admin overview if invalidated UUIDs are present
testing

¹ could be a manually triggerable repair step, but it would run once, be less flexible and this way it MAY be also easier for some LDAP server migration scenarios when an update was needed anyways (but only works of DN stays identical).

apps/user_ldap/lib/Migration/Version1130Date20211102154716.php

come-nc · 2022-02-07T15:14:07Z

occ command looks good to me now, I tested simple cases where one uuid is wrong, or giving it a non-mapped dn to test the error. Should be tested some more.

come-nc · 2022-02-08T17:00:23Z

Testing the migration with duplicated UUIDs give me:

Updating <user_ldap> ...
InvalidArgumentException: Only strings, Literals and Parameters are allowed
Update failed

blizzz · 2022-02-08T21:15:13Z

Added the checkup warning and did some basic testing with the occ command, which was working as expected.

Minor annoyance: we have no means to clean up (i.e. remove) old gone groups. That's not a blocker and can be worked around with custom instructions if necessary.

blizzz · 2022-02-09T15:58:49Z

Rebased and squashed the fixups. My testing was successful so far.

PVince81

I flew over the code and didn't find anything notable apart from my minor comments.

I hope others can chime in to review the more complex code more in detail,

PVince81 · 2022-02-09T16:21:10Z

apps/user_ldap/lib/Command/UpdateUUID.php

+use Symfony\Component\Console\Output\OutputInterface;
+use function sprintf;
+
+class UuidUpdateReport {


two classes per file, is that still legal or not recommended ?

Legal it is. I believe it is also not the sole case in our code bases, but given, I would not know for certain where to look at first. It is an internal helper class that just contains public properties, in order to not use an arbitrary array with with arbitrary keys.

apps/user_ldap/lib/Jobs/CleanUp.php

blizzz · 2022-02-09T20:59:41Z

last fixups were to fix unit tests

come-nc

👍

PVince81

👍

there's a DCO error though

PVince81 · 2022-02-10T09:10:43Z

/backport to stable23

PVince81 · 2022-02-10T09:14:16Z

/backport to stable22

PVince81 · 2022-02-10T09:14:24Z

/backport to stable21

PVince81 · 2022-02-10T09:14:36Z

/backport to stable20

Since mails and notifications are only available for actions of other users it does not make sense to allow changing this. It also prevents the common misunderstanding with "file was changed inside a favorited folder" Signed-off-by: Joas Schilling <[email protected]>

PVince81 · 2022-02-10T09:14:49Z

down to 20 because the original fix was put there as well...

Signed-off-by: Joas Schilling <[email protected]>

- in a proper setup there are no duplicated UUIDs - not all setups are proper - log warning to admin Signed-off-by: Arthur Schiwon <[email protected]>

- to heal incomplete states from broken upgrades Signed-off-by: Arthur Schiwon <[email protected]>

Signed-off-by: Arthur Schiwon <[email protected]>

Generators cannot be iterated with while or returned by an other generator, using foreach instead. And a few other problems. Signed-off-by: Côme Chilliet <[email protected]>

Signed-off-by: Côme Chilliet <[email protected]>

Signed-off-by: Arthur Schiwon <[email protected]>

backportbot-nextcloud · 2022-02-10T10:57:02Z

The backport to stable23 failed. Please do this backport manually.

backportbot-nextcloud · 2022-02-10T11:01:54Z

The backport to stable22 failed. Please do this backport manually.

backportbot-nextcloud · 2022-02-10T11:06:00Z

The backport to stable21 failed. Please do this backport manually.

backportbot-nextcloud · 2022-02-10T11:10:24Z

The backport to stable20 failed. Please do this backport manually.

come-nc · 2022-02-10T13:43:02Z

I messed up my git rebase -i and duplicated two commits from Joas.
Not sure how that happenned but it causes no trouble on master because the commits were already on master.
For instance 1ab0ed8 is a duplicate of 5f5142f

I will create the backport by hand for 23 and backport from there.

ChristophWurst · 2023-10-27T06:58:42Z

Command is not documented in admin manual 😿

blizzz added 2. developing Work in progress bug feature: ldap regression labels Feb 2, 2022

blizzz requested review from CarlSchwan, PVince81 and come-nc February 2, 2022 21:55

blizzz added this to the Nextcloud 24 milestone Feb 2, 2022

come-nc reviewed Feb 3, 2022

View reviewed changes

apps/user_ldap/lib/Migration/Version1130Date20211102154716.php Show resolved Hide resolved

come-nc reviewed Feb 3, 2022

View reviewed changes

apps/user_ldap/lib/Migration/Version1130Date20211102154716.php Show resolved Hide resolved

solracsf linked an issue Feb 3, 2022 that may be closed by this pull request

[Bug]: [user_ldap] Migration from 1.13.0 to 1.13.1 broken #30936

Closed

8 tasks

come-nc requested a review from a team February 7, 2022 15:12

blizzz added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 8, 2022

blizzz marked this pull request as ready for review February 8, 2022 21:11

blizzz force-pushed the fix/30936/ldap-dup-uuid-migration branch from 7bc9118 to 3e72b4e Compare February 9, 2022 15:56

PVince81 reviewed Feb 9, 2022

View reviewed changes

come-nc approved these changes Feb 10, 2022

View reviewed changes

PVince81 approved these changes Feb 10, 2022

View reviewed changes

backportbot-nextcloud bot added the backport-request label Feb 10, 2022

nickvergessen and others added 7 commits February 10, 2022 10:14

Temporarily disable samba-non-native as it times out too often

de01da7

Signed-off-by: Joas Schilling <[email protected]>

invalidated duplicated UUIDs prior to migration change

71fb449

- in a proper setup there are no duplicated UUIDs - not all setups are proper - log warning to admin Signed-off-by: Arthur Schiwon <[email protected]>

allow to re-run migration step when backup DB is already created

601ce05

- to heal incomplete states from broken upgrades Signed-off-by: Arthur Schiwon <[email protected]>

add occ command to update UUIDs (incomplete)

45d4c0b

Signed-off-by: Arthur Schiwon <[email protected]>

Fix ldap:update-uuid

9f2db6e

Generators cannot be iterated with while or returned by an other generator, using foreach instead. And a few other problems. Signed-off-by: Côme Chilliet <[email protected]>

Fix psalm errors in apps/user_ldap/lib/Jobs/CleanUp.php

bcfe99c

Signed-off-by: Côme Chilliet <[email protected]>

Setup warning for invalid LDAP user or group UUIDs.

b28aa52

Signed-off-by: Arthur Schiwon <[email protected]>

come-nc force-pushed the fix/30936/ldap-dup-uuid-migration branch from 47c3da0 to b28aa52 Compare February 10, 2022 09:16

blizzz 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 10, 2022

blizzz merged commit c605ef1 into master Feb 10, 2022

blizzz deleted the fix/30936/ldap-dup-uuid-migration branch February 10, 2022 10:53

This was referenced Feb 10, 2022

[stable23] Fix duplicated UUID migration issue #31103

Closed

[stable23] Fix duplicated UUID migration issue #31107

Merged

ChristophWurst added the pending documentation This pull request needs an associated documentation update label Oct 27, 2023

skjnldsv removed the backport-request label Jan 15, 2024

Uh oh!

Fix duplicated UUID migration issue #30981

Fix duplicated UUID migration issue #30981

Uh oh!

Conversation

blizzz commented Feb 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

come-nc commented Feb 7, 2022

Uh oh!

come-nc commented Feb 8, 2022

Uh oh!

blizzz commented Feb 8, 2022

Uh oh!

blizzz commented Feb 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PVince81 left a comment

Choose a reason for hiding this comment

Uh oh!

PVince81 Feb 9, 2022

Choose a reason for hiding this comment

Uh oh!

blizzz Feb 9, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

blizzz commented Feb 9, 2022

Uh oh!

come-nc left a comment

Choose a reason for hiding this comment

Uh oh!

PVince81 left a comment

Choose a reason for hiding this comment

Uh oh!

PVince81 commented Feb 10, 2022

Uh oh!

PVince81 commented Feb 10, 2022

Uh oh!

PVince81 commented Feb 10, 2022

Uh oh!

PVince81 commented Feb 10, 2022

Uh oh!

PVince81 commented Feb 10, 2022

Uh oh!

backportbot-nextcloud bot commented Feb 10, 2022

Uh oh!

backportbot-nextcloud bot commented Feb 10, 2022

Uh oh!

backportbot-nextcloud bot commented Feb 10, 2022

Uh oh!

backportbot-nextcloud bot commented Feb 10, 2022

Uh oh!

come-nc commented Feb 10, 2022

Uh oh!

ChristophWurst commented Oct 27, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

blizzz commented Feb 2, 2022 •

edited

Loading

blizzz commented Feb 9, 2022 •

edited

Loading