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

Fix linter errors

Browse source
This commit is contained in:
Vladimir 2022-11-09 12:17:23 +01:00
parent 075f9151cd
commit a04b76ff58
5 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firewall/interception.go
View file

@ -177,9 +177,7 @@ func interceptionStart() error {
interceptionModule.StartWorker("stat logger", statLogger) interceptionModule.StartWorker("stat logger", statLogger)
interceptionModule.StartWorker("packet handler", packetHandler) interceptionModule.StartWorker("packet handler", packetHandler)
err := interception.Start() return interception.Start()
return err
} }
func interceptionStop() error { func interceptionStop() error {

1
firewall/interception/interception_linux.go
View file

@ -21,6 +21,7 @@ func ResetVerdictOfAllConnections() error {
return nfq.DeleteAllMarkedConnection() return nfq.DeleteAllMarkedConnection()
} }
// UpdateVerdictOfConnection deletes the verdict of specific connection so in can be initialized again with the next packet
func UpdateVerdictOfConnection(conn *network.Connection) error { func UpdateVerdictOfConnection(conn *network.Connection) error {
return nfq.DeleteMarkedConnection(conn) return nfq.DeleteMarkedConnection(conn)
} }

4
firewall/interception/interception_windows.go
View file

@ -41,11 +41,13 @@ func ResetVerdictOfAllConnections() error {
return windowskext.ClearCache() return windowskext.ClearCache()
} }
// UpdateVerdictOfConnection updates the verdict of specific connection in the kernel extension
func UpdateVerdictOfConnection(conn *network.Connection) error { func UpdateVerdictOfConnection(conn *network.Connection) error {
return windowskext.UpdateVerdict(conn) return windowskext.UpdateVerdict(conn)
} }
func GetVersion() (string, error) { // GetKextVersion returns the version of the kernel extension
func GetKextVersion() (string, error) {
version, err := windowskext.GetVersion() version, err := windowskext.GetVersion()
if err != nil { if err != nil {
return "", err return "", err

18
firewall/interception/nfq/conntrack.go
View file

@ -13,10 +13,9 @@ import (
"github.com/safing/portmaster/network" "github.com/safing/portmaster/network"
) )
var ( var nfct *ct.Nfct // Conntrack handler. NFCT: Network Filter Connection Tracking
nfct *ct.Nfct // Conntrack handler. NFCT: Network Filter Connection Tracking
)
// InitNFCT initializes the network filter conntrack library
func InitNFCT() error { func InitNFCT() error {
var err error var err error
nfct, err = ct.Open(&ct.Config{}) nfct, err = ct.Open(&ct.Config{})
@ -26,6 +25,7 @@ func InitNFCT() error {
return nil return nil
} }
// DeinitNFCT deinitializes the network filter conntrack library
func DeinitNFCT() { func DeinitNFCT() {
_ = nfct.Close() _ = nfct.Close()
} }
@ -82,6 +82,7 @@ func deleteMarkedConnections(nfct *ct.Nfct, f ct.Family) (deleted int) {
return deleted return deleted
} }
// DeleteMarkedConnection removes a specific connection from the conntrack table
func DeleteMarkedConnection(conn *network.Connection) error { func DeleteMarkedConnection(conn *network.Connection) error {
if nfct == nil { if nfct == nil {
return fmt.Errorf("nfq: nfct not initialized") return fmt.Errorf("nfq: nfct not initialized")
@ -100,7 +101,7 @@ func DeleteMarkedConnection(conn *network.Connection) error {
} }
connections, err := nfct.Get(ct.Conntrack, ct.IPv4, con) connections, err := nfct.Get(ct.Conntrack, ct.IPv4, con)
if err != nil { if err != nil {
return fmt.Errorf("nfq: failed to find entry for connection %s: %s", conn.String(), err) return fmt.Errorf("nfq: failed to find entry for connection %s: %w", conn.String(), err)
} }
if len(connections) > 1 { if len(connections) > 1 {
@ -108,7 +109,14 @@ func DeleteMarkedConnection(conn *network.Connection) error {
} }
for _, connection := range connections { for _, connection := range connections {
nfct.Delete(ct.Conntrack, ct.IPv4, connection) deleteErr := nfct.Delete(ct.Conntrack, ct.IPv4, connection)
if err == nil {
err = deleteErr
}
}
if err != nil {
log.Warningf("nfq: error while deleting conntrack entries for connection %s: %s", conn.String(), err)
} }
return nil return nil

4
firewall/interception/nfqueue_linux.go
View file

@ -150,7 +150,7 @@ func activateNfqueueFirewall() error {
if err := nfq.InitNFCT(); err != nil { if err := nfq.InitNFCT(); err != nil {
return err return err
} }
nfq.DeleteAllMarkedConnection() _ = nfq.DeleteAllMarkedConnection()
return nil return nil
} }
@ -171,7 +171,7 @@ func DeactivateNfqueueFirewall() error {
} }
} }
nfq.DeleteAllMarkedConnection() _ = nfq.DeleteAllMarkedConnection()
nfq.DeinitNFCT() nfq.DeinitNFCT()
return result.ErrorOrNil() return result.ErrorOrNil()