Skip to content

fix(procfs): report raw values in parse errors #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperQ merged 1 commit into from
Jul 17, 2026
Merged

fix(procfs): report raw values in parse errors #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mountinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ func parseMountInfoString(mountString string) (*MountInfo, error) {

mount.MountID, err = strconv.Atoi(mountInfo[0])
if err != nil {
return nil, fmt.Errorf("%w: mount ID: %q", ErrFileParse, mount.MountID)
return nil, fmt.Errorf("%w: mount ID: %q", ErrFileParse, mountInfo[0])
}
mount.ParentID, err = strconv.Atoi(mountInfo[1])
if err != nil {
return nil, fmt.Errorf("%w: parent ID: %q", ErrFileParse, mount.ParentID)
return nil, fmt.Errorf("%w: parent ID: %q", ErrFileParse, mountInfo[1])
}
// Has optional fields, which is a space separated list of values.
// Example: shared:2 master:7
Expand Down
32 changes: 32 additions & 0 deletions mountinfo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,43 @@
package procfs

import (
"strings"
"testing"

"github.com/google/go-cmp/cmp"
)

func TestParseMountInfoStringParseErrorsIncludeRawValue(t *testing.T) {
tests := []struct {
name string
line string
value string
}{
{
name: "mount ID",
line: "invalid-mount-id 21 0:16 / /sys rw shared:7 - sysfs sysfs rw",
value: "invalid-mount-id",
},
{
name: "parent ID",
line: "16 invalid-parent-id 0:16 / /sys rw shared:7 - sysfs sysfs rw",
value: "invalid-parent-id",
},
}

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
_, err := parseMountInfoString(test.line)
if err == nil {
t.Fatal("expected an error, but none occurred")
}
if !strings.Contains(err.Error(), test.value) {
t.Fatalf("error %q does not contain raw value %q", err, test.value)
}
})
}
}

func TestMountInfo(t *testing.T) {
tests := []struct {
name string
Expand Down
18 changes: 9 additions & 9 deletions net_ip_socket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func parseNetIPSocketLine(fields []string, isUDP bool) (*netIPSocketLine, error)
}

if line.Sl, err = strconv.ParseUint(s[0], 0, 64); err != nil {
return nil, fmt.Errorf("%w: Unable to parse sl field in %q: %w", ErrFileParse, line.Sl, err)
return nil, fmt.Errorf("%w: Unable to parse sl field in %q: %w", ErrFileParse, s[0], err)
}
// local_address
l := strings.Split(fields[1], ":")
Expand All @@ -189,7 +189,7 @@ func parseNetIPSocketLine(fields []string, isUDP bool) (*netIPSocketLine, error)
return nil, err
}
if line.LocalPort, err = strconv.ParseUint(l[1], 16, 64); err != nil {
return nil, fmt.Errorf("%w: Unable to parse local_address port value line %q: %w", ErrFileParse, line.LocalPort, err)
return nil, fmt.Errorf("%w: Unable to parse local_address port value line %q: %w", ErrFileParse, l[1], err)
}

// remote_address
Expand All @@ -201,12 +201,12 @@ func parseNetIPSocketLine(fields []string, isUDP bool) (*netIPSocketLine, error)
return nil, err
}
if line.RemPort, err = strconv.ParseUint(r[1], 16, 64); err != nil {
return nil, fmt.Errorf("%w: Cannot parse rem_address port value in %q: %w", ErrFileParse, line.RemPort, err)
return nil, fmt.Errorf("%w: Cannot parse rem_address port value in %q: %w", ErrFileParse, r[1], err)
}

// st
if line.St, err = strconv.ParseUint(fields[3], 16, 64); err != nil {
return nil, fmt.Errorf("%w: Cannot parse st value in %q: %w", ErrFileParse, line.St, err)
return nil, fmt.Errorf("%w: Cannot parse st value in %q: %w", ErrFileParse, fields[3], err)
}

// tx_queue and rx_queue
Expand All @@ -219,27 +219,27 @@ func parseNetIPSocketLine(fields []string, isUDP bool) (*netIPSocketLine, error)
)
}
if line.TxQueue, err = strconv.ParseUint(q[0], 16, 64); err != nil {
return nil, fmt.Errorf("%w: Cannot parse tx_queue value in %q: %w", ErrFileParse, line.TxQueue, err)
return nil, fmt.Errorf("%w: Cannot parse tx_queue value in %q: %w", ErrFileParse, q[0], err)
}
if line.RxQueue, err = strconv.ParseUint(q[1], 16, 64); err != nil {
return nil, fmt.Errorf("%w: Cannot parse trx_queue value in %q: %w", ErrFileParse, line.RxQueue, err)
return nil, fmt.Errorf("%w: Cannot parse trx_queue value in %q: %w", ErrFileParse, q[1], err)
}

// uid
if line.UID, err = strconv.ParseUint(fields[7], 0, 64); err != nil {
return nil, fmt.Errorf("%w: Cannot parse UID value in %q: %w", ErrFileParse, line.UID, err)
return nil, fmt.Errorf("%w: Cannot parse UID value in %q: %w", ErrFileParse, fields[7], err)
}

// inode
if line.Inode, err = strconv.ParseUint(fields[9], 0, 64); err != nil {
return nil, fmt.Errorf("%w: Cannot parse inode value in %q: %w", ErrFileParse, line.Inode, err)
return nil, fmt.Errorf("%w: Cannot parse inode value in %q: %w", ErrFileParse, fields[9], err)
}

// drops
if isUDP {
drops, err := strconv.ParseUint(fields[12], 0, 64)
if err != nil {
return nil, fmt.Errorf("%w: Cannot parse drops value in %q: %w", ErrFileParse, drops, err)
return nil, fmt.Errorf("%w: Cannot parse drops value in %q: %w", ErrFileParse, fields[12], err)
}
line.Drops = &drops
}
Expand Down
37 changes: 37 additions & 0 deletions net_ip_socket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,48 @@ package procfs

import (
"net"
"strings"
"testing"

"github.com/google/go-cmp/cmp"
)

func TestParseNetIPSocketLineParseErrorsIncludeRawValue(t *testing.T) {
baseFields := []string{"1:", "00000000:0000", "00000000:0000", "07", "00000000:00000001", "0:0", "0", "10", "0", "39309", "2", "000000009bd60d72", "5"}
tests := []struct {
name string
value string
want string
field int
isUDP bool
}{
{name: "sl", field: 0, value: "invalid-sl:", want: "invalid-sl"},
{name: "local port", field: 1, value: "00000000:invalid-local-port", want: "invalid-local-port"},
{name: "remote port", field: 2, value: "00000000:invalid-remote-port", want: "invalid-remote-port"},
{name: "state", field: 3, value: "invalid-state", want: "invalid-state"},
{name: "transmit queue", field: 4, value: "invalid-tx-queue:00000001", want: "invalid-tx-queue"},
{name: "receive queue", field: 4, value: "00000000:invalid-rx-queue", want: "invalid-rx-queue"},
{name: "UID", field: 7, value: "invalid-uid", want: "invalid-uid"},
{name: "inode", field: 9, value: "invalid-inode", want: "invalid-inode"},
{name: "drops", field: 12, value: "invalid-drops", want: "invalid-drops", isUDP: true},
}

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
fields := append([]string(nil), baseFields...)
fields[test.field] = test.value

_, err := parseNetIPSocketLine(fields, test.isUDP)
if err == nil {
t.Fatal("expected an error, but none occurred")
}
if !strings.Contains(err.Error(), test.want) {
t.Fatalf("error %q does not contain raw value %q", err, test.want)
}
})
}
}

func Test_parseNetIPSocketLine(t *testing.T) {
tests := []struct {
fields []string
Expand Down