From 3987ca19c8dbb0d50de67fbf97302eec94b939c3 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 13 Sep 2023 13:48:39 -0500 Subject: [PATCH] fix: case insensitve agent ssh session env var --- agent/agentssh/agentssh.go | 8 +++++--- agent/agentssh/metrics.go | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go index 46dabacd7f2c5..238fa55329a8c 100644 --- a/agent/agentssh/agentssh.go +++ b/agent/agentssh/agentssh.go @@ -254,11 +254,13 @@ func (s *Server) sessionStart(session ssh.Session, extraEnv []string) (retErr er magicType = strings.TrimPrefix(kv, MagicSessionTypeEnvironmentVariable+"=") env = append(env[:index], env[index+1:]...) } - switch magicType { - case MagicSessionTypeVSCode: + + // Always force lowercase checking to be case-insensitive. + switch strings.ToLower(magicType) { + case strings.ToLower(MagicSessionTypeVSCode): s.connCountVSCode.Add(1) defer s.connCountVSCode.Add(-1) - case MagicSessionTypeJetBrains: + case strings.ToLower(MagicSessionTypeJetBrains): s.connCountJetBrains.Add(1) defer s.connCountJetBrains.Add(-1) case "": diff --git a/agent/agentssh/metrics.go b/agent/agentssh/metrics.go index 88ee100d65d9a..9c6f2fbb3c5d5 100644 --- a/agent/agentssh/metrics.go +++ b/agent/agentssh/metrics.go @@ -1,6 +1,8 @@ package agentssh import ( + "strings" + "github.com/prometheus/client_golang/prometheus" ) @@ -78,5 +80,6 @@ func magicTypeMetricLabel(magicType string) string { default: magicType = "unknown" } - return magicType + // Always be case insensitive + return strings.ToLower(magicType) }