fix: track JetBrains connections #10968

code-asher · 2023-12-01T00:20:06Z

Fixes #9673

Possibly we will need to find a better string to match on, but this one seems OK to me.

Unit test passes but have not tested an actual deploy yet.

Based on tcp forwarding instead of ssh connections

matifali · 2023-12-01T02:06:31Z

@code-asher Try ./scripts/deploy-pr.sh

code-asher · 2023-12-01T19:50:34Z

Verified it works! 🎉

code-asher · 2023-12-01T20:20:13Z

Ah wait moving back to draft, there seems to be an issue...

agent/agent_test.go

agent/agentssh/jetbrainstrack.go

code-asher · 2023-12-01T20:53:42Z

The two issues I ran into, just FYI:

I had the process name check reversed, needed a ! 🤦
Netstat only gives the base name, not the full command line, so I need to read /proc/$pid/cmdline to get that.

I think it is all sorted now, doing some more testing to be sure.

code-asher · 2023-12-01T21:00:13Z

OK, verified it all works as expected in a deployment. Test is failing in CI though. Passes for me locally...

Emyrk · 2023-12-01T21:04:31Z

Test is failing in CI though. Passes for me locally...

Ooof, this test is quite strange too. That sounds annoying to debug...

Use t.Log() to log statements, and keep them there.

Co-authored-by: Steven Masley <Emyrk@users.noreply.github.com>

matifali · 2023-12-01T21:19:59Z

Will this also work for Fleet?

code-asher · 2023-12-01T21:28:16Z

Will this also work for Fleet?

I am not sure, we will need to test.

The test name only shows up in the process name if you are running that test directly so we have to spawn a separate process instead.

code-asher · 2023-12-01T23:33:40Z

OK, sorted the test. The test name only shows up in the process name if you run that specific test directly, so when we are running the entire suite the name does not show up.

What I did was spawn an external process instead. Not sure if I did it in an idiomatic way or if there even is an idiomatic way, with Node I would just fork to create child processes using the same Node binary but I am not seeing an equivalent in Go, at least not without a new package dependency. So I have this janky exec.Command("go", "run", ...) type of deal.

We could also try spawning something like nc instead of a Go program. but I am not sure how commonly nc is installed.

Emyrk

Looks good, let's get this in and test it a bit.

Emyrk added 3 commits November 30, 2023 16:08

feat: implement jetbrains agentssh tracking

c9a226f

Based on tcp forwarding instead of ssh connections

Add unit test to confirm tracking

2447970

implement unit test to verify jetbrains functionality

76d3a24

github-actions bot assigned code-asher Dec 1, 2023

code-asher changed the title ~~Track JetBrains connections~~ fix: track JetBrains connections Dec 1, 2023

code-asher force-pushed the jetbrains/track_connections branch from 7948ab5 to e7f9516 Compare December 1, 2023 00:24

code-asher marked this pull request as ready for review December 1, 2023 19:50

code-asher requested a review from Emyrk December 1, 2023 19:53

code-asher force-pushed the jetbrains/track_connections branch 2 times, most recently from fe83fbd to 9dede7f Compare December 1, 2023 20:18

code-asher removed the request for review from Emyrk December 1, 2023 20:19

code-asher marked this pull request as draft December 1, 2023 20:20

Emyrk reviewed Dec 1, 2023

View reviewed changes

code-asher force-pushed the jetbrains/track_connections branch from 9dede7f to 9840a69 Compare December 1, 2023 20:45

code-asher and others added 6 commits December 1, 2023 12:05

Implement port process inspection

adf2fb3

Add JetBrains tracking to bottom bar

ad034f2

Elaborate on process name check comment

34b7c5e

Co-authored-by: Steven Masley <Emyrk@users.noreply.github.com>

Comment that localForwardChannelData is copied

dce56fd

Co-authored-by: Steven Masley <Emyrk@users.noreply.github.com>

Comment ChannelAccepterWatcher

7139448

Co-authored-by: Steven Masley <Emyrk@users.noreply.github.com>

Rename channel watcher to be specific to Jetbrains

6e8f235

code-asher force-pushed the jetbrains/track_connections branch from 64ea05d to 6e8f235 Compare December 1, 2023 21:06

Log unmarshal failure

4d65478

code-asher force-pushed the jetbrains/track_connections branch from e79b01c to ec59e7e Compare December 1, 2023 21:27

code-asher force-pushed the jetbrains/track_connections branch from ec59e7e to 90e6e88 Compare December 1, 2023 21:43

Add constant for JetBrains magic string

254a5b6

code-asher force-pushed the jetbrains/track_connections branch 2 times, most recently from 9cf5082 to 7fd04cb Compare December 1, 2023 23:19

Fix JetBrains tracking test

a75ed6c

The test name only shows up in the process name if you are running that test directly so we have to spawn a separate process instead.

code-asher force-pushed the jetbrains/track_connections branch from 7fd04cb to a75ed6c Compare December 1, 2023 23:26

code-asher marked this pull request as ready for review December 1, 2023 23:33

code-asher requested a review from Emyrk December 1, 2023 23:33

Emyrk approved these changes Dec 7, 2023

View reviewed changes

code-asher merged commit dbbf8ac into main Dec 7, 2023

code-asher deleted the jetbrains/track_connections branch December 7, 2023 21:15

github-actions bot locked and limited conversation to collaborators Dec 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: track JetBrains connections #10968

fix: track JetBrains connections #10968

code-asher commented Dec 1, 2023 •

edited

Loading

matifali commented Dec 1, 2023

code-asher commented Dec 1, 2023

code-asher commented Dec 1, 2023

code-asher commented Dec 1, 2023

code-asher commented Dec 1, 2023

Emyrk commented Dec 1, 2023

matifali commented Dec 1, 2023

code-asher commented Dec 1, 2023

code-asher commented Dec 1, 2023

Emyrk left a comment

fix: track JetBrains connections #10968

fix: track JetBrains connections #10968

Conversation

code-asher commented Dec 1, 2023 • edited Loading

matifali commented Dec 1, 2023

code-asher commented Dec 1, 2023

code-asher commented Dec 1, 2023

code-asher commented Dec 1, 2023

code-asher commented Dec 1, 2023

Emyrk commented Dec 1, 2023

matifali commented Dec 1, 2023

code-asher commented Dec 1, 2023

code-asher commented Dec 1, 2023

Emyrk left a comment

Choose a reason for hiding this comment

code-asher commented Dec 1, 2023 •

edited

Loading