-
Notifications
You must be signed in to change notification settings - Fork 423
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Malicious site protection navigation detection integration #3730
Open
alessandroboron
wants to merge
12
commits into
alessandro/malicious-site-protection-feature-flags
Choose a base branch
from
alessandro/malicious-site-protection-navigation-detection-integration
base: alessandro/malicious-site-protection-feature-flags
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
8daac91
Add MaliciouSiteProtectionManager config and resources
alessandroboron aee478b
Add manager initial logic
alessandroboron 5363d46
Refactor logic and added unit tests
alessandroboron a136c4f
Add MaliciousSiteProtection integration tests
alessandroboron fe1589e
Reset Error Data when new navigation happens
alessandroboron 84f75fe
Remove files added by mistake to ATBUITests target
alessandroboron fb8b80a
Fix closing tab for malicious site protection and open a new tab in s…
alessandroboron f81d116
Move MaliciousSiteProtectionPreferences to its own file
alessandroboron e51c7a1
Fix tests
alessandroboron c42864f
Change file store directory to application support
alessandroboron 6c5fcf6
Disable SwiftLint rule nesting
alessandroboron b5fe830
clean up code
alessandroboron File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
DuckDuckGo/MaliciousSiteProtection/MaliciousSiteProtectionManager+Config.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
// | ||
// MaliciousSiteProtectionManager+Config.swift | ||
// DuckDuckGo | ||
// | ||
// Copyright © 2024 DuckDuckGo. All rights reserved. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
// | ||
|
||
import Foundation | ||
import MaliciousSiteProtection | ||
|
||
extension MaliciousSiteProtectionManager { | ||
|
||
static func fileName(for dataType: MaliciousSiteProtection.DataManager.StoredDataType) -> String { | ||
switch (dataType, dataType.threatKind) { | ||
case (.hashPrefixSet, .phishing): "phishingHashPrefixes.json" | ||
case (.filterSet, .phishing): "phishingFilterSet.json" | ||
case (.hashPrefixSet, .malware): "malwareHashPrefixes.json" | ||
case (.filterSet, .malware): "malwareFilterSet.json" | ||
} | ||
} | ||
|
||
static func updateInterval(for dataKind: MaliciousSiteProtection.DataManager.StoredDataType) -> TimeInterval { | ||
switch dataKind { | ||
case .hashPrefixSet: .minutes(20) | ||
case .filterSet: .hours(12) | ||
} | ||
} | ||
|
||
struct EmbeddedDataProvider: MaliciousSiteProtection.EmbeddedDataProviding { | ||
|
||
// swiftlint:disable:next nesting | ||
private enum Constants { | ||
static let embeddedDataRevision = 1696473 | ||
static let phishingEmbeddedHashPrefixDataSHA = "cdb609c37e950b7d0dcdaa80ae4071cf2c87223cfdd189caafae723722bd3158" | ||
static let phishingEmbeddedFilterSetDataSHA = "4e52518aba04b0fd360fada76c9899001d3137d4a745cc13c484a54115a0fcd8" | ||
static let malwareEmbeddedHashPrefixDataSHA = "6b5eb296e9e10ae9ea41c5b5356f532226d647e4f3b832c30ac670102446ea7a" | ||
static let malwareEmbeddedFilterSetDataSHA = "4dc971fffaf244ee99267f28222a2c116743e35ef837dcbc0199693ed6a691cd" | ||
} | ||
|
||
func revision(for dataType: MaliciousSiteProtection.DataManager.StoredDataType) -> Int { | ||
Constants.embeddedDataRevision | ||
} | ||
|
||
func url(for dataType: MaliciousSiteProtection.DataManager.StoredDataType) -> URL { | ||
let fileName = fileName(for: dataType) | ||
guard let url = Bundle.main.url(forResource: fileName, withExtension: nil) else { | ||
fatalError("Could not find embedded data file \"\(fileName)\"") | ||
} | ||
return url | ||
} | ||
|
||
func hash(for dataType: MaliciousSiteProtection.DataManager.StoredDataType) -> String { | ||
switch (dataType, dataType.threatKind) { | ||
case (.hashPrefixSet, .phishing): Constants.phishingEmbeddedHashPrefixDataSHA | ||
case (.filterSet, .phishing): Constants.phishingEmbeddedFilterSetDataSHA | ||
case (.hashPrefixSet, .malware): Constants.malwareEmbeddedHashPrefixDataSHA | ||
case (.filterSet, .malware): Constants.malwareEmbeddedFilterSetDataSHA | ||
} | ||
} | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Implementation from macOS https://github.com/duckduckgo/macos-browser/blob/main/DuckDuckGo/MaliciousSiteProtection/MaliciousSiteProtectionManager.swift