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

Combine geoip country info and add country names

Browse Source
This commit is contained in:
Daniel
2023-08-23 13:53:19 +02:00
parent 629b2db495
commit 5939486767
9 changed files with 1828 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
profile/config.go
View File

@@ -160,19 +160,9 @@ var securityLevelSettings = []string{
}
var (
// SPNRulesQuickSettings is a list of countries the SPN currently is present in
// as quick settings in order to help users with SPN related policy settings.
// This is a quick win to make the MVP easier to use, but will be replaced by
// a better solution in the future.
// SPNRulesQuickSettings are now generated automatically shorty after start.
SPNRulesQuickSettings = []config.QuickSetting{
{Name: "Exclude Canada (CA)", Action: config.QuickMergeTop, Value: []string{"- CA"}},
{Name: "Exclude Finland (FI)", Action: config.QuickMergeTop, Value: []string{"- FI"}},
{Name: "Exclude France (FR)", Action: config.QuickMergeTop, Value: []string{"- FR"}},
{Name: "Exclude Germany (DE)", Action: config.QuickMergeTop, Value: []string{"- DE"}},
{Name: "Exclude Israel (IL)", Action: config.QuickMergeTop, Value: []string{"- IL"}},
{Name: "Exclude Poland (PL)", Action: config.QuickMergeTop, Value: []string{"- PL"}},
{Name: "Exclude United Kingdom (GB)", Action: config.QuickMergeTop, Value: []string{"- GB"}},
{Name: "Exclude United States of America (US)", Action: config.QuickMergeTop, Value: []string{"- US"}},
{Name: "Loading...", Action: config.QuickMergeTop, Value: []string{""}},
}
// SPNRulesVerdictNames defines the verdicts names to be used for SPN Rules.
@@ -733,7 +723,6 @@ Please note that if you are using the system resolver, bypass attempts might be
Sensitive: true,
OptType: config.OptTypeStringArray,
ExpertiseLevel: config.ExpertiseLevelExpert,
ReleaseLevel: config.ReleaseLevelBeta,
DefaultValue: []string{},
Annotations: config.Annotations{
config.StackableAnnotation: true,

2
profile/profile.go
View File

@@ -461,7 +461,7 @@ func (profile *Profile) updateMetadata(binaryPath string) (changed bool) {
changed = true
}
// Migrato to Fingerprints.
// Migrate to Fingerprints.
// TODO: Remove in v1.5
if len(profile.Fingerprints) == 0 && profile.LinkedPath != "" {
profile.Fingerprints = []Fingerprint{