-
Notifications
You must be signed in to change notification settings - Fork 76
Fix - Avoid SQL warning when no user session is active during plugin init #1179
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.
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
Merged
+9
−0
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b882743
Fix - Avoid SQL warning when no user session is active during plugin …
RomainLvr ecf1c25
Update CHANGELOG
RomainLvr 24404ce
Apply suggestions
RomainLvr 0c7557b
Merge branch 'main' into fix/entity-restrict-criteria-without-session
RomainLvr 8e82d36
Apply suggestions
RomainLvr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe something like this:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getEntitiesRestrictCriteriareturns an array of criteria. The problem here isn't thatgetEntitiesRestrictCriteriareturns an empty array; rather, it returns the criterionglpi_plugin_fields_containers.entities_id = "", so the suggestion won't fix the problem.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's true, but ultimately I think the problem lies in the
getEntitiesRestrictCriteria()function, which returns an invalid value. Instead of returning...entities_id = ''(which can never work), it should return[new QueryExpression(‘false’)];For your information, it also checks
isCommandLine(), so the one here will likely be redundant.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right, the root cause is actually in the GLPI core —
DbUtils::getEntitiesRestrictCriteria()inDbUtils.php.When called with no active session, no CLI context, and no cron context, the function falls through all conditions without an
elsebranch, leaving$valueas an empty string''. This produces an invalid SQL criterionentities_id = ''on an integer column, which triggers MySQL warning.I've updated this with a cleaner guard:
This is semantically explicit (no session = no available blocks), consistent with the existing guard already in place in
setup.phpl.138 — it doesn't rely on inspecting the internal structure of the criteria returned by core.The real fix should live in the core: adding an
else { return [new QueryExpression('false')]; }branch togetEntitiesRestrictCriteria()so all callers are protected. I'll open a separate PR on the GLPI core for that.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
here is the fix for the core : glpi-project/glpi#23934