Skip to content

[stable19] LDAP: fix inGroup for memberUid type of group memberships - #24739

Closed
tofuSCHNITZEL wants to merge 6 commits into
stable19from
backport/24402/stable19
Closed

[stable19] LDAP: fix inGroup for memberUid type of group memberships#24739
tofuSCHNITZEL wants to merge 6 commits into
stable19from
backport/24402/stable19

Conversation

@tofuSCHNITZEL

@tofuSCHNITZELtofuSCHNITZEL commented Dec 17, 2020

Copy link
Copy Markdown
Contributor

backport for stable19 of #24402

blizzzand others added 6 commits December 17, 2020 01:08
@blizzz@tofuSCHNITZEL
flatten result array as expected by following code
ed65fd1
Signed-off-by: Tobias Perschon <tobias@perschon.at>
@tofuSCHNITZEL
moved the array_reduce to fix large search case
c399493
Signed-off-by: Tobias Perschon <tobias@perschon.at>
@blizzz@tofuSCHNITZEL
use faster and less hungry foreach
bada6d1
Signed-off-by: Tobias Perschon <tobias@perschon.at>
@blizzz@tofuSCHNITZEL
check number of members after potential resolving of rdns
e2fea62
- the type check is not necessary anymore for the return type of
_groupMembers()
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz@tofuSCHNITZEL
add unit tests
c9cb14e
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz@tofuSCHNITZEL
php-cs happyness
957f634
Signed-off-by: Tobias Perschon <tobias@perschon.at>
@tofuSCHNITZELtofuSCHNITZEL changed the title Backport/24402/stable19backport - LDAP: fix inGroup for memberUid type of group membershipsDec 17, 2020
@faily-bot

faily-botBot commented Dec 17, 2020

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 557: failure

sqlite

Show full log
There was 1 error:
1) OCA\User_LDAP\Tests\Group_LDAPTest::testCountEmptySearchString
TypeError: Argument 1 passed to Mock_Access_134dd683::fetchListOfUsers() must be of the type string, null given, called in /drone/src/apps/user_ldap/lib/Group_LDAP.php on line 262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:1012
/drone/src/apps/user_ldap/tests/Group_LDAPTest.php:87
--
There were 3 warnings:
1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
3) OCA\Files_Sharing\Tests\External\ManagerTest::testAddShare
Cannot stub or mock class or interface "OCA\Files_Sharing\Tests\External\IManager" which does not exist

mariadb10.1-php7.2

Show full log
There was 1 error:
1) OCA\User_LDAP\Tests\Group_LDAPTest::testCountEmptySearchString
TypeError: Argument 1 passed to Mock_Access_02d72d03::fetchListOfUsers() must be of the type string, null given, called in /drone/src/apps/user_ldap/lib/Group_LDAP.php on line 262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:1012
/drone/src/apps/user_ldap/tests/Group_LDAPTest.php:87
--
There were 3 warnings:
1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
3) OCA\Files_Sharing\Tests\External\ManagerTest::testAddShare
Cannot stub or mock class or interface "OCA\Files_Sharing\Tests\External\IManager" which does not exist

mariadb10.4-php7.3

Show full log
There was 1 error:
1) OCA\User_LDAP\Tests\Group_LDAPTest::testCountEmptySearchString
TypeError: Argument 1 passed to Mock_Access_ab819b5f::fetchListOfUsers() must be of the type string, null given, called in /drone/src/apps/user_ldap/lib/Group_LDAP.php on line 262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:1012
/drone/src/apps/user_ldap/tests/Group_LDAPTest.php:87
--
There were 3 warnings:
1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
3) OCA\Files_Sharing\Tests\External\ManagerTest::testAddShare
Cannot stub or mock class or interface "OCA\Files_Sharing\Tests\External\IManager" which does not exist

mysql8.0-php7.2

Show full log
There was 1 error:
1) OCA\User_LDAP\Tests\Group_LDAPTest::testCountEmptySearchString
TypeError: Argument 1 passed to Mock_Access_13f994b6::fetchListOfUsers() must be of the type string, null given, called in /drone/src/apps/user_ldap/lib/Group_LDAP.php on line 262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:1012
/drone/src/apps/user_ldap/tests/Group_LDAPTest.php:87
--
There were 3 warnings:
1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
3) OCA\Files_Sharing\Tests\External\ManagerTest::testAddShare
Cannot stub or mock class or interface "OCA\Files_Sharing\Tests\External\IManager" which does not exist

mysql5.6-php7.2

Show full log
There was 1 error:
1) OCA\User_LDAP\Tests\Group_LDAPTest::testCountEmptySearchString
TypeError: Argument 1 passed to Mock_Access_e03687da::fetchListOfUsers() must be of the type string, null given, called in /drone/src/apps/user_ldap/lib/Group_LDAP.php on line 262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:1012
/drone/src/apps/user_ldap/tests/Group_LDAPTest.php:87
--
There were 3 warnings:
1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
3) OCA\Files_Sharing\Tests\External\ManagerTest::testAddShare
Cannot stub or mock class or interface "OCA\Files_Sharing\Tests\External\IManager" which does not exist

postgres9-php7.3

Show full log
There was 1 error:
1) OCA\User_LDAP\Tests\Group_LDAPTest::testCountEmptySearchString
TypeError: Argument 1 passed to Mock_Access_5005fb4a::fetchListOfUsers() must be of the type string, null given, called in /drone/src/apps/user_ldap/lib/Group_LDAP.php on line 262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:1012
/drone/src/apps/user_ldap/tests/Group_LDAPTest.php:87
--
There were 3 warnings:
1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
3) OCA\Files_Sharing\Tests\External\ManagerTest::testAddShare
Cannot stub or mock class or interface "OCA\Files_Sharing\Tests\External\IManager" which does not exist

postgres11-php7.2

Show full log
There was 1 error:
1) OCA\User_LDAP\Tests\Group_LDAPTest::testCountEmptySearchString
TypeError: Argument 1 passed to Mock_Access_b159d878::fetchListOfUsers() must be of the type string, null given, called in /drone/src/apps/user_ldap/lib/Group_LDAP.php on line 262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:262
/drone/src/apps/user_ldap/lib/Group_LDAP.php:1012
/drone/src/apps/user_ldap/tests/Group_LDAPTest.php:87
--
There were 3 warnings:
1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
3) OCA\Files_Sharing\Tests\External\ManagerTest::testAddShare
Cannot stub or mock class or interface "OCA\Files_Sharing\Tests\External\IManager" which does not exist

@tofuSCHNITZEL

tofuSCHNITZEL commented Dec 17, 2020

Copy link
Copy Markdown
ContributorAuthor

Status of 557: failure

@blizzz to the rescue - I don't really understand whats going on ;) also it seems to affect the files_sharing app not LDAP?

@blizzzblizzz changed the title backport - LDAP: fix inGroup for memberUid type of group memberships[stable19] LDAP: fix inGroup for memberUid type of group membershipsDec 17, 2020
@blizzz

blizzz commented Dec 17, 2020

Copy link
Copy Markdown
Member

Status of 557: failure

@blizzz to the rescue - I don't really understand whats going on ;) also it seems to affect the files_sharing app not LDAP?

I believe we have here an older phpunit running. The newer one makes the mocks return an empty value based on the return type hint, e.g. an empty array for arrays. The older runs just returns null. So the mocks in the tests needs to be adjusted and any important method that is call has to be made to return what is expected later on.

@tofuSCHNITZEL

tofuSCHNITZEL commented Feb 6, 2021

Copy link
Copy Markdown
ContributorAuthor

I fear I don't understand enough about these tests to fix this....

@DanScharon

DanScharon commented Feb 23, 2021

Copy link
Copy Markdown

any chance to get this backport into 19?

@MichaIng

MichaIng commented Jul 6, 2021•
edited
Loading

Copy link
Copy Markdown
Member

I mark this as closed, as Nextcloud 19 won't get any further releases.

EDIT ... oh, don't be sad @backportbot-nextcloud 😄.

@MichaIngMichaIng closed this Jul 6, 2021
@MichaIng
MichaIng deleted the backport/24402/stable19 branch July 6, 2021 17:52
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blizzzblizzzAwaiting requested review from blizzz

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tofuSCHNITZEL@blizzz@DanScharon@MichaIng