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.

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

Fix panic when monitoring a local client node #7053

Merged
merged 3 commits into from
Feb 3, 2020

Conversation

drewbailey
Copy link
Contributor

Fixes a panic when accessing a.agent.Server() when agent is a client
and not a server. This pr removes a redundant ACL check since ACLs are validated
at the RPC layer. It also nil checks the agent server and uses Client()
when appropriate.

fixes #7052

@drewbailey drewbailey force-pushed the b-client-monitor-acl-panic branch from 0adbe4c to b5795ef Compare February 3, 2020 15:30
Copy link
Contributor

@notnoop notnoop left a comment

Choose a reason for hiding this comment

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

couple of nit picky comments but overall is good.

command/agent/agent_endpoint.go Outdated Show resolved Hide resolved
command/agent/agent_endpoint_test.go Outdated Show resolved Hide resolved
command/agent/agent_endpoint_test.go Outdated Show resolved Hide resolved
@drewbailey drewbailey force-pushed the b-client-monitor-acl-panic branch from a1696da to 23d3069 Compare February 3, 2020 15:58
@drewbailey drewbailey requested a review from notnoop February 3, 2020 15:58
Copy link
Contributor

@notnoop notnoop left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for jumping on this quickly!

command/agent/agent_endpoint_test.go Outdated Show resolved Hide resolved
@drewbailey drewbailey force-pushed the b-client-monitor-acl-panic branch from 23d3069 to e51c34a Compare February 3, 2020 16:03
Fixes a panic when accessing a.agent.Server() when agent is a client
instead. This pr removes a redundant ACL check since ACLs are validated
at the RPC layer. It also nil checks the agent server and uses Client()
when appropriate.
@drewbailey drewbailey force-pushed the b-client-monitor-acl-panic branch from e8462d8 to 173ad83 Compare February 3, 2020 18:20
@drewbailey drewbailey merged commit d28898b into master Feb 3, 2020
@drewbailey drewbailey deleted the b-client-monitor-acl-panic branch February 3, 2020 18:45
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 18, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Panics in /v1/agent/monitor endpoint on clients
3 participants