Skip to content

GitLab

T
tangled
Commit bb2b8130 authored by Daniel Rubery's avatar Daniel Rubery Committed by Commit Bot
Browse files
Options

Set several MacOS file types to show platform warnings on download 

Although we are sending FULL_PINGs for each of these file types,
it's probably useful to show platform warnings since the SB backend
will not be able to evaluate most of these.

Bug: 854877, 854855, 854838, 854808
Change-Id: Ib3f83626d0e4af281c8c9a89d1b7424110a597fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1526602
Commit-Queue: Daniel Rubery <drubery@chromium.org>
Reviewed-by: default avatarVarun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#641707}
parent 68704c3a
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 46 deletions
chrome/browser/resources/safe_browsing/download_file_types.asciipb
View file @ bb2b8130
......@@ -8,7 +8,7 @@
##
## Top level settings
##
version_id: 33
version_id: 34
sampled_ping_probability: 0.01
max_archived_binaries_to_report: 10
default_file_type {
......@@ -2806,6 +2806,16 @@ file_types {
}
inspection_type: DMG
}
file_types {
extension: "dylib"
uma_value: 357
ping_setting: FULL_PING
platform_settings {
platform: PLATFORM_MAC
danger_level: ALLOW_ON_USER_GESTURE
auto_open_hint: DISALLOW_AUTO_OPEN
}
}
file_types {
extension: "img"
uma_value: 247
......@@ -2829,25 +2839,25 @@ file_types {
inspection_type: DMG
}
file_types {
extension: "mobileconfig"
uma_value: 356
extension: "ndif"
uma_value: 258
ping_setting: FULL_PING
platform_settings {
platform: PLATFORM_MAC
danger_level: ALLOW_ON_USER_GESTURE
auto_open_hint: DISALLOW_AUTO_OPEN
}
inspection_type: DMG
}
file_types {
extension: "ndif"
uma_value: 258
extension: "service"
uma_value: 358
ping_setting: FULL_PING
platform_settings {
platform: PLATFORM_MAC
danger_level: ALLOW_ON_USER_GESTURE
auto_open_hint: DISALLOW_AUTO_OPEN
}
inspection_type: DMG
}
file_types {
extension: "smi"
......@@ -2910,7 +2920,40 @@ file_types {
# Automator action
extension: "action"
uma_value: 158
ping_setting: SAMPLED_PING
ping_setting: FULL_PING
platform_settings {
platform: PLATFORM_MAC
danger_level: ALLOW_ON_USER_GESTURE
auto_open_hint: DISALLOW_AUTO_OPEN
}
}
file_types {
# Automator action
extension: "definition"
uma_value: 359
ping_setting: FULL_PING
platform_settings {
platform: PLATFORM_MAC
danger_level: ALLOW_ON_USER_GESTURE
auto_open_hint: DISALLOW_AUTO_OPEN
}
}
file_types {
# Automator action
extension: "wflow"
uma_value: 360
ping_setting: FULL_PING
platform_settings {
platform: PLATFORM_MAC
danger_level: ALLOW_ON_USER_GESTURE
auto_open_hint: DISALLOW_AUTO_OPEN
}
}
file_types {
# Automator action
extension: "caction"
uma_value: 361
ping_setting: FULL_PING
platform_settings {
platform: PLATFORM_MAC
danger_level: ALLOW_ON_USER_GESTURE
......@@ -3040,7 +3083,7 @@ file_types {
# Automator workflow
extension: "workflow"
uma_value: 170
ping_setting: SAMPLED_PING
ping_setting: FULL_PING
platform_settings {
platform: PLATFORM_MAC
danger_level: ALLOW_ON_USER_GESTURE
......@@ -3059,6 +3102,46 @@ file_types {
}
inspection_type: ZIP
}
file_types {
extension: "mobileconfig"
uma_value: 356
ping_setting: FULL_PING
platform_settings {
platform: PLATFORM_MAC
danger_level: ALLOW_ON_USER_GESTURE
auto_open_hint: DISALLOW_AUTO_OPEN
}
}
file_types {
extension: "configprofile"
uma_value: 362
ping_setting: FULL_PING
platform_settings {
platform: PLATFORM_MAC
danger_level: ALLOW_ON_USER_GESTURE
auto_open_hint: DISALLOW_AUTO_OPEN
}
}
file_types {
extension: "internetconnect"
uma_value: 363
ping_setting: FULL_PING
platform_settings {
platform: PLATFORM_MAC
danger_level: ALLOW_ON_USER_GESTURE
auto_open_hint: DISALLOW_AUTO_OPEN
}
}
file_types {
extension: "networkconnect"
uma_value: 364
ping_setting: FULL_PING
platform_settings {
platform: PLATFORM_MAC
danger_level: ALLOW_ON_USER_GESTURE
auto_open_hint: DISALLOW_AUTO_OPEN
}
}
##
......
components/download/internal/common/download_stats.cc
View file @ bb2b8130
......@@ -401,44 +401,52 @@ constexpr const base::FilePath::CharType* kDangerousFileTypes[] = {
FILE_PATH_LITERAL(".settingcontent-ms"),
FILE_PATH_LITERAL(".oxt"), // 317
FILE_PATH_LITERAL(".pyd"),
FILE_PATH_LITERAL(".pyo"), // 319
FILE_PATH_LITERAL(".desktop"), // 320
FILE_PATH_LITERAL(".cpi"), // 321
FILE_PATH_LITERAL(".jpg"), // 322
FILE_PATH_LITERAL(".jpeg"), // 323
FILE_PATH_LITERAL(".mp3"), // 324
FILE_PATH_LITERAL(".mp4"), // 325
FILE_PATH_LITERAL(".png"), // 326
FILE_PATH_LITERAL(".xls"), // 327
FILE_PATH_LITERAL(".doc"), // 328
FILE_PATH_LITERAL(".pptx"), // 329
FILE_PATH_LITERAL(".csv"), // 330
FILE_PATH_LITERAL(".ica"), // 331
FILE_PATH_LITERAL(".ppt"), // 332
FILE_PATH_LITERAL(".gif"), // 333
FILE_PATH_LITERAL(".txt"), // 334
FILE_PATH_LITERAL(".package"), // 335
FILE_PATH_LITERAL(".tif"), // 336
FILE_PATH_LITERAL(".rtf"), // 337
FILE_PATH_LITERAL(".webp"), // 338
FILE_PATH_LITERAL(".mkv"), // 339
FILE_PATH_LITERAL(".wav"), // 340
FILE_PATH_LITERAL(".mov"), // 341
FILE_PATH_LITERAL(".dot"), // 342
FILE_PATH_LITERAL(".dotx"), // 343
FILE_PATH_LITERAL(".xlsb"), // 344
FILE_PATH_LITERAL(".xlt"), // 345
FILE_PATH_LITERAL(".xlm"), // 346
FILE_PATH_LITERAL(".xldm"), // 347
FILE_PATH_LITERAL(".xla"), // 348
FILE_PATH_LITERAL(".xlam"), // 349
FILE_PATH_LITERAL(".xll"), // 350
FILE_PATH_LITERAL(".xlw"), // 351
FILE_PATH_LITERAL(".pot"), // 352
FILE_PATH_LITERAL(".potm"), // 353
FILE_PATH_LITERAL(".ppsm"), // 354
FILE_PATH_LITERAL(".pps"), // 355
FILE_PATH_LITERAL(".mobileconfig"), // 356
FILE_PATH_LITERAL(".pyo"), // 319
FILE_PATH_LITERAL(".desktop"), // 320
FILE_PATH_LITERAL(".cpi"), // 321
FILE_PATH_LITERAL(".jpg"), // 322
FILE_PATH_LITERAL(".jpeg"), // 323
FILE_PATH_LITERAL(".mp3"), // 324
FILE_PATH_LITERAL(".mp4"), // 325
FILE_PATH_LITERAL(".png"), // 326
FILE_PATH_LITERAL(".xls"), // 327
FILE_PATH_LITERAL(".doc"), // 328
FILE_PATH_LITERAL(".pptx"), // 329
FILE_PATH_LITERAL(".csv"), // 330
FILE_PATH_LITERAL(".ica"), // 331
FILE_PATH_LITERAL(".ppt"), // 332
FILE_PATH_LITERAL(".gif"), // 333
FILE_PATH_LITERAL(".txt"), // 334
FILE_PATH_LITERAL(".package"), // 335
FILE_PATH_LITERAL(".tif"), // 336
FILE_PATH_LITERAL(".rtf"), // 337
FILE_PATH_LITERAL(".webp"), // 338
FILE_PATH_LITERAL(".mkv"), // 339
FILE_PATH_LITERAL(".wav"), // 340
FILE_PATH_LITERAL(".mov"), // 341
FILE_PATH_LITERAL(".dot"), // 342
FILE_PATH_LITERAL(".dotx"), // 343
FILE_PATH_LITERAL(".xlsb"), // 344
FILE_PATH_LITERAL(".xlt"), // 345
FILE_PATH_LITERAL(".xlm"), // 346
FILE_PATH_LITERAL(".xldm"), // 347
FILE_PATH_LITERAL(".xla"), // 348
FILE_PATH_LITERAL(".xlam"), // 349
FILE_PATH_LITERAL(".xll"), // 350
FILE_PATH_LITERAL(".xlw"), // 351
FILE_PATH_LITERAL(".pot"), // 352
FILE_PATH_LITERAL(".potm"), // 353
FILE_PATH_LITERAL(".ppsm"), // 354
FILE_PATH_LITERAL(".pps"), // 355
FILE_PATH_LITERAL(".mobileconfig"), // 356
FILE_PATH_LITERAL(".dylib"), // 357
FILE_PATH_LITERAL(".service"), // 358
FILE_PATH_LITERAL(".definition"), // 359
FILE_PATH_LITERAL(".wflow"), // 360
FILE_PATH_LITERAL(".caction"), // 361
FILE_PATH_LITERAL(".configprofile"), // 362
FILE_PATH_LITERAL(".internetconnect"), // 363
FILE_PATH_LITERAL(".networkconnect"), // 364
// NOTE! When you add a type here, please add the UMA value as a comment.
// These must all match DownloadItem.DangerousFileType in
// enums.xml. From 263 onward, they should also match
......
tools/metrics/histograms/enums.xml
View file @ bb2b8130
......@@ -13368,6 +13368,14 @@ Called by update_net_error_codes.py.-->
<int value="354" label="ppsm"/>
<int value="355" label="pps"/>
<int value="356" label="mobileconfig"/>
<int value="357" label="dylib"/>
<int value="358" label="service"/>
<int value="359" label="definition"/>
<int value="360" label="wflow"/>
<int value="361" label="caction"/>
<int value="362" label="configprofile"/>
<int value="363" label="internetconnect"/>
<int value="364" label="networkconnect"/>
</enum>
<enum name="DownloadItem.DangerType">
......@@ -48243,6 +48251,14 @@ Called by update_net_trust_anchors.py.-->
<int value="354" label="PPSM"/>
<int value="355" label="PPS"/>
<int value="356" label="MOBILECONFIG"/>
<int value="357" label="DYLIB"/>
<int value="358" label="SERVICE"/>
<int value="359" label="DEFINITION"/>
<int value="360" label="WFLOW"/>
<int value="361" label="CACTION"/>
<int value="362" label="CONFIGPROFILE"/>
<int value="363" label="INTERNETCONNECT"/>
<int value="364" label="NETWORKCONNECT"/>
</enum>
<enum name="SBClientDownloadIsSignedBinary">
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment