Skip to content

Commit

Permalink
Update version data
Browse files Browse the repository at this point in the history
  • Loading branch information
dhaavi committed Oct 2, 2023
1 parent 51b9b32 commit dc99e42
Show file tree
Hide file tree
Showing 5 changed files with 178 additions and 138 deletions.
36 changes: 33 additions & 3 deletions _data/config-options.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,36 @@
"safing/portbase:ui:order": 513
}
},
{
"Name": "Time and Date Format",
"Key": "core/locale",
"Description": "Configures the time and date format for the user interface. Selection is an example and correct formatting in the UI is a continual work in progress.",
"Help": "",
"Sensitive": false,
"OptType": 1,
"ExpertiseLevel": 0,
"ReleaseLevel": 0,
"RequiresRestart": false,
"DefaultValue": "en-US",
"ValidationRegex": "^(en-GB|en-US)$",
"PossibleValues": [
{
"Name": "24h DD-MM-YYYY",
"Description": "",
"Value": "en-GB"
},
{
"Name": "12h MM/DD/YYYY",
"Description": "",
"Value": "en-US"
}
],
"Annotations": {
"safing/portbase:ui:category": "User Interface",
"safing/portbase:ui:display-hint": "one-of",
"safing/portmaster:ui:requires-reload": true
}
},
{
"Name": "Log Level",
"Key": "core/log/level",
Expand Down Expand Up @@ -1135,7 +1165,7 @@
"Name": "Outgoing Rules",
"Key": "filter/endpoints",
"Description": "Rules that apply to outgoing network connections. Cannot overrule Network Scopes and Connection Types (see above).",
"Help": "Rules are checked from top to bottom, stopping after the first match. They can match:\n\n- By address: `192.168.0.1`\n- By network: `192.168.0.1/24`\n- By network scope: `Localhost`, `LAN` or `Internet`\n- By domain:\n\t- Matching a distinct domain: `example.com`\n\t- Matching a domain with subdomains: `.example.com`\n\t- Matching with a wildcard prefix: `*xample.com`\n\t- Matching with a wildcard suffix: `example.*`\n\t- Matching domains containing text: `*example*`\n- By country (based on IP): `US` (two-letter country codes according to ISO 3166-1 alpha-2)\n- By AS number: `AS123456`\n- By filter list - use the filterlist ID prefixed with `L:`: `L:MAL`\n- Match anything: `*`\n\nAdditionally, you may supply a protocol and port using this format: `\u003chost\u003e \u003cIP protocol\u003e/\u003cport\u003e`.\n\nProtocols and ports may be specified using numbers (`6/80`) or names (`TCP/HTTP`). \nPort ranges are defined by using a hyphen (`TCP/1-1024`). Omit the port to match any. \nUse a `*` for matching any protocol. If matching ports with any protocol, protocols without ports will not match. \nRules with protocol and port definitions only match if the protocol and port also match. \nPorts are always compared to the destination port, thus, the local listening port for incoming connections. \n\nExamples:\n- `192.168.0.1 TCP/HTTP`\n- `LAN UDP/50000-55000`\n- `example.com */HTTPS`\n- `1.1.1.1 ICMP`\n\nImportant: DNS Requests are only matched against domain and filter list rules, all others require an IP address and are checked only with the following IP connection.\n\nPro Tip: You can use `#` to add a comment to a rule.\n",
"Help": "Rules are checked from top to bottom, stopping after the first match. They can match:\n\n- By address: `192.168.0.1`\n- By network: `192.168.0.1/24`\n- By network scope: `Localhost`, `LAN` or `Internet`\n- By domain:\n\t- Matching a distinct domain: `example.com`\n\t- Matching a domain with subdomains: `.example.com`\n\t- Matching with a wildcard prefix: `*xample.com`\n\t- Matching with a wildcard suffix: `example.*`\n\t- Matching domains containing text: `*example*`\n- By country (based on IP): `US` ([two-letter country codes according to ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2))\n- By continent (based on IP): `C:US` (prefix `AF`, `AN`, `AS`, `EU`, `NA`, `OC`, or `SA` with `C:`)\n- By AS number: `AS123456`\n- By filter list - use the filterlist ID prefixed with `L:`: `L:MAL`\n- Match anything: `*`\n\nAdditionally, you may supply a protocol and port using this format: `\u003chost\u003e \u003cIP protocol\u003e/\u003cport\u003e`.\n\nProtocols and ports may be specified using numbers (`6/80`) or names (`TCP/HTTP`). \nPort ranges are defined by using a hyphen (`TCP/1-1024`). Omit the port to match any. \nUse a `*` for matching any protocol. If matching ports with any protocol, protocols without ports will not match. \nRules with protocol and port definitions only match if the protocol and port also match. \nPorts are always compared to the destination port, thus, the local listening port for incoming connections. \n\nExamples:\n- `192.168.0.1 TCP/HTTP`\n- `LAN UDP/50000-55000`\n- `example.com */HTTPS`\n- `1.1.1.1 ICMP`\n\nImportant: DNS Requests are only matched against domain and filter list rules, all others require an IP address and are checked only with the following IP connection.\n\nPro Tip: You can use `#` to add a comment to a rule.\n",
"Sensitive": true,
"OptType": 2,
"ExpertiseLevel": 0,
Expand Down Expand Up @@ -1398,7 +1428,7 @@
"Name": "Incoming Rules",
"Key": "filter/serviceEndpoints",
"Description": "Rules that apply to incoming network connections. Cannot overrule Network Scopes and Connection Types (see above).",
"Help": "Rules are checked from top to bottom, stopping after the first match. They can match:\n\n- By address: `192.168.0.1`\n- By network: `192.168.0.1/24`\n- By network scope: `Localhost`, `LAN` or `Internet`\n- By domain:\n\t- Matching a distinct domain: `example.com`\n\t- Matching a domain with subdomains: `.example.com`\n\t- Matching with a wildcard prefix: `*xample.com`\n\t- Matching with a wildcard suffix: `example.*`\n\t- Matching domains containing text: `*example*`\n- By country (based on IP): `US` (two-letter country codes according to ISO 3166-1 alpha-2)\n- By AS number: `AS123456`\n- By filter list - use the filterlist ID prefixed with `L:`: `L:MAL`\n- Match anything: `*`\n\nAdditionally, you may supply a protocol and port using this format: `\u003chost\u003e \u003cIP protocol\u003e/\u003cport\u003e`.\n\nProtocols and ports may be specified using numbers (`6/80`) or names (`TCP/HTTP`). \nPort ranges are defined by using a hyphen (`TCP/1-1024`). Omit the port to match any. \nUse a `*` for matching any protocol. If matching ports with any protocol, protocols without ports will not match. \nRules with protocol and port definitions only match if the protocol and port also match. \nPorts are always compared to the destination port, thus, the local listening port for incoming connections. \n\nExamples:\n- `192.168.0.1 TCP/HTTP`\n- `LAN UDP/50000-55000`\n- `example.com */HTTPS`\n- `1.1.1.1 ICMP`\n\nImportant: DNS Requests are only matched against domain and filter list rules, all others require an IP address and are checked only with the following IP connection.\n\nPro Tip: You can use `#` to add a comment to a rule.\n",
"Help": "Rules are checked from top to bottom, stopping after the first match. They can match:\n\n- By address: `192.168.0.1`\n- By network: `192.168.0.1/24`\n- By network scope: `Localhost`, `LAN` or `Internet`\n- By domain:\n\t- Matching a distinct domain: `example.com`\n\t- Matching a domain with subdomains: `.example.com`\n\t- Matching with a wildcard prefix: `*xample.com`\n\t- Matching with a wildcard suffix: `example.*`\n\t- Matching domains containing text: `*example*`\n- By country (based on IP): `US` ([two-letter country codes according to ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2))\n- By continent (based on IP): `C:US` (prefix `AF`, `AN`, `AS`, `EU`, `NA`, `OC`, or `SA` with `C:`)\n- By AS number: `AS123456`\n- By filter list - use the filterlist ID prefixed with `L:`: `L:MAL`\n- Match anything: `*`\n\nAdditionally, you may supply a protocol and port using this format: `\u003chost\u003e \u003cIP protocol\u003e/\u003cport\u003e`.\n\nProtocols and ports may be specified using numbers (`6/80`) or names (`TCP/HTTP`). \nPort ranges are defined by using a hyphen (`TCP/1-1024`). Omit the port to match any. \nUse a `*` for matching any protocol. If matching ports with any protocol, protocols without ports will not match. \nRules with protocol and port definitions only match if the protocol and port also match. \nPorts are always compared to the destination port, thus, the local listening port for incoming connections. \n\nExamples:\n- `192.168.0.1 TCP/HTTP`\n- `LAN UDP/50000-55000`\n- `example.com */HTTPS`\n- `1.1.1.1 ICMP`\n\nImportant: DNS Requests are only matched against domain and filter list rules, all others require an IP address and are checked only with the following IP connection.\n\nPro Tip: You can use `#` to add a comment to a rule.\n",
"Sensitive": true,
"OptType": 2,
"ExpertiseLevel": 1,
Expand Down Expand Up @@ -1720,7 +1750,7 @@
"Name": "SPN Rules",
"Key": "spn/usagePolicy",
"Description": "Customize which websites should or should not be routed through the SPN. Only active if \"Use SPN\" is enabled.",
"Help": "Rules are checked from top to bottom, stopping after the first match. They can match:\n\n- By address: `192.168.0.1`\n- By network: `192.168.0.1/24`\n- By network scope: `Localhost`, `LAN` or `Internet`\n- By domain:\n\t- Matching a distinct domain: `example.com`\n\t- Matching a domain with subdomains: `.example.com`\n\t- Matching with a wildcard prefix: `*xample.com`\n\t- Matching with a wildcard suffix: `example.*`\n\t- Matching domains containing text: `*example*`\n- By country (based on IP): `US` (two-letter country codes according to ISO 3166-1 alpha-2)\n- By AS number: `AS123456`\n- By filter list - use the filterlist ID prefixed with `L:`: `L:MAL`\n- Match anything: `*`\n\nAdditionally, you may supply a protocol and port using this format: `\u003chost\u003e \u003cIP protocol\u003e/\u003cport\u003e`.\n\nProtocols and ports may be specified using numbers (`6/80`) or names (`TCP/HTTP`). \nPort ranges are defined by using a hyphen (`TCP/1-1024`). Omit the port to match any. \nUse a `*` for matching any protocol. If matching ports with any protocol, protocols without ports will not match. \nRules with protocol and port definitions only match if the protocol and port also match. \nPorts are always compared to the destination port, thus, the local listening port for incoming connections. \n\nExamples:\n- `192.168.0.1 TCP/HTTP`\n- `LAN UDP/50000-55000`\n- `example.com */HTTPS`\n- `1.1.1.1 ICMP`\n\nImportant: DNS Requests are only matched against domain and filter list rules, all others require an IP address and are checked only with the following IP connection.\n\nPro Tip: You can use `#` to add a comment to a rule.\n",
"Help": "Rules are checked from top to bottom, stopping after the first match. They can match:\n\n- By address: `192.168.0.1`\n- By network: `192.168.0.1/24`\n- By network scope: `Localhost`, `LAN` or `Internet`\n- By domain:\n\t- Matching a distinct domain: `example.com`\n\t- Matching a domain with subdomains: `.example.com`\n\t- Matching with a wildcard prefix: `*xample.com`\n\t- Matching with a wildcard suffix: `example.*`\n\t- Matching domains containing text: `*example*`\n- By country (based on IP): `US` ([two-letter country codes according to ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2))\n- By continent (based on IP): `C:US` (prefix `AF`, `AN`, `AS`, `EU`, `NA`, `OC`, or `SA` with `C:`)\n- By AS number: `AS123456`\n- By filter list - use the filterlist ID prefixed with `L:`: `L:MAL`\n- Match anything: `*`\n\nAdditionally, you may supply a protocol and port using this format: `\u003chost\u003e \u003cIP protocol\u003e/\u003cport\u003e`.\n\nProtocols and ports may be specified using numbers (`6/80`) or names (`TCP/HTTP`). \nPort ranges are defined by using a hyphen (`TCP/1-1024`). Omit the port to match any. \nUse a `*` for matching any protocol. If matching ports with any protocol, protocols without ports will not match. \nRules with protocol and port definitions only match if the protocol and port also match. \nPorts are always compared to the destination port, thus, the local listening port for incoming connections. \n\nExamples:\n- `192.168.0.1 TCP/HTTP`\n- `LAN UDP/50000-55000`\n- `example.com */HTTPS`\n- `1.1.1.1 ICMP`\n\nImportant: DNS Requests are only matched against domain and filter list rules, all others require an IP address and are checked only with the following IP connection.\n\nPro Tip: You can use `#` to add a comment to a rule.\n",
"Sensitive": true,
"OptType": 2,
"ExpertiseLevel": 0,
Expand Down
16 changes: 13 additions & 3 deletions _data/portmaster-api.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"Name": "Get Allocs Profile",
"Description": "Gather and return the memory allocation profile.\n\t\t\n\t\tYou can easily view this data in your browser with this command (with Go installed):\n\t\t`go tool pprof -http :8888 http://127.0.0.1:817/api/v1/debug/allocs`\n\t\t",
"Path": "debug/allocs",
"MimeType": "text/plain",
"MimeType": "application/octet-stream",
"Read": 1,
"ReadMethod": "GET"
},
Expand Down Expand Up @@ -197,15 +197,15 @@
}
],
"Path": "debug/cpu",
"MimeType": "text/plain",
"MimeType": "application/octet-stream",
"Read": 1,
"ReadMethod": "GET"
},
{
"Name": "Get Heap Profile",
"Description": "Gather and return the heap memory profile.\n\t\t\n\t\tYou can easily view this data in your browser with this command (with Go installed):\n\t\t`go tool pprof -http :8888 http://127.0.0.1:817/api/v1/debug/heap`\n\t\t",
"Path": "debug/heap",
"MimeType": "text/plain",
"MimeType": "application/octet-stream",
"Read": 1,
"ReadMethod": "GET"
},
Expand Down Expand Up @@ -375,6 +375,16 @@
"Write": 2,
"WriteMethod": "POST"
},
{
"Name": "Batch Query Connections",
"Description": "Batch query the in-memory sqlite connection database.",
"Path": "netquery/query/batch",
"MimeType": "application/json",
"Read": 2,
"ReadMethod": "GET",
"Write": 2,
"WriteMethod": "POST"
},
{
"Name": "Get Default Gateways",
"Description": "Returns the current active default gateways of the network.",
Expand Down
Loading

0 comments on commit dc99e42

Please sign in to comment.