Unify Configuration Management

DuckDuckGo/App Delegate/AppConfigurationURLProvider.swift

@@ -0,0 +1,37 @@
+//
+// AppConfigurationURLProvider.swift
+//
+// Copyright © 2023 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 Configuration
+
+struct AppConfigurationURLProvider: ConfigurationURLProvider {
+
+ func url(for configuration: Configuration) -> URL {
+ switch configuration {
+ case .bloomFilterBinary: return URL(string: "https://staticcdn.duckduckgo.com/https/https-mobile-v2-bloom.bin")!
+ case .bloomFilterSpec: return URL(string: "https://staticcdn.duckduckgo.com/https/https-mobile-v2-bloom-spec.json")!
+ case .bloomFilterExcludedDomains: return URL(string: "https://staticcdn.duckduckgo.com/https/https-mobile-v2-false-positives.json")!
+ case .privacyConfiguration: return URL(string: "https://staticcdn.duckduckgo.com/trackerblocking/config/v2/macos-config.json")!
+ case .surrogates: return URL(string: "https://duckduckgo.com/contentblocking.js?l=surrogates")!
+ case .trackerDataSet: return URL(string: "https://staticcdn.duckduckgo.com/trackerblocking/v3/apple-tds.json")!
+ // In archived repo, to be refactored shortly (https://staticcdn.duckduckgo.com/useragents/social_ctp_configuration.json)
+ case .FBConfig: return URL(string: "https://staticcdn.duckduckgo.com/useragents/")!
+ }
+ }
+
+}

DuckDuckGo/App Delegate/AppDelegate.swift

@@ -21,6 +21,8 @@ import Combine
 import os.log
 import BrowserServicesKit
 import Persistence
+import Configuration
+import API
 
 @NSApplicationMain
 final class AppDelegate: NSObject, NSApplicationDelegate {
@@ -61,6 +63,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
  var appUsageActivityMonitor: AppUsageActivityMonitor?
 
  func applicationWillFinishLaunching(_ notification: Notification) {
+ APIHeaders.setUserAgent(UserAgent.duckDuckGoUserAgent())
+ Configuration.setURLProvider(AppConfigurationURLProvider())
+
  if !Self.isRunningTests {
 #if DEBUG
  Pixel.setUp(dryRun: true)

DuckDuckGo/Browser Tab/Model/Tab.swift

@@ -1392,7 +1392,7 @@ extension Tab: WKNavigationDelegate {
  decidePolicyFor navigationResponse: WKNavigationResponse) async -> WKNavigationResponsePolicy {
  userEnteredUrl = false // subsequent requests will be navigations
 
- let isSuccessfulResponse = (navigationResponse.response as? HTTPURLResponse)?.validateStatusCode(statusCode: 200..<300) == nil
+ let isSuccessfulResponse = (navigationResponse.response as? HTTPURLResponse)?.isSuccessfulResponse ?? false
 
  internalUserDecider?.markUserAsInternalIfNeeded(forUrl: webView.url,
  response: navigationResponse.response as? HTTPURLResponse)

DuckDuckGo/Browser Tab/Model/UserContentUpdating.swift

@@ -21,6 +21,7 @@ import Combine
 import Common
 import BrowserServicesKit
 import UserScript
+import Configuration
 
 final class UserContentUpdating {
 

DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift

@@ -24,7 +24,7 @@ public struct UserDefaultsWrapper<T> {
  public enum Key: String, CaseIterable {
 
  case configLastUpdated = "config.last.updated"
- case configStorageTrackerRadarEtag = "config.storage.trackerradar.etag"
+ case configStorageTrackerRadarEtag = "config.storage.trackerDataSet.etag"
  case configStorageBloomFilterSpecEtag = "config.storage.bloomfilter.spec.etag"
  case configStorageBloomFilterBinaryEtag = "config.storage.bloomfilter.binary.etag"
  case configStorageBloomFilterExclusionsEtag = "config.storage.bloomfilter.exclusions.etag"