vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-02 10:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve string operations and use new call limiter in network/proc

Browse source
This commit is contained in:
Daniel 2023-09-28 15:05:35 +02:00
parent 577299c95b
commit 0fd5cbba4b
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
firewall/interception/ebpf/bandwidth/interface.go
View file

@ -154,7 +154,7 @@ func reportBandwidth(ctx context.Context, objs bpfObjects, bandwidthUpdates chan
case <-ctx.Done(): case <-ctx.Done():
return return
default: default:
log.Warningf("ebpf: bandwidth update queue is full (updated=%d, skipped=%d), skipping rest of batch", updated, skipped) log.Warningf("ebpf: bandwidth update queue is full (updated=%d, skipped=%d), ignoring rest of batch", updated, skipped)
return return
} }
} }

20
network/proc/findpid.go
View file

@ -4,9 +4,9 @@ package proc
import ( import (
"errors" "errors"
"fmt"
"io/fs" "io/fs"
"os" "os"
"strconv"
"time" "time"
"github.com/safing/portbase/log" "github.com/safing/portbase/log"
@ -19,7 +19,7 @@ var (
) )
// GetPID returns the already existing pid of the given socket info or searches for it. // GetPID returns the already existing pid of the given socket info or searches for it.
// This also acts as a getter for socket.*Info.PID, as locking for that occurs here. // This also acts as a getter for socket.Info.PID, as locking for that occurs here.
func GetPID(socketInfo socket.Info) (pid int) { func GetPID(socketInfo socket.Info) (pid int) {
// Get currently assigned PID to the socket info. // Get currently assigned PID to the socket info.
currentPid := socketInfo.GetPID() currentPid := socketInfo.GetPID()
@ -41,7 +41,7 @@ func GetPID(socketInfo socket.Info) (pid int) {
// findPID returns the pid of the given uid and socket inode. // findPID returns the pid of the given uid and socket inode.
func findPID(uid, inode int) (pid int) { func findPID(uid, inode int) (pid int) {
socketName := fmt.Sprintf("socket:[%d]", inode) socketName := "socket:[" + strconv.Itoa(inode) + "]"
for i := 0; i <= lookupRetries; i++ { for i := 0; i <= lookupRetries; i++ {
var pidsUpdated bool var pidsUpdated bool
@ -83,7 +83,7 @@ func findPID(uid, inode int) (pid int) {
} }
// We have updated the PID map, but still cannot find anything. // We have updated the PID map, but still cannot find anything.
// So, there is nothing we can other than wait a little for the kernel to // So, there is nothing we can do other than to wait a little for the kernel to
// populate the information. // populate the information.
// Wait after each try, except for the last iteration // Wait after each try, except for the last iteration
@ -97,16 +97,20 @@ func findPID(uid, inode int) (pid int) {
} }
func findSocketFromPid(pid int, socketName string) bool { func findSocketFromPid(pid int, socketName string) bool {
entries := readDirNames(fmt.Sprintf("/proc/%d/fd", pid)) socketBase := "/proc/" + strconv.Itoa(pid) + "/fd"
entries := readDirNames(socketBase)
if len(entries) == 0 { if len(entries) == 0 {
return false return false
} }
for _, entry := range entries { socketBase += "/"
link, err := os.Readlink(fmt.Sprintf("/proc/%d/fd/%s", pid, entry)) // Look through the FDs in reverse order, because higher/newer FDs will be
// more likely to be searched for.
for i := len(entries) - 1; i >= 0; i-- {
link, err := os.Readlink(socketBase + entries[i])
if err != nil { if err != nil {
if !errors.Is(err, fs.ErrNotExist) { if !errors.Is(err, fs.ErrNotExist) {
log.Warningf("proc: failed to read link /proc/%d/fd/%s: %s", pid, entry, err) log.Warningf("proc: failed to read link /proc/%d/fd/%s: %s", pid, entries[i], err)
} }
continue continue
} }

8
network/proc/pids_by_user.go
View file

@ -4,12 +4,12 @@ package proc
import ( import (
"errors" "errors"
"fmt"
"io/fs" "io/fs"
"os" "os"
"strconv" "strconv"
"sync" "sync"
"syscall" "syscall"
"time"
"github.com/safing/portbase/log" "github.com/safing/portbase/log"
"github.com/safing/portbase/utils" "github.com/safing/portbase/utils"
@ -19,7 +19,7 @@ var (
// pidsByUserLock is also used for locking the socketInfo.PID on all socket.*Info structs. // pidsByUserLock is also used for locking the socketInfo.PID on all socket.*Info structs.
pidsByUser = make(map[int][]int) pidsByUser = make(map[int][]int)
pidsByUserLock sync.RWMutex pidsByUserLock sync.RWMutex
fetchPidsByUser utils.OnceAgain fetchPidsByUser = utils.NewCallLimiter(10 * time.Millisecond)
) )
// getPidsByUser returns the cached PIDs for the given UID. // getPidsByUser returns the cached PIDs for the given UID.
@ -31,7 +31,7 @@ func getPidsByUser(uid int) (pids []int, ok bool) {
return return
} }
// updatePids fetches and creates a new pidsByUser map using utils.OnceAgain. // updatePids fetches and creates a new pidsByUser map using a call limiter.
func updatePids() { func updatePids() {
fetchPidsByUser.Do(func() { fetchPidsByUser.Do(func() {
newPidsByUser := make(map[int][]int) newPidsByUser := make(map[int][]int)
@ -50,7 +50,7 @@ func updatePids() {
continue entryLoop continue entryLoop
} }
statData, err := os.Stat(fmt.Sprintf("/proc/%d", pid)) statData, err := os.Stat("/proc/" + strconv.FormatInt(pid, 10))
if err != nil { if err != nil {
if !errors.Is(err, fs.ErrNotExist) { if !errors.Is(err, fs.ErrNotExist) {
log.Warningf("proc: could not stat /proc/%d: %s", pid, err) log.Warningf("proc: could not stat /proc/%d: %s", pid, err)