vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-04 19:49:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Ignore comments on rule parsing

Browse source
This commit is contained in:
Daniel 2022-04-12 16:39:42 +02:00
parent cb9d8cee06
commit 295efbb3a2
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
profile/endpoints/endpoint.go
View file

@ -208,6 +208,14 @@ func parseEndpoint(value string) (endpoint Endpoint, err error) { //nolint:gocog
return nil, fmt.Errorf(`invalid endpoint definition: "%s"`, value) return nil, fmt.Errorf(`invalid endpoint definition: "%s"`, value)
} }
// Remove comment.
for i, field := range fields {
if strings.HasPrefix(field, "#") {
fields = fields[:i]
break
}
}
// any // any
if endpoint, err = parseTypeAny(fields); endpoint != nil || err != nil { if endpoint, err = parseTypeAny(fields); endpoint != nil || err != nil {
return return

4
profile/endpoints/endpoints.go
View file

@ -62,11 +62,13 @@ entriesLoop:
// ListEntryValidationRegex is a regex to bullshit check endpoint list entries. // ListEntryValidationRegex is a regex to bullshit check endpoint list entries.
var ListEntryValidationRegex = strings.Join([]string{ var ListEntryValidationRegex = strings.Join([]string{
`^(\+|\-) `, // Rule verdict. `^(\+|\-) `, // Rule verdict.
`(! +)?`, // Invert matching.
`[A-z0-9\.:\-*/]+`, // Entity matching. `[A-z0-9\.:\-*/]+`, // Entity matching.
`( `, // Start of optional matching. `( `, // Start of optional matching.
`[A-z0-9*]+`, // Protocol matching. `[A-z0-9*]+`, // Protocol matching.
`(/[A-z0-9]+(\-[A-z0-9]+)?)?`, // Port and port range matching. `(/[A-z0-9]+(\-[A-z0-9]+)?)?`, // Port and port range matching.
`)?$`, // End of optional matching. `)?`, // End of optional matching.
`( +#.*)?`, // Optional comment.
}, "") }, "")
// ValidateEndpointListConfigOption validates the given value. // ValidateEndpointListConfigOption validates the given value.