Add constant for JetBrains magic string

code-asher · code-asher · commit 254a5b6a6a02 · 2023-12-01T13:57:47.000-09:00
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -47,8 +47,12 @@ const (
 	MagicSessionTypeEnvironmentVariable = "CODER_SSH_SESSION_TYPE"
 	// MagicSessionTypeVSCode is set in the SSH config by the VS Code extension to identify itself.
 	MagicSessionTypeVSCode = "vscode"
-	// MagicSessionTypeJetBrains is set in the SSH config by the JetBrains extension to identify itself.
+	// MagicSessionTypeJetBrains is set in the SSH config by the JetBrains
+	// extension to identify itself.
 	MagicSessionTypeJetBrains = "jetbrains"
+	// MagicProcessCmdlineJetBrains is a string in a process's command line that
+	// uniquely identifies it as JetBrains software.
+	MagicProcessCmdlineJetBrains = "idea.vendor.name=JetBrains"
 )
 
 type Server struct {
diff --git a/agent/agentssh/jetbrainstrack.go b/agent/agentssh/jetbrainstrack.go
@@ -46,9 +46,8 @@ func NewJetbrainsChannelWatcher(ctx ssh.Context, logger slog.Logger, newChannel
 	}
 
 	// If this is not JetBrains, then we do not need to do anything special.  We
-	// attempt to match on something that appears unique to JetBrains software and
-	// the vendor name flag seems like it might be a reasonable choice.
-	if !strings.Contains(strings.ToLower(cmdline), "idea.vendor.name=jetbrains") {
+	// attempt to match on something that appears unique to JetBrains software.
+	if !strings.Contains(strings.ToLower(cmdline), strings.ToLower(MagicProcessCmdlineJetBrains)) {
 		return newChannel
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,8 @@ func NewJetbrainsChannelWatcher(ctx ssh.Context, logger slog.Logger, newChannel`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`// If this is not JetBrains, then we do not need to do anything special. We`
`49`		`- // attempt to match on something that appears unique to JetBrains software and`
`50`		`- // the vendor name flag seems like it might be a reasonable choice.`
`51`		`- if !strings.Contains(strings.ToLower(cmdline), "idea.vendor.name=jetbrains") {`
	`49`	`+ // attempt to match on something that appears unique to JetBrains software.`
	`50`	`+ if !strings.Contains(strings.ToLower(cmdline), strings.ToLower(MagicProcessCmdlineJetBrains)) {`
`52`	`51`	`return newChannel`
`53`	`52`	`}`
`54`	`53`