From bb2f5fce07a4778dd806e395d778ac4deda5ca68 Mon Sep 17 00:00:00 2001 From: Stephanie Hingtgen Date: Tue, 12 Sep 2023 14:07:41 -0500 Subject: [PATCH] Secure socks proxy: Allow overriding socks username (#74762) --- pkg/tsdb/sqleng/proxyutil/proxy_util.go | 6 +++++- pkg/tsdb/sqleng/sql_engine.go | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/tsdb/sqleng/proxyutil/proxy_util.go b/pkg/tsdb/sqleng/proxyutil/proxy_util.go index dd2eda548fd..507988a277a 100644 --- a/pkg/tsdb/sqleng/proxyutil/proxy_util.go +++ b/pkg/tsdb/sqleng/proxyutil/proxy_util.go @@ -6,10 +6,14 @@ import ( ) func GetSQLProxyOptions(dsInfo sqleng.DataSourceInfo) *sdkproxy.Options { - return &sdkproxy.Options{ + opts := &sdkproxy.Options{ Enabled: dsInfo.JsonData.SecureDSProxy, Auth: &sdkproxy.AuthOptions{ Username: dsInfo.UID, }, } + if dsInfo.JsonData.SecureDSProxyUsername != "" { + opts.Auth.Username = dsInfo.JsonData.SecureDSProxyUsername + } + return opts } diff --git a/pkg/tsdb/sqleng/sql_engine.go b/pkg/tsdb/sqleng/sql_engine.go index 4dc6cc020b9..2700b29136e 100644 --- a/pkg/tsdb/sqleng/sql_engine.go +++ b/pkg/tsdb/sqleng/sql_engine.go @@ -73,6 +73,7 @@ type JsonData struct { TimeInterval string `json:"timeInterval"` Database string `json:"database"` SecureDSProxy bool `json:"enableSecureSocksProxy"` + SecureDSProxyUsername string `json:"secureSocksProxyUsername"` AllowCleartextPasswords bool `json:"allowCleartextPasswords"` AuthenticationType string `json:"authenticationType"` }