Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

GUI: Add %bundle_or_file_sha% translation key #797

Merged
russellhancox merged 4 commits into from
May 3, 2022
Merged

GUI: Add %bundle_or_file_sha% translation key #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
292d99b
GUI: Add %bundle_or_file_sha% translation key
russellhancox May 3, 2022
fe20234
Make file_sha only show the file's sha
russellhancox May 3, 2022
fa4ed9b
run clang format
russellhancox May 3, 2022
ee6ca9f
d'oh, duplicate condition
russellhancox May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Source/common/SNTBlockMessage.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,10 @@ + (NSURL *)eventDetailURLForEvent:(SNTStoredEvent *)event {
if (!formatStr.length) return nil;

if (event.fileSHA256) {
formatStr = [formatStr stringByReplacingOccurrencesOfString:@"%file_sha%"
withString:event.fileSHA256];
formatStr =
[formatStr stringByReplacingOccurrencesOfString:@"%file_sha%"
[formatStr stringByReplacingOccurrencesOfString:@"%bundle_or_file_sha%"
withString:event.fileBundleHash ?: event.fileSHA256];
}
if (event.executingUser) {
Expand Down
19 changes: 10 additions & 9 deletions docs/deployment/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ also known as mobileconfig files, which are in an Apple-specific XML format.
| MetricExtraLabels | Dictionary | A map of key value pairs to add to all metric root labels. (e.g. a=b,c=d) defaults to @{}). If a previously set key (e.g. host_name is set to "" then the key is remove from the metric root labels. Alternatively if a value is set for an existing key then the new value will override the old. |


*overridable by the sync server: run `santactl status` to check the current
\*overridable by the sync server: run `santactl status` to check the current
running config

##### EventDetailURL
Expand All @@ -76,14 +76,15 @@ take them to a web page with more information about that event.
This property contains a kind of format string to be turned into the URL to send
them to. The following sequences will be replaced in the final URL:

| Key | Description |
| ------------ | ---------------------------------------- |
| %file_sha% | SHA-256 of the file that was blocked |
| %machine_id% | ID of the machine |
| %username% | The executing user |
| %serial% | System's serial number |
| %uuid% | System's UUID |
| %hostname% | System's full hostname |
| Key | Description |
| ----------------------- | ------------------------------------------------------------------------------ |
| %file_sha% | SHA-256 of the file that was blocked |
| %bundle\_or\_file\_sha% | SHA-256 of the file that was blocked or the bundle containing it, if available |
| %machine\_id% | ID of the machine |
| %username% | The executing user |
| %serial% | System's serial number |
| %uuid% | System's UUID |
| %hostname% | System's full hostname |

For example: `https://sync-server-hostname/%machine_id%/%file_sha%`

Expand Down