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

Fix: Check for missing client config in secure socks proxy check #1179

Merged
merged 5 commits into from
Jan 8, 2025
Merged

Fix: Check for missing client config in secure socks proxy check #1179

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9c05e8
Fix: Check for missing client config in secure socks proxy check
kevinwcyu Dec 20, 2024
f5d13b0
add clarifying comment
kevinwcyu Jan 6, 2025
972f3c2
Update backend/proxy/secure_socks_proxy.go
kevinwcyu Jan 7, 2025
e059422
fixup suggestion comment
kevinwcyu Jan 7, 2025
479bedb
pr comments
kevinwcyu Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion backend/proxy/secure_socks_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ func (p *cfgProxyWrapper) SecureSocksProxyEnabled() bool {
// it cannot be enabled if it's not enabled on Grafana
// p.opts is not always nil even if secure socks proxy is not enabled on Grafana
// check ClientCfg as well since it doesn't get set if it's not enabled
if p.opts == nil || p.opts.ClientCfg == nil {
// the secure proxy can only be used if it's enabled on both the datasource connection and the client (Grafana server)
wbrowne marked this conversation as resolved.
Show resolved Hide resolved
if p.opts == nil || !p.opts.Enabled || p.opts.ClientCfg == nil {
return false
}

Expand Down
Loading