Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[fix/bypass-lock-prevention] Bypass Passcode Prevention #1324

Closed
wants to merge 6 commits into from
Closed

[fix/bypass-lock-prevention] Bypass Passcode Prevention #1324

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a3f1c16
Prevent the user from changing the device time to bypass the lock pre…
hosy Feb 19, 2024
5bf4d2a
changed privacy reason and removed unneeded key/value pairs
hosy Feb 20, 2024
4e37782
maybe keys are needed
hosy Feb 20, 2024
853e803
fixed code review findings
hosy Mar 5, 2024
b21c0b6
Converted lockUntilDate to lockDelay. This is a better prevention if …
hosy Mar 15, 2024
5840f4d
converted code to significant time change notification
hosy Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 28 additions & 19 deletions ownCloudAppShared/AppLock/AppLockManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,16 @@ public class AppLockManager: NSObject {
self.userDefaults.set(newValue, forKey: "applock-failed-passcode-attempts")
}
}
private var lockedUntilDate: Date? {

private var lockDelay: Double? {
get {
return userDefaults.object(forKey: "applock-locked-until-date") as? Date
return userDefaults.object(forKey: "applock-delay") as? Double
}
set(newValue) {
self.userDefaults.set(newValue, forKey: "applock-locked-until-date")
self.userDefaults.set(newValue, forKey: "applock-delay")
}
}

private var biometricalAuthenticationSucceeded: Bool {
get {
return userDefaults.bool(forKey: "applock-biometrical-authentication-succeeded")
Expand Down Expand Up @@ -361,6 +363,8 @@ public class AppLockManager: NSObject {
if testPasscode == self.passcode {
unlocked = true
failedPasscodeAttempts = 0
lockDelay = nil

dismissLockscreen(animated: true)
} else {
unlocked = false
Expand All @@ -371,8 +375,7 @@ public class AppLockManager: NSObject {

if self.failedPasscodeAttempts >= self.maximumPasscodeAttempts {
let delayUntilNextAttempt = pow(powBaseDelay, Double(failedPasscodeAttempts))

lockedUntilDate = Date().addingTimeInterval(delayUntilNextAttempt)
lockDelay = delayUntilNextAttempt
startLockCountdown()
}

Expand All @@ -381,6 +384,7 @@ public class AppLockManager: NSObject {
}

// MARK: - Status

private var shouldDisplayLockscreen: Bool {
if !AppLockSettings.shared.lockEnabled {
return false
Expand Down Expand Up @@ -417,8 +421,8 @@ public class AppLockManager: NSObject {
}

private var shouldDisplayCountdown : Bool {
if let startLockBeforeDate = self.lockedUntilDate {
return startLockBeforeDate > Date()
if let lockDelay = self.lockDelay, lockDelay > 0 {
return true
}

return false
Expand All @@ -432,32 +436,37 @@ public class AppLockManager: NSObject {
passcodeViewController.view.setNeedsLayout()
}
updateLockCountdown()

lockTimer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(self.updateLockCountdown), userInfo: nil, repeats: true)

if lockTimer == nil {
lockTimer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(self.updateLockCountdown), userInfo: nil, repeats: true)
}
}
}

@objc private func updateLockCountdown() {
if let date = self.lockedUntilDate {
let interval = Int(date.timeIntervalSinceNow)
let seconds = interval % 60
let minutes = (interval / 60) % 60
let hours = (interval / 3600)

if let lockDelay = self.lockDelay {
let hours = Int(lockDelay) / 3600
let minutes = Int(lockDelay) / 60 % 60
let seconds = Int(lockDelay) % 60

if lockDelay > 0 {
self.lockDelay = (lockDelay - 1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Counting down the lock delay with a timer has several issues:

  • the app needs to stay in the foreground for the entire duration of the countdown
  • additional instances of AppLockManager running in different processes (possibly even scenes) also reduce the lock delay every second, so that if the lock screen is shown in the app, in the Share Extension and the File Provider UI at the same time, it would run a 3x speed

}

let dateFormatted:String?
if hours > 0 {
dateFormatted = String(format: "%02d:%02d:%02d", hours, minutes, seconds)
} else {
dateFormatted = String(format: "%02d:%02d", minutes, seconds)
}

let timeoutMessage:String = NSString(format: "Please try again in %@".localized as NSString, dateFormatted!) as String

performPasscodeViewControllerUpdates { (passcodeViewController) in
passcodeViewController.timeoutMessage = timeoutMessage
}

if date <= Date() {
if lockDelay <= 0 {
// Time elapsed, allow entering passcode again
self.lockTimer?.invalidate()
performPasscodeViewControllerUpdates { (passcodeViewController) in
Expand Down
Loading