Dec 12, 2023 · Dec 12, 2023
diff --git a/agent/agentproc/proc_other.go b/agent/agentproc/proc_other.go
 "github.com/spf13/afero"
 )

 func (p*Process) Niceness(scSyscaller) (int, error) {
 func (*Process) Niceness(Syscaller) (int, error) {
 return 0, errUnimplemented
 }

 func (p*Process) SetNiceness(scSyscaller, score int) error {
 func (*Process) SetNiceness(Syscaller, int) error {
 return errUnimplemented
 }

 func (p*Process) Cmd() string {
 func (*Process) Cmd() string {
 return ""
 }

 func List(fsafero.Fs, syscaller Syscaller) ([]*Process, error) {
 func List(afero.Fs, Syscaller) ([]*Process, error) {
 return nil, errUnimplemented
 }
diff --git a/agent/agentproc/syscaller.go b/agent/agentproc/syscaller.go
 Kill(pid int32, sig syscall.Signal) error
 }

 // nolint: unused // used on some but no all platforms
 const defaultProcDir = "/proc"

 type Process struct {
diff --git a/agent/agentproc/syscaller_other.go b/agent/agentproc/syscaller_other.go

 type nopSyscaller struct{}

 func (nopSyscaller) SetPriority(pidint32, priority int) error {
 func (nopSyscaller) SetPriority(int32, int) error {
 return errUnimplemented
 }

 func (nopSyscaller) GetPriority(pidint32) (int, error) {
 func (nopSyscaller) GetPriority(int32) (int, error) {
 return 0, errUnimplemented
 }

 func (nopSyscaller) Kill(pidint32, sig syscall.Signal) error {
 func (nopSyscaller) Kill(int32, syscall.Signal) error {
 return errUnimplemented
 }
diff --git a/agent/agentssh/jetbrainstrack.go b/agent/agentssh/jetbrainstrack.go
 "strings"
 "sync"

 "cdr.dev/slog"
 "github.com/gliderlabs/ssh"
 "go.uber.org/atomic"
 gossh "golang.org/x/crypto/ssh"

 "cdr.dev/slog"
 )

 // localForwardChannelData is copied from the ssh package.
diff --git a/agent/agentssh/portinspection_unsupported.go b/agent/agentssh/portinspection_unsupported.go

 package agentssh

 func getListeningPortProcessCmdline(portuint32) (string, error) {
 func getListeningPortProcessCmdline(uint32) (string, error) {
 // We are not worrying about other platforms at the moment because Gateway
 // only supports Linux anyway.
 return "", nil
diff --git a/agent/api.go b/agent/api.go
 ignorePorts   map[int]string
 cacheDuration time.Duration

 mut   sync.Mutex
 //nolint: unused  // used on some but not all platforms
 mut sync.Mutex
 //nolint: unused  // used on some but not all platforms
 ports []codersdk.WorkspaceAgentListeningPort
 //nolint: unused  // used on some but not all platforms
 mtime time.Time
 }

diff --git a/agent/ports_unsupported.go b/agent/ports_unsupported.go

 import "github.com/coder/coder/v2/codersdk"

 func (lp*listeningPortsHandler) getListeningPorts() ([]codersdk.WorkspaceAgentListeningPort, error) {
 func (*listeningPortsHandler) getListeningPorts() ([]codersdk.WorkspaceAgentListeningPort, error) {
 // Can't scan for ports on non-linux or non-windows_amd64 systems at the
 // moment. The UI will not show any "no ports found" message to the user, so
 // the user won't suspect a thing.
diff --git a/agent/usershell/usershell_darwin.go b/agent/usershell/usershell_darwin.go
 func Get(username string) (string, error) {
 // This command will output "UserShell: /bin/zsh" if successful, we
 // can ignore the error since we have fallback behavior.
 if !filepath.IsLocal(username) {
 return "", xerrors.Errorf("username is nonlocal path: %s", username)
 }
 //nolint: gosec // input checked above
 out, _ := exec.Command("dscl", ".", "-read", filepath.Join("/Users", username), "UserShell").Output()
 s, ok := strings.CutPrefix(string(out), "UserShell: ")
 if ok {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,18 +7,18 @@ import (
		"github.com/spf13/afero"
		)

		func (p*Process) Niceness(scSyscaller) (int, error) {
		func (*Process) Niceness(Syscaller) (int, error) {
		return 0, errUnimplemented
		}

		func (p*Process) SetNiceness(scSyscaller, score int) error {
		func (*Process) SetNiceness(Syscaller, int) error {
		return errUnimplemented
		}

		func (p*Process) Cmd() string {
		func (*Process) Cmd() string {
		return ""
		}

		func List(fsafero.Fs, syscaller Syscaller) ([]*Process, error) {
		func List(afero.Fs, Syscaller) ([]*Process, error) {
		return nil, errUnimplemented
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,7 @@ type Syscaller interface {
		Kill(pid int32, sig syscall.Signal) error
		}

		// nolint: unused // used on some but no all platforms
		const defaultProcDir = "/proc"

		type Process struct {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,14 +17,14 @@ var errUnimplemented = xerrors.New("unimplemented")

		type nopSyscaller struct{}

		func (nopSyscaller) SetPriority(pidint32, priority int) error {
		func (nopSyscaller) SetPriority(int32, int) error {
		return errUnimplemented
		}

		func (nopSyscaller) GetPriority(pidint32) (int, error) {
		func (nopSyscaller) GetPriority(int32) (int, error) {
		return 0, errUnimplemented
		}

		func (nopSyscaller) Kill(pidint32, sig syscall.Signal) error {
		func (nopSyscaller) Kill(int32, syscall.Signal) error {
		return errUnimplemented
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,10 +4,11 @@ import (
		"strings"
		"sync"

		"cdr.dev/slog"
		"github.com/gliderlabs/ssh"
		"go.uber.org/atomic"
		gossh "golang.org/x/crypto/ssh"

		"cdr.dev/slog"
		)

		// localForwardChannelData is copied from the ssh package.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,7 @@

		package agentssh

		func getListeningPortProcessCmdline(portuint32) (string, error) {
		func getListeningPortProcessCmdline(uint32) (string, error) {
		// We are not worrying about other platforms at the moment because Gateway
		// only supports Linux anyway.
		return "", nil
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,8 +44,11 @@ type listeningPortsHandler struct {
		ignorePorts map[int]string
		cacheDuration time.Duration

		mut sync.Mutex
		//nolint: unused // used on some but not all platforms
		mut sync.Mutex
		//nolint: unused // used on some but not all platforms
		ports []codersdk.WorkspaceAgentListeningPort
		//nolint: unused // used on some but not all platforms
		mtime time.Time
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,7 @@ package agent

		import "github.com/coder/coder/v2/codersdk"

		func (lp*listeningPortsHandler) getListeningPorts() ([]codersdk.WorkspaceAgentListeningPort, error) {
		func (*listeningPortsHandler) getListeningPorts() ([]codersdk.WorkspaceAgentListeningPort, error) {
		// Can't scan for ports on non-linux or non-windows_amd64 systems at the
		// moment. The UI will not show any "no ports found" message to the user, so
		// the user won't suspect a thing.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,6 +13,10 @@ import (
		func Get(username string) (string, error) {
		// This command will output "UserShell: /bin/zsh" if successful, we
		// can ignore the error since we have fallback behavior.
		if !filepath.IsLocal(username) {
		return "", xerrors.Errorf("username is nonlocal path: %s", username)
		}
		//nolint: gosec // input checked above
		out, _ := exec.Command("dscl", ".", "-read", filepath.Join("/Users", username), "UserShell").Output()
		s, ok := strings.CutPrefix(string(out), "UserShell: ")
		if ok {
Expand Down