Backport of Avoid decoding nil pointer in map walker into release/1.15.x#17053
Merged
hc-github-team-consul-core merged 1 commit intoApr 19, 2023
Conversation
d352a45 to
e62111c
Compare
d91b84d to
1fdbaa3
Compare
github-team-consul-core-pr-approver
approved these changes
Apr 19, 2023
Collaborator
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
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.
Backport
This PR is auto-generated from #17048 to be assessed for backporting due to the inclusion of the label backport/1.15.
The below text is copied from the body of the original PR.
Description
This PR fixes a bug with the mapwalk decoding logic used on the client agents for things like config entries and resolved service configs. Currently, if there is a struct stored within a
map[string]interface{}with at least one field set and one pointer field unset/nil(such asEnforcingConsecutive5xxin thePassiveHealthCheckstruct), the mapwalk logic here would attempt to callreflect.Value.Type()which is invalid for a nil pointer and we'd getreflect: call of reflect.Value.Type on zero Value.Testing & Reproduction steps
Replication steps:
{ "Kind": "service-defaults", "Name": "frontend", "Protocol": "http", "UpstreamConfig": { "Defaults": { "ConnectTimeoutMs": 15000, "PassiveHealthCheck": { "MaxFailures": 1000000 }, "MeshGateway": {} } } }{ "id": "frontend", "name": "frontend", "port": 9090, "checks": [ { "Name": "check-9090-is-open", "TCP": "127.0.0.1:9090", "Interval": "10s" } ], "connect": { "sidecar_service": { "checks": [ { "Name": "check-9191-is-open", "TCP": "127.0.0.1:9191", "Interval": "10s" } ], "proxy": { "upstreams": [ { "destination_name": "backend", "local_bind_port": 9191 } ] } } } }reflect: call of reflect.Value.Type on zero ValuePR Checklist
[ ] external facing docs updatedOverview of commits