lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Fix a bug about TOTP refresh

Browse source
This commit is contained in:
Yishi Lin 2017-03-07 09:50:18 +08:00
parent af1ea3ee3e
commit 3cf88dcbc8
2 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pass/Controllers/PasswordDetailTableViewController.swift
View file

@ -170,20 +170,16 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
return
}
switch token.generator.factor {
case .counter:
// htop
break
case .timer(let period):
case .timer:
// totp
let timeSinceEpoch = Date().timeIntervalSince1970
let validTime = Int(period - timeSinceEpoch.truncatingRemainder(dividingBy: period))
strongSelf.tableData[indexPath.section].item[indexPath.row].title = "time-based (expiring in \(validTime)s)"
cell.cellData?.title = "time-based (valid within \(validTime)s)"
if validTime <= 1 || validTime >= Int(period - 1) {
let otp = token.currentPassword ?? "error"
if let (title, otp) = strongSelf.password?.getOtpStrings() {
strongSelf.tableData[indexPath.section].item[indexPath.row].title = title
strongSelf.tableData[indexPath.section].item[indexPath.row].content = otp
cell.cellData?.title = title
cell.cellData?.content = otp
}
default:
break
}
}
}

20
pass/Models/Password.swift
View file

@ -239,4 +239,24 @@ class Password {
}
self.updatePassword(name: self.name, plainText: lines.joined(separator: "\n"))
}
// return the description and the password strings
func getOtpStrings() -> (description: String, otp: String)? {
guard let token = self.otpToken else {
return nil
}
var description : String
switch token.generator.factor {
case .counter:
// htop
description = "HMAC-based"
case .timer(let period):
// totp
let timeSinceEpoch = Date().timeIntervalSince1970
let validTime = Int(period - timeSinceEpoch.truncatingRemainder(dividingBy: period))
description = "time-based (expiring in \(validTime)s)"
}
let otp = self.otpToken?.currentPassword ?? "error"
return (description, otp)
}
}