TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

portlist: normalise space delimited process names (#5634)

Browse Source
This commit is contained in:
Kristoffer Dalby 2022-09-15 12:17:31 +02:00 committed by GitHub
parent 9c6bdae556
commit 81574a5c8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
portlist/clean.go
View File

@ -26,6 +26,9 @@ func argvSubject(argv ...string) string {
ret = filepath.Base(argv[1]) ret = filepath.Base(argv[1])
} }
// Handle space separated argv
ret, _, _ = strings.Cut(ret, " ")
// Remove common noise. // Remove common noise.
ret = strings.TrimSpace(ret) ret = strings.TrimSpace(ret)
ret = strings.TrimSuffix(ret, ".exe") ret = strings.TrimSuffix(ret, ".exe")

16
portlist/clean_test.go
View File

@ -31,6 +31,22 @@ func TestArgvSubject(t *testing.T) {
in: []string{"/bin/mono", "/sbin/exampleProgram.bin"}, in: []string{"/bin/mono", "/sbin/exampleProgram.bin"},
want: "exampleProgram.bin", want: "exampleProgram.bin",
}, },
{
in: []string{"/usr/bin/sshd_config [listener] 1 of 10-100 startups"},
want: "sshd_config",
},
{
in: []string{"/usr/bin/sshd [listener] 0 of 10-100 startups"},
want: "sshd",
},
{
in: []string{"/opt/aws/bin/eic_run_authorized_keys %u %f -o AuthorizedKeysCommandUser ec2-instance-connect [listener] 0 of 10-100 startups"},
want: "eic_run_authorized_keys",
},
{
in: []string{"/usr/bin/nginx worker"},
want: "nginx",
},
} }
for _, test := range tests { for _, test := range tests {