[stable8] backport 13740 and 15606

[MorrisJobke]

Backport of #13740 and #15606 (because the latter is a followup of the previous one)

Fixes #12190 and fixes #13533

How to test?

• configure User Filter in the LDAP Wizard and select a group
• on AD, the resulting filter should look like (&(|(objectclass=person))(|(|((memberof=CN=Domain Users,CN=Users,DC=madder,DC=owncloud,DC=bzoc)(primaryGroupID=513)))(|((memberof=CN=Wolfpack 8,OU=packs,DC=madder,DC=owncloud,DC=bzoc)(primaryGroupID=968988)(2 selected groups)
• on OpenLDAP the (primaryGroupID=XXX) part should not show up!
• in the User list: users should appear, that have the selected group as primary, but are not regular member of any of those selected
• in the User list: Before: empty count, no users when selecting the group. Now: proper count with users.

@craigpg @sbelov1 @bboule @jnfrmarks @plastilincheg @rjaeckel @gig13 Please test. I tested this with an LDAP instance and all works like before and no errors are logged.

This is my 👍 for this, because I only cherry picked the commits of @blizzz who is on vacation.

[karlitschek]

backport is fine 👍

[ghost]

Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/12438/
🚀 Test PASSed.🚀

[DeepDiver1975]

we need testing power here @rperezb THX

[rperezb]

@DeepDiver1975 thanks for the reminder, yes, this is on our list, @davitol is currently checking

[MorrisJobke]

@davitol I just tested if it still works with an LDAP instance.

[davitol]

I understood that with an AD , in the resulting filter using the wizard, (primaryGroupID=513) should appear, but it doesn't.

[MorrisJobke]

@davitol For me the groupID shows up. :(

[MorrisJobke]

Got it ... it is only there in the second try.

• going to the user filter tab
• selecting the group
• => not present in the raw filter
• unselect the group
• select the group again
• => present in the raw filter

[MorrisJobke]

@cmonteroluque Either there volunteers somebody to debug this race condition or we need to delay this :( I don't think that I have time tomorrow to debug this properly.

[MorrisJobke]

@cmonteroluque The blue ticket refers to a stable7 instance (where this is already fixed) So I'm fine with moving this to 8.0.5 and wait for @blizzz

[MorrisJobke]

cc @DeepDiver1975 regarding release planing

[DeepDiver1975]

@cmonteroluque The blue ticket refers to a stable7 instance (where this is already fixed) So I'm fine with moving this to 8.0.5 and wait for @blizzz

agreed

[davitol]

#16626

[MorrisJobke]

The problem with this PR is that it is present in master and stable7 already and the issue, why it is not merged is #16626. Should we merge this now, because it is better to have a working group selection in stable8 for AD too, that has a known bug, but we know the workaround too. Or should we ship the broken behaviour in stable7 and master only and wait for the proper fix of this problem and then port the stuff from this stable8 branch to stable7 and master? cc @DeepDiver1975 @cmonteroluque

[PVince81]

This is what I observe:

1. Have the raw filter collapsed
2. Select "group1", click outside
3. Wait for all spinners to disappear
4. Expand raw filter: group is missing
5. Collapse raw filter
6. Expand again: group appears

The same happens when deselecting a group.

It looks like the raw filter simply doesn't refresh properly, unless collapsed and expanded again.
Is that what you were observing ?

Also, if you expand too early while the spinners are still turning, there is a chance to mess it up too.
That link should probably be disabled while it's still working.

[MorrisJobke]

@davitol I rebased this on the current stable8 (with #16627 merged). Now the groupID should show up for you. :)

[ghost]

🚀 Test PASSed.🚀

[davitol]

@MorrisJobke I've tested again in stable8 -> "8.0.4.2","versionstring":"8.0.4","edition":"Enterprise"

[MorrisJobke]

@MorrisJobke I've tested again in stable8 -> "8.0.4.2","versionstring":"8.0.4","edition":"Enterprise"

Did it work? It's too blurry to read anything :(

[davitol]

No, it didn't 😿

[DeepDiver1975]

@MorrisJobke @blizzz looks like we need to get our hands dirty again -> moved to 8.0.6

[MorrisJobke]

@pvince @blizzz Any idea how to address the issue?

[blizzz]

@davitol

@MorrisJobke I've tested again in stable8 -> "8.0.4.2","versionstring":"8.0.4","edition":"Enterprise"

To reassure, did you use stable8 branch or this one here (stable8-backport-13740-and-15606)?

[davitol]

@blizzz Both of them with the same behaviour

[blizzz]

rebased

[ghost]

🚀 Test PASSed.🚀

[davitol]

👍 It works

[blizzz]

🎆