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

Fix bugs about getting next HOTP

Browse source 
- correctly increase the otpauth counter now
- fix bugs about re-initializing password
This commit is contained in:
Yishi Lin 2017-04-09 02:54:05 +08:00
parent c769c4126b
commit 4eba8f7800
2 changed files with 37 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pass/Controllers/PasswordDetailTableViewController.swift
View file

@ -386,11 +386,8 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
return;
}
// increase HOTP counter
password!.increaseHotpCounter()
// copy HOTP to pasteboard
if let plainPassword = password!.getOtp() {
// copy HOTP to pasteboard (will update counter)
if let plainPassword = password!.getNextHotp() {
Utils.copyToPasteboard(textToCopy: plainPassword)
}

55
pass/Models/Password.swift
View file

@ -61,21 +61,20 @@ class Password {
private func initEverything(name: String, plainText: String) {
self.name = name
self.plainText = plainText
self.additions.removeAll()
self.additionKeys.removeAll()
// get password and additional fields
let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) {
$0 == "\n" || $0 == "\r\n"
}.map(String.init)
guard plainTextSplit.count > 0 else {
return;
}
self.password = plainTextSplit[0]
self.password = plainTextSplit.first ?? ""
if plainTextSplit.count == 2 {
(self.additions, self.additionKeys) = Password.getAdditionFields(from: plainTextSplit[1])
}
// check whether the first line of the plainText looks like an otp entry
let (key, value) = Password.getKeyValuePair(from: plainTextSplit[0])
let (key, value) = Password.getKeyValuePair(from: self.password)
if Password.otpKeywords.contains(key ?? "") {
firstLineIsOTPField = true
self.additions[key!] = value
@ -269,21 +268,6 @@ class Password {
}
}
// it is guaranteed that it is a HOTP password when we call this
func increaseHotpCounter() {
var lines : [String] = []
self.plainText.enumerateLines() { line, _ in
let (key, value) = Password.getKeyValuePair(from: line)
if key == "otp_counter", let newValue = UInt64(value)?.advanced(by: 1) {
let newLine = "\(key!): \(newValue)"
lines.append(newLine)
} else {
lines.append(line)
}
}
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 {
@ -313,6 +297,37 @@ class Password {
}
}
// return the password strings
// it is guaranteed that it is a HOTP password when we call this
func getNextHotp() -> String? {
// increase the counter
otpToken = otpToken?.updatedToken()
// replace old HOTP settings with the new otpauth
var newOtpauth = try! otpToken?.toURL().absoluteString
newOtpauth?.append("&secret=")
newOtpauth?.append(MF_Base32Codec.base32String(from: otpToken?.generator.secret))
var lines : [String] = []
self.plainText.enumerateLines() { line, _ in
let (key, _) = Password.getKeyValuePair(from: line)
if !Password.otpKeywords.contains(key ?? "") {
lines.append(line)
} else if key == "otpauth" && newOtpauth != nil {
lines.append(newOtpauth!)
// set to nil to prevent duplication
newOtpauth = nil
}
}
if newOtpauth != nil {
lines.append(newOtpauth!)
}
self.updatePassword(name: self.name, plainText: lines.joined(separator: "\n"))
// get and return the password
return self.otpToken?.currentPassword
}
static func LooksLikeOTP(line: String) -> Bool {
let (key, _) = getKeyValuePair(from: line)
return Password.otpKeywords.contains(key ?? "")