-
Notifications
You must be signed in to change notification settings - Fork 35
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
Mitigate known pixel noise #851
Closed
+435
−17
Closed
Changes from all commits
Commits
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
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
32 changes: 32 additions & 0 deletions
32
Sources/Common/Extensions/ProcessInfo+SystemBootDate.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,32 @@ | ||
// | ||
// ProcessInfo.swift | ||
// | ||
// 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 | ||
|
||
extension ProcessInfo { | ||
|
||
public static func systemBootDate() -> Date { | ||
var tv = timeval() | ||
var tvSize = MemoryLayout<timeval>.size | ||
let err = sysctlbyname("kern.boottime", &tv, &tvSize, nil, 0) | ||
guard err == 0, tvSize == MemoryLayout<timeval>.size else { | ||
return Date(timeIntervalSince1970: 0) | ||
} | ||
return Date(timeIntervalSince1970: Double(tv.tv_sec) + Double(tv.tv_usec) / 1_000_000.0) | ||
} | ||
} |
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
100 changes: 100 additions & 0 deletions
100
Sources/NetworkProtection/Pixels/VPNTunnelStartPixelHandler.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,100 @@ | ||
// | ||
// VPNTunnelStartPixelHandler.swift | ||
// | ||
// 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 Common | ||
import Foundation | ||
import PixelKit | ||
|
||
/// This class handles firing the tunnel start attempts. | ||
/// | ||
/// The reason this logic is contained here, is that we were getting flooded by attempt pixels when an unattended system kept failing with | ||
/// on-demand enabled. This class aims to confine these pixels to "sessions" of attempts, so to speak. | ||
/// | ||
final class VPNTunnelStartPixelHandler { | ||
|
||
typealias Event = PacketTunnelProvider.Event | ||
typealias Step = PacketTunnelProvider.TunnelStartAttemptStep | ||
|
||
private static let canFireKey = "VPNTunnelStartPixelHandler.canFire" | ||
private static let lastFireDateKey = "VPNTunnelStartPixelHandler.lastFireDate" | ||
|
||
private let userDefaults: UserDefaults | ||
private let systemBootDate: Date | ||
private let eventHandler: EventMapping<Event> | ||
|
||
init(eventHandler: EventMapping<Event>, | ||
systemBootDate: Date = ProcessInfo.systemBootDate(), | ||
userDefaults: UserDefaults) { | ||
|
||
self.userDefaults = userDefaults | ||
self.systemBootDate = systemBootDate | ||
self.eventHandler = eventHandler | ||
} | ||
|
||
func handle(_ step: Step, onDemand: Bool) { | ||
if shouldResumeFiring(onDemand: onDemand) { | ||
canFire = true | ||
} | ||
|
||
if canFire { | ||
let event = Event.tunnelStartAttempt(step) | ||
eventHandler.fire(event) | ||
} | ||
|
||
switch step { | ||
case .failure where onDemand == true: | ||
// After firing an on-demand start failure, we always silence pixels | ||
canFire = false | ||
case .success: | ||
// A success always restores firing | ||
canFire = true | ||
default: | ||
break | ||
} | ||
} | ||
|
||
private func shouldResumeFiring(onDemand: Bool) -> Bool { | ||
guard onDemand else { | ||
return true | ||
} | ||
|
||
return lastFireDate < systemBootDate | ||
} | ||
|
||
// MARK: - User Defaults stored values | ||
|
||
var canFire: Bool { | ||
get { | ||
userDefaults.value(forKey: Self.canFireKey) as? Bool ?? true | ||
} | ||
|
||
set { | ||
userDefaults.setValue(newValue, forKey: Self.canFireKey) | ||
} | ||
} | ||
|
||
private var lastFireDate: Date { | ||
let interval = userDefaults.value(forKey: Self.lastFireDateKey) as? TimeInterval ?? 0 | ||
return Date(timeIntervalSinceReferenceDate: interval) | ||
} | ||
|
||
private func updateLastFireDate() { | ||
let interval = Date().timeIntervalSinceReferenceDate | ||
userDefaults.setValue(interval, forKey: Self.lastFireDateKey) | ||
} | ||
} |
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.
Just moved this to an init so we can use it from the packet tunnel provider.