github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[windows_kext] fix all linter error

Browse Source
This commit is contained in:
Vladimir Stoilov
2024-05-16 16:21:27 +03:00
parent 5610c88208
commit 1d6228ea7b
18 changed files with 137 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
service/firewall/interception/windowskext2/handler.go
View File

@@ -44,7 +44,7 @@ func Handler(ctx context.Context, packets chan packet.Packet, bandwidthUpdate ch
conn := packetInfo.ConnectionV4
// New Packet
newPacket := &Packet{
verdictRequest: conn.Id,
verdictRequest: conn.ID,
payload: conn.Payload,
verdictSet: abool.NewBool(false),
}
@@ -52,7 +52,7 @@ func Handler(ctx context.Context, packets chan packet.Packet, bandwidthUpdate ch
info.Inbound = conn.Direction > 0
info.InTunnel = false
info.Protocol = packet.IPProtocol(conn.Protocol)
info.PID = int(conn.ProcessId)
info.PID = int(conn.ProcessID)
info.SeenAt = time.Now()
// Check PID
@@ -68,12 +68,12 @@ func Handler(ctx context.Context, packets chan packet.Packet, bandwidthUpdate ch
// Set IPs
if info.Inbound {
// Inbound
info.Src = conn.RemoteIp[:]
info.Dst = conn.LocalIp[:]
info.Src = conn.RemoteIP[:]
info.Dst = conn.LocalIP[:]
} else {
// Outbound
info.Src = conn.LocalIp[:]
info.Dst = conn.RemoteIp[:]
info.Src = conn.LocalIP[:]
info.Dst = conn.RemoteIP[:]
}
// Set Ports
@@ -95,7 +95,7 @@ func Handler(ctx context.Context, packets chan packet.Packet, bandwidthUpdate ch
conn := packetInfo.ConnectionV6
// New Packet
newPacket := &Packet{
verdictRequest: conn.Id,
verdictRequest: conn.ID,
payload: conn.Payload,
verdictSet: abool.NewBool(false),
}
@@ -103,7 +103,7 @@ func Handler(ctx context.Context, packets chan packet.Packet, bandwidthUpdate ch
info.Inbound = conn.Direction > 0
info.InTunnel = false
info.Protocol = packet.IPProtocol(conn.Protocol)
info.PID = int(conn.ProcessId)
info.PID = int(conn.ProcessID)
info.SeenAt = time.Now()
// Check PID
@@ -119,12 +119,12 @@ func Handler(ctx context.Context, packets chan packet.Packet, bandwidthUpdate ch
// Set IPs
if info.Inbound {
// Inbound
info.Src = conn.RemoteIp[:]
info.Dst = conn.LocalIp[:]
info.Src = conn.RemoteIP[:]
info.Dst = conn.LocalIP[:]
} else {
// Outbound
info.Src = conn.LocalIp[:]
info.Dst = conn.RemoteIp[:]
info.Src = conn.LocalIP[:]
info.Dst = conn.RemoteIP[:]
}
// Set Ports

41
service/firewall/interception/windowskext2/kext.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/safing/portbase/log"
"github.com/safing/portmaster/service/network"
"github.com/safing/portmaster/windows_kext/kext_interface"
"github.com/safing/portmaster/windows_kext/kextinterface"
"golang.org/x/sys/windows"
)
@@ -16,8 +16,8 @@ import (
var (
driverPath string
service *kext_interface.KextService
kextFile *kext_interface.KextFile
service *kextinterface.KextService
kextFile *kextinterface.KextFile
)
const (
@@ -31,10 +31,9 @@ func Init(path string) error {
// Start intercepting.
func Start() error {
// initialize and start driver service
var err error
service, err = kext_interface.CreateKextService(driverName, driverPath)
service, err = kextinterface.CreateKextService(driverName, driverPath)
if err != nil {
return fmt.Errorf("failed to create service: %w", err)
}
@@ -86,46 +85,46 @@ func Stop() error {
// Sends a shutdown request.
func shutdownRequest() error {
return kext_interface.SendShutdownCommand(kextFile)
return kextinterface.SendShutdownCommand(kextFile)
}
// Send request for logs of the kext.
func SendLogRequest() error {
return kext_interface.SendGetLogsCommand(kextFile)
return kextinterface.SendGetLogsCommand(kextFile)
}
func SendBandwidthStatsRequest() error {
return kext_interface.SendGetBandwidthStatsCommand(kextFile)
return kextinterface.SendGetBandwidthStatsCommand(kextFile)
}
func SendPrintMemoryStatsCommand() error {
return kext_interface.SendPrintMemoryStatsCommand(kextFile)
return kextinterface.SendPrintMemoryStatsCommand(kextFile)
}
func SendCleanEndedConnection() error {
return kext_interface.SendCleanEndedConnectionsCommand(kextFile)
return kextinterface.SendCleanEndedConnectionsCommand(kextFile)
}
// RecvVerdictRequest waits for the next verdict request from the kext. If a timeout is reached, both *VerdictRequest and error will be nil.
func RecvVerdictRequest() (*kext_interface.Info, error) {
return kext_interface.RecvInfo(kextFile)
func RecvVerdictRequest() (*kextinterface.Info, error) {
return kextinterface.RecvInfo(kextFile)
}
// SetVerdict sets the verdict for a packet and/or connection.
func SetVerdict(pkt *Packet, verdict kext_interface.KextVerdict) error {
verdictCommand := kext_interface.Verdict{Id: pkt.verdictRequest, Verdict: uint8(verdict)}
return kext_interface.SendVerdictCommand(kextFile, verdictCommand)
func SetVerdict(pkt *Packet, verdict kextinterface.KextVerdict) error {
verdictCommand := kextinterface.Verdict{ID: pkt.verdictRequest, Verdict: uint8(verdict)}
return kextinterface.SendVerdictCommand(kextFile, verdictCommand)
}
// Clears the internal connection cache.
func ClearCache() error {
return kext_interface.SendClearCacheCommand(kextFile)
return kextinterface.SendClearCacheCommand(kextFile)
}
// Updates a specific connection verdict.
func UpdateVerdict(conn *network.Connection) error {
if conn.IPVersion == 4 {
update := kext_interface.UpdateV4{
update := kextinterface.UpdateV4{
Protocol: conn.Entity.Protocol,
LocalAddress: [4]byte(conn.LocalIP),
LocalPort: conn.LocalPort,
@@ -134,9 +133,9 @@ func UpdateVerdict(conn *network.Connection) error {
Verdict: uint8(conn.Verdict),
}
return kext_interface.SendUpdateV4Command(kextFile, update)
return kextinterface.SendUpdateV4Command(kextFile, update)
} else if conn.IPVersion == 6 {
update := kext_interface.UpdateV6{
update := kextinterface.UpdateV6{
Protocol: conn.Entity.Protocol,
LocalAddress: [16]byte(conn.LocalIP),
LocalPort: conn.LocalPort,
@@ -145,14 +144,14 @@ func UpdateVerdict(conn *network.Connection) error {
Verdict: uint8(conn.Verdict),
}
return kext_interface.SendUpdateV6Command(kextFile, update)
return kextinterface.SendUpdateV6Command(kextFile, update)
}
return nil
}
// Returns the kext version.
func GetVersion() (*VersionInfo, error) {
data, err := kext_interface.ReadVersion(kextFile)
data, err := kextinterface.ReadVersion(kextFile)
if err != nil {
return nil, err
}

18
service/firewall/interception/windowskext2/packet.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/safing/portbase/log"
"github.com/safing/portmaster/service/network/packet"
"github.com/safing/portmaster/windows_kext/kext_interface"
"github.com/safing/portmaster/windows_kext/kextinterface"
)
// Packet represents an IP packet.
@@ -70,7 +70,7 @@ func (pkt *Packet) LoadPacketData() error {
// Accept accepts the packet.
func (pkt *Packet) Accept() error {
if pkt.verdictSet.SetToIf(false, true) {
return SetVerdict(pkt, kext_interface.VerdictAccept)
return SetVerdict(pkt, kextinterface.VerdictAccept)
}
return nil
}
@@ -78,7 +78,7 @@ func (pkt *Packet) Accept() error {
// Block blocks the packet.
func (pkt *Packet) Block() error {
if pkt.verdictSet.SetToIf(false, true) {
return SetVerdict(pkt, kext_interface.VerdictBlock)
return SetVerdict(pkt, kextinterface.VerdictBlock)
}
return nil
}
@@ -86,7 +86,7 @@ func (pkt *Packet) Block() error {
// Drop drops the packet.
func (pkt *Packet) Drop() error {
if pkt.verdictSet.SetToIf(false, true) {
return SetVerdict(pkt, kext_interface.VerdictDrop)
return SetVerdict(pkt, kextinterface.VerdictDrop)
}
return nil
}
@@ -94,7 +94,7 @@ func (pkt *Packet) Drop() error {
// PermanentAccept permanently accepts connection (and the current packet).
func (pkt *Packet) PermanentAccept() error {
if pkt.verdictSet.SetToIf(false, true) {
return SetVerdict(pkt, kext_interface.VerdictPermanentAccept)
return SetVerdict(pkt, kextinterface.VerdictPermanentAccept)
}
return nil
}
@@ -102,7 +102,7 @@ func (pkt *Packet) PermanentAccept() error {
// PermanentBlock permanently blocks connection (and the current packet).
func (pkt *Packet) PermanentBlock() error {
if pkt.verdictSet.SetToIf(false, true) {
return SetVerdict(pkt, kext_interface.VerdictPermanentBlock)
return SetVerdict(pkt, kextinterface.VerdictPermanentBlock)
}
return nil
}
@@ -110,7 +110,7 @@ func (pkt *Packet) PermanentBlock() error {
// PermanentDrop permanently drops connection (and the current packet).
func (pkt *Packet) PermanentDrop() error {
if pkt.verdictSet.SetToIf(false, true) {
return SetVerdict(pkt, kext_interface.VerdictPermanentDrop)
return SetVerdict(pkt, kextinterface.VerdictPermanentDrop)
}
return nil
}
@@ -118,7 +118,7 @@ func (pkt *Packet) PermanentDrop() error {
// RerouteToNameserver permanently reroutes the connection to the local nameserver (and the current packet).
func (pkt *Packet) RerouteToNameserver() error {
if pkt.verdictSet.SetToIf(false, true) {
return SetVerdict(pkt, kext_interface.VerdictRerouteToNameserver)
return SetVerdict(pkt, kextinterface.VerdictRerouteToNameserver)
}
return nil
}
@@ -126,7 +126,7 @@ func (pkt *Packet) RerouteToNameserver() error {
// RerouteToTunnel permanently reroutes the connection to the local tunnel entrypoint (and the current packet).
func (pkt *Packet) RerouteToTunnel() error {
if pkt.verdictSet.SetToIf(false, true) {
return SetVerdict(pkt, kext_interface.VerdictRerouteToTunnel)
return SetVerdict(pkt, kextinterface.VerdictRerouteToTunnel)
}
return nil
}

6
service/firewall/interception/windowskext2/service.go
View File

@@ -3,8 +3,8 @@
package windowskext
import "github.com/safing/portmaster/windows_kext/kext_interface"
import "github.com/safing/portmaster/windows_kext/kextinterface"
func createKextService(driverName string, driverPath string) (*kext_interface.KextService, error) {
return kext_interface.CreateKextService(driverName, driverPath)
func createKextService(driverName string, driverPath string) (*kextinterface.KextService, error) {
return kextinterface.CreateKextService(driverName, driverPath)
}