Fix privacy icon glitch

duckduckgo · Sep 10, 2024 · 1694957 · 1694957
1 parent 93a1189
commit 1694957
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -10772,8 +10772,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
-				kind = exactVersion;
-				version = 191.2.3;
+				branch = "coldfix/191.2.3-1";
+				kind = branch;
 			};
 		};
 		9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "b83ccf14b5844e8876de04bcc3074a15569f3b26",
-        "version" : "191.2.3"
+        "branch" : "coldfix/191.2.3-1",
+        "revision" : "3bac7c0924eeebd58b8868ef44489fac0fb7ec44"
       }
     },
     {
@@ -138,7 +138,7 @@
     {
       "identity" : "swift-argument-parser",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser.git",
+      "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
         "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
         "version" : "1.4.0"

diff --git a/DuckDuckGo/PrivacyIconLogic.swift b/DuckDuckGo/PrivacyIconLogic.swift
@@ -37,8 +37,9 @@ final class PrivacyIconLogic {
         } else {
             let config = ContentBlocking.shared.privacyConfigurationManager.privacyConfig
             let isUserUnprotected = config.isUserUnprotected(domain: privacyInfo.url.host)
-
-            let notFullyProtected = !privacyInfo.https || isUserUnprotected || privacyInfo.serverTrust == nil
+
+            let isServerTrustInvalid = (privacyInfo.shouldCheckServerTrust ? privacyInfo.serverTrust == nil : false)
+            let notFullyProtected = !privacyInfo.https || isUserUnprotected || isServerTrustInvalid
 
             return notFullyProtected ? .shieldWithDot : .shield
         }

diff --git a/DuckDuckGo/TabViewController.swift b/DuckDuckGo/TabViewController.swift
@@ -993,22 +993,23 @@ class TabViewController: UIViewController {
                 self.privacyInfo = privacyInfo
                 didGoBackForward = false
             } else {
-                privacyInfo = makePrivacyInfo(url: url)
+                privacyInfo = makePrivacyInfo(url: url, shouldCheckServerTrust: true)
             }
         } else {
             privacyInfo = nil
         }
         onPrivacyInfoChanged()
     }
 
-    public func makePrivacyInfo(url: URL) -> PrivacyInfo? {
+    public func makePrivacyInfo(url: URL, shouldCheckServerTrust: Bool = false) -> PrivacyInfo? {
         guard let host = url.host else { return nil }
 
         let entity = ContentBlocking.shared.trackerDataManager.trackerData.findParentEntityOrFallback(forHost: host)
 
         let privacyInfo = PrivacyInfo(url: url,
                                       parentEntity: entity,
-                                      protectionStatus: makeProtectionStatus(for: host))
+                                      protectionStatus: makeProtectionStatus(for: host),
+                                      shouldCheckServerTrust: shouldCheckServerTrust)
         let isValid = certificateTrustEvaluator.evaluateCertificateTrust(trust: webView.serverTrust)
         if let isValid {
             privacyInfo.serverTrust = isValid ? webView.serverTrust : nil

diff --git a/DuckDuckGoTests/PrivacyIconLogicTests.swift b/DuckDuckGoTests/PrivacyIconLogicTests.swift
@@ -96,7 +96,7 @@ class PrivacyIconLogicTests: XCTestCase {
         let url = PrivacyIconLogicTests.pageURL
         let entity = Entity(displayName: "E", domains: [], prevalence: 100.0)
         let protectionStatus = ProtectionStatus(unprotectedTemporary: false, enabledFeatures: [], allowlisted: false, denylisted: false)
-        let privacyInfo = PrivacyInfo(url: url, parentEntity: entity, protectionStatus: protectionStatus)
+        let privacyInfo = PrivacyInfo(url: url, parentEntity: entity, protectionStatus: protectionStatus, shouldCheckServerTrust: true)
 
         let icon = PrivacyIconLogic.privacyIcon(for: privacyInfo)
 
@@ -105,6 +105,19 @@ class PrivacyIconLogicTests: XCTestCase {
         XCTAssertEqual(icon, .shieldWithDot)
     }
 
+    func testPrivacyIconIsShieldWithoutDotForNoSecTrustAndShouldCheckServerTrustIsFalse() {
+        let url = PrivacyIconLogicTests.pageURL
+        let entity = Entity(displayName: "E", domains: [], prevalence: 100.0)
+        let protectionStatus = ProtectionStatus(unprotectedTemporary: false, enabledFeatures: [], allowlisted: false, denylisted: false)
+        let privacyInfo = PrivacyInfo(url: url, parentEntity: entity, protectionStatus: protectionStatus)
+
+        let icon = PrivacyIconLogic.privacyIcon(for: privacyInfo)
+
+        XCTAssertTrue(url.isHttps)
+        XCTAssertTrue(privacyInfo.https)
+        XCTAssertEqual(icon, .shield)
+    }
+
 }
 
 final class MockSecTrust: SecurityTrust {}