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

Refactoring

Browse Source
This commit is contained in:
Vladimir Stoilov
2022-07-26 07:10:03 +02:00
committed by Daniel
parent 420da81b33
commit 35697989e5
4 changed files with 214 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
firewall/master.go
View File

@@ -616,21 +616,34 @@ matchLoop:
}
func checkCustomFilterList(_ context.Context, conn *network.Connection, p *profile.LayeredProfile, _ packet.Packet) bool {
// block domains that are in the custom list
// block if the domain name appears in the custom filter list
if conn.Entity.Domain != "" {
if customlists.LookupDomain(conn.Entity.Domain) {
// FIXME: add proper messages
log.Debugf("Blocked %s", conn.Entity.Domain)
conn.Block("Domains appiers in the custom user list", profile.CfgOptionRemoveBlockedDNSKey)
conn.Block("Domains appears in the custom user list", customlists.CfgOptionCustomListBlockingKey)
return true
}
}
// block if ip addresses appears in the custom filter list
if conn.Entity.IP != nil {
if customlists.LookupIPv4(&conn.Entity.IP) {
// FIXME: add proper messages
log.Debugf("Blocked %s", conn.Entity.IP)
conn.Block("IP appiers in the custom user list", profile.CfgOptionBlockScopeInternetKey)
if customlists.LookupIP(&conn.Entity.IP) {
conn.Block("IP appears in the custom filter list", customlists.CfgOptionCustomListBlockingKey)
return true
}
}
// block autonomous system by its number if it appears in the custom filter list
if conn.Entity.ASN != 0 {
if customlists.LookupASN(conn.Entity.ASN) {
conn.Block("ASN appears in the custom filter list", customlists.CfgOptionCustomListBlockingKey)
return true
}
}
// block if the country appears in the custom filter list
if conn.Entity.Country != "" {
if customlists.LookupCountry(conn.Entity.Country) {
conn.Block("Country appears in the custom filter list", customlists.CfgOptionCustomListBlockingKey)
return true
}
}