history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve: check uid on process search & fix typo (#824)

Browse Source
This commit is contained in:
Kr328 2020-07-22 20:22:34 +08:00 committed by GitHub
parent 4f73410618
commit 6521acf8f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rules/process_linux.go
View File

@ -36,7 +36,7 @@ type ProcessNameResolver func(inode, uid int) (name string, err error)
// export for android // export for android
var ( var (
DefaultSocketResolver SocketResolver = resolveSocketByNetlink DefaultSocketResolver SocketResolver = resolveSocketByNetlink
DefaultProcessNameResolver ProcessNameResolver = resolveProcessNameByProcSeach DefaultProcessNameResolver ProcessNameResolver = resolveProcessNameByProcSearch
) )
type Process struct { type Process struct {
@ -225,7 +225,7 @@ func unpackSocketDiagResponse(msg *syscall.NetlinkMessage) (inode, uid uint32) {
return return
} }
func resolveProcessNameByProcSeach(inode, _ int) (string, error) { func resolveProcessNameByProcSearch(inode, uid int) (string, error) {
files, err := ioutil.ReadDir(pathProc) files, err := ioutil.ReadDir(pathProc)
if err != nil { if err != nil {
return "", err return "", err
@ -235,7 +235,11 @@ func resolveProcessNameByProcSeach(inode, _ int) (string, error) {
socket := []byte(fmt.Sprintf("socket:[%d]", inode)) socket := []byte(fmt.Sprintf("socket:[%d]", inode))
for _, f := range files { for _, f := range files {
if !isPid(f.Name()) { if !f.IsDir() || !isPid(f.Name()) {
continue
}
if f.Sys().(*syscall.Stat_t).Uid != uint32(uid) {
continue continue
} }