Repository navigation
fix(doctor): guard malformed extension diagnostics json in doctor report - #6083
Closed
vaibhavsrv wants to merge 1 commit into
Closed
vaibhavsrv wants to merge 1 commit into
vaibhavsrv wants to merge 1 commit into
Conversation
Collaborator
|
Thanks for this contribution. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Why this matters
In
ods/scripts/ods-doctor.sh, extension diagnostics collected by the shell subshell are passed into Python as a JSON string argument (ext_diagnostics_json) and deserialized directly withjson.loads(ext_diagnostics_json). Ifcollect_extension_diagnosticsoutputs an empty string, non-JSON error messages from external commands, or a non-list/non-dict payload, Python raises an unhandledjson.JSONDecodeErroror subsequentAttributeErrorwhen accessing extension health properties. This crashes the doctor run before any JSON diagnostic report can be rendered.This change wraps
ext_diagnostics_jsondecoding in exception guards forTypeErrorandValueError, defaults invalid or non-list payloads to an empty list, and filters elements to dictionary mappings. Existing diagnostic summaries, hint generators, and CLI flags remain completely unaffected.Validation
json.decoder.JSONDecodeErrorand aborted report generation.ods/tests/test_doctor_ext_diagnostics_guard.pyverifies both end-to-end report generation with valid extension summaries and safe handling of empty, scalar, and malformed extension diagnostic payloads.test_doctor_ext_diagnostics_guard.pypasses cleanly with exit code 0. Wired into Linux CI workflow under ODS Doctor Tests.Overlap check
Risk / AI disclosure
AI-assisted investigation, implementation, and test regressions. This strengthens error handling for extension diagnostics JSON parsing in ods-doctor.sh. Independent human review and platform/runtime qualification remain gates. No running configuration, deployment or upstream merge changed.
Follow-up integration evidence
Composed with #6076, #6077, #6078, #6079, #6080, #6081, and #6082 at HEAD without conflicts. Production and test diffs passed together; doctor diagnostic and extension checks remain intact.
Backlog composition was local-only (production/test diffs, excluding workflow/Makefile wiring); it is not an upstream merge or independent human approval. Declared live-review gates remain open.