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

support edit password

Browse source
This commit is contained in:
Bob Sun 2017-02-13 01:15:42 +08:00
parent 41d45bfbf9
commit b2ee8c429f
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
14 changed files with 459 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

97
pass/Models/Password.swift
View file

@ -19,43 +19,34 @@ class Password {
var password = ""
var additions = [String: String]()
var additionKeys = [String]()
var plainText = ""
var changed = false
convenience init(name: String, plainText: String) {
var i = 0
var additionFieldsArray = [AdditionField]()
var password = ""
var unkownIndex = 0
plainText.enumerateLines() { line, _ in
if i == 0 {
password = line
} else {
let items = line.characters.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: true).map(String.init)
var key = ""
var value = ""
if items.count == 1 {
unkownIndex += 1
key = "unkown \(unkownIndex)"
value = items[0]
} else {
key = items[0]
value = items[1].trimmingCharacters(in: .whitespaces)
}
additionFieldsArray.append(AdditionField(title: key, content: value))
}
i += 1
}
self.init(name: name, password: password, additionsArray: additionFieldsArray)
}
init(name: String, password: String, additionsArray: [AdditionField]) {
init(name: String, plainText: String) {
let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) {
$0 == "\n" || $0 == "\r\n"
}.map(String.init)
let password = plainTextSplit[0]
let additionFieldsArray = Password.getAdditionFields(from: plainTextSplit[1])
// self.init(name: name, password: password, additionsArray: additionFieldsArray)
self.name = name
self.password = password
for additionField in additionsArray {
self.plainText = plainText
for additionField in additionFieldsArray {
self.additions[additionField.title] = additionField.content
self.additionKeys.append(additionField.title)
}
}
// private convenience init(name: String, password: String, additionsArray: [AdditionField]) {
// self.name = name
// self.password = password
// for additionField in additionsArray {
// self.additions[additionField.title] = additionField.content
// self.additionKeys.append(additionField.title)
// }
// }
func getUsername() -> String? {
return getAdditionValue(withKey: "Username") ?? getAdditionValue(withKey: "username")
}
@ -64,9 +55,53 @@ class Password {
return getAdditionValue(withKey: "URL") ?? getAdditionValue(withKey: "url") ?? getAdditionValue(withKey: "Url")
}
func getPlainText() -> String {
static func getAdditionFields(from additionFieldsPlainText: String) -> [AdditionField]{
var additionFieldsArray = [AdditionField]()
var unkownIndex = 0
additionFieldsPlainText.enumerateLines() { line, _ in
let items = line.characters.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: true).map(String.init)
var key = ""
var value = ""
if items.count == 1 {
unkownIndex += 1
key = "unkown \(unkownIndex)"
value = items[0]
} else {
key = items[0]
value = items[1].trimmingCharacters(in: .whitespaces)
}
additionFieldsArray.append(AdditionField(title: key, content: value))
}
return additionFieldsArray
}
func updatePassword(name: String, plainText: String) {
self.name = name
if self.plainText != plainText {
let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) {
$0 == "\n" || $0 == "\r\n"
}.map(String.init)
let password = plainTextSplit[0]
let additionFieldsArray = Password.getAdditionFields(from: plainTextSplit[1])
self.password = password
self.additions = [String: String]()
self.additionKeys = []
for additionField in additionFieldsArray {
self.additions[additionField.title] = additionField.content
self.additionKeys.append(additionField.title)
}
changed = true
}
}
func getAdditionsPlainText() -> String {
let plainAdditionsText = self.additionKeys.map { "\($0): \(self.additions[$0]!)" }.joined(separator: "\n")
return "\(self.password)\n\(plainAdditionsText)"
return plainAdditionsText
}
func getPlainText() -> String {
return "\(self.password)\n\(getAdditionsPlainText())"
}
func getPlainData() -> Data {

1
pass/Models/PasswordEntity.swift
View file

@ -22,7 +22,6 @@ extension PasswordEntity {
func encrypt(password: Password) throws -> Data {
name = password.name
rawPath = ""
let plainData = password.getPlainData()
let pgp = PasswordStore.shared.pgp
let encryptedData = try pgp.encryptData(plainData, usingPublicKey: pgp.getKeysOf(.public)[0], armored: false)

64
pass/Models/PasswordStore.swift
View file

@ -124,7 +124,7 @@ class PasswordStore {
]
let remote = try GTRemote(name: "origin", in: storeRepository!)
try storeRepository?.pull((storeRepository?.currentBranch())!, from: remote, withOptions: options, progress: transferProgressBlock)
updatePasswordEntityCoreData()
// updatePasswordEntityCoreData()
}
func updatePasswordEntityCoreData() {
@ -214,7 +214,8 @@ class PasswordStore {
func updateRemoteRepo() {
}
func createCommitInRepository(message: String, fileData: Data, filename: String, progressBlock: (_ progress: Float) -> Void) -> GTCommit? {
func addEntryToGTTree(fileData: Data, filename: String) -> GTTree {
do {
let head = try storeRepository!.headReference()
let branch = GTBranch(reference: head, repository: storeRepository!)
@ -224,6 +225,50 @@ class PasswordStore {
try treeBulider.addEntry(with: fileData, fileName: filename, fileMode: GTFileMode.blob)
let newTree = try treeBulider.writeTree()
return newTree
} catch {
fatalError("Failed to add entries to GTTree: \(error)")
}
}
func removeEntryFromGTTree(filename: String) -> GTTree {
do {
let head = try storeRepository!.headReference()
let branch = GTBranch(reference: head, repository: storeRepository!)
let headCommit = try branch?.targetCommit()
let treeBulider = try GTTreeBuilder(tree: headCommit?.tree, repository: storeRepository!)
try treeBulider.removeEntry(withFileName: filename)
let newTree = try treeBulider.writeTree()
return newTree
} catch {
fatalError("Failed to remove entries to GTTree: \(error)")
}
}
func createAddCommitInRepository(message: String, fileData: Data, filename: String, progressBlock: (_ progress: Float) -> Void) -> GTCommit? {
do {
let newTree = addEntryToGTTree(fileData: fileData, filename: filename)
let headReference = try storeRepository!.headReference()
let commitEnum = try GTEnumerator(repository: storeRepository!)
try commitEnum.pushSHA(headReference.targetOID.sha)
let parent = commitEnum.nextObject() as! GTCommit
progressBlock(0.5)
let commit = try storeRepository!.createCommit(with: newTree, message: message, parents: [parent], updatingReferenceNamed: headReference.name)
progressBlock(0.7)
return commit
} catch {
print(error)
}
return nil
}
func createRemoveCommitInRepository(message: String, filename: String, progressBlock: (_ progress: Float) -> Void) -> GTCommit? {
do {
let newTree = removeEntryFromGTTree(filename: filename)
let headReference = try storeRepository!.headReference()
let commitEnum = try GTEnumerator(repository: storeRepository!)
try commitEnum.pushSHA(headReference.targetOID.sha)
@ -272,13 +317,26 @@ class PasswordStore {
passwordEntity.synced = false
try context.save()
print(saveURL.path)
let _ = createCommitInRepository(message: "Add new password by pass for iOS", fileData: encryptedData, filename: saveURL.lastPathComponent, progressBlock: progressBlock)
let _ = createAddCommitInRepository(message: "Add new password by pass for iOS", fileData: encryptedData, filename: saveURL.lastPathComponent, progressBlock: progressBlock)
progressBlock(1.0)
} catch {
print(error)
}
}
func update(passwordEntity: PasswordEntity, password: Password, progressBlock: (_ progress: Float) -> Void) {
do {
let encryptedData = try passwordEntity.encrypt(password: password)
let saveURL = storeURL.appendingPathComponent(passwordEntity.rawPath!)
try encryptedData.write(to: saveURL)
passwordEntity.synced = false
let _ = createAddCommitInRepository(message: "Update password by pass for iOS", fileData: encryptedData, filename: saveURL.lastPathComponent, progressBlock: progressBlock)
try context.save()
} catch {
fatalError("Failed to fetch employees: \(error)")
}
}
func deleteCoreData(entityName: String) {
let deleteFetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: entityName)
let deleteRequest = NSBatchDeleteRequest(fetchRequest: deleteFetchRequest)