Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

respect DB restrictions on number of arguments in statements and queries #25036

Merged
merged 3 commits into from
Jan 14, 2021
Merged

respect DB restrictions on number of arguments in statements and queries #25036

merged 3 commits into from
Jan 14, 2021

Conversation

blizzz
Copy link
Member

@blizzz blizzz commented Jan 8, 2021

Follow up of #25020

Additionally to what was stated before:

  • in the relevant LDAP issue run the query before there are too many parameters
  • the query builder logs when there are too many parameters in total per statement (by array type parameter)

@blizzz blizzz added this to the Nextcloud 21 milestone Jan 8, 2021
@blizzz
Copy link
Member Author

blizzz commented Jan 8, 2021

/backport to stable20

@blizzz
Copy link
Member Author

blizzz commented Jan 8, 2021

/backport to stable19

@blizzz blizzz mentioned this pull request Jan 8, 2021
Closed
@blizzz
Copy link
Member Author

blizzz commented Jan 8, 2021

might lead to a small conflict with #24948 (execute method in our QueryBuilder), but nothing dramatic.

@rullzer rullzer mentioned this pull request Jan 8, 2021
Merged
5 tasks
@blizzz blizzz force-pushed the fix/noid/limitied-allowed-items-db-in_2 branch from 36ed317 to e7c2cd8 Compare January 8, 2021 17:57
@blizzz
Copy link
Member Author

blizzz commented Jan 8, 2021

rebased and adjusted to the dbal bump.

@blizzz blizzz requested a review from nickvergessen January 8, 2021 17:59
@blizzz blizzz force-pushed the fix/noid/limitied-allowed-items-db-in_2 branch from e7c2cd8 to ef28844 Compare January 8, 2021 18:05
@rullzer rullzer mentioned this pull request Jan 11, 2021
Merged
14 tasks
@MorrisJobke
Copy link
Member

Postgres says "no".

@blizzz
Copy link
Member Author

blizzz commented Jan 11, 2021 •
edited
Loading

Postgres says "no".

aye. seems to be a form of off-by-1

But confirms the test is working 🚀

@blizzz blizzz force-pushed the fix/noid/limitied-allowed-items-db-in_2 branch from ef28844 to 90005a6 Compare January 11, 2021 10:31
@blizzz blizzz added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jan 11, 2021
blizzz added 2 commits January 11, 2021 13:43
@blizzz
respect DB limits limit per statement and query
45e3261 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz
DB: warn on parameter number constraints
f9484d1 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz blizzz force-pushed the fix/noid/limitied-allowed-items-db-in_2 branch from 90005a6 to f9484d1 Compare January 11, 2021 12:43
@blizzz blizzz added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jan 11, 2021
@blizzz
Copy link
Member Author

blizzz commented Jan 11, 2021

Postgres says "no".

Not anymore 🧑‍🔧

MorrisJobke
MorrisJobke reviewed Jan 12, 2021
View reviewed changes
apps/user_ldap/lib/Mapping/AbstractMapping.php
$slice++;
$fdnsSlice = array_slice($fdns, $sliceSize * ($slice - 1), $sliceSize);

if (!isset($qb)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Psalm:

TypeDoesNotContainType: Cannot resolve types for $qb with type OCP\DB\QueryBuilder\IQueryBuilder and !isset assertion

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It occurs to me that Psalm does not understand the unset(), or am I wrong?

Copy link
Member Author

@blizzz blizzz Jan 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minimal example: https://psalm.dev/r/cd3ebd7a1c

vimeo/psalm#4995

@blizzz
silence psalm false positive
21ca5d4 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz blizzz requested a review from MorrisJobke January 13, 2021 14:22
@rullzer rullzer mentioned this pull request Jan 14, 2021
Merged
15 tasks
ChristophWurst
ChristophWurst approved these changes Jan 14, 2021
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has tests, so what could go wrong 👍

FYI https://www.php.net/manual/en/function.array-chunk.php seems a tad more elegant than manual slicing, but the result is the same

@blizzz
Copy link
Member Author

blizzz commented Jan 14, 2021

Has tests, so what could go wrong +1

FYI https://www.php.net/manual/en/function.array-chunk.php seems a tad more elegant than manual slicing, but the result is the same

would have a bigger memory footprint as it would return all slices at once.

@blizzz blizzz merged commit f9ab757 into master Jan 14, 2021
@blizzz blizzz deleted the fix/noid/limitied-allowed-items-db-in_2 branch January 14, 2021 10:36
This was referenced Jan 14, 2021
Merged
Merged
@kesselb kesselb mentioned this pull request Feb 23, 2021
Closed
@Simounet Simounet mentioned this pull request Apr 28, 2021
Closed
@Simounet Simounet mentioned this pull request May 27, 2021
Merged
@ph00lt0 ph00lt0 mentioned this pull request Jun 1, 2021
Closed
@tdoerschel tdoerschel mentioned this pull request Nov 18, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@nickvergessen nickvergessen nickvergessen approved these changes

@rullzer rullzer rullzer approved these changes

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

@MorrisJobke MorrisJobke Awaiting requested review from MorrisJobke

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug feature: ldap
Projects
None yet
Milestone
Nextcloud 21
Development

Successfully merging this pull request may close these issues.
5 participants
@blizzz @MorrisJobke @rullzer @nickvergessen @ChristophWurst