restructure file organization
This commit is contained in:
Bob Sun
parent
7effaa841a
commit
910660ede3
19 changed files with 52 additions and 20 deletions
30
pass/Models/PasscodeLockConfiguration.swift
Normal file
30
pass/Models/PasscodeLockConfiguration.swift
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
//
|
||||
// PasscodeLockConfiguration.swift
|
||||
// pass
|
||||
//
|
||||
// Created by Mingshen Sun on 7/2/2017.
|
||||
// Copyright © 2017 Bob Sun. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import PasscodeLock
|
||||
import SwiftyUserDefaults
|
||||
|
||||
struct PasscodeLockConfiguration: PasscodeLockConfigurationType {
|
||||
|
||||
let repository: PasscodeRepositoryType
|
||||
let passcodeLength = 4
|
||||
var isTouchIDAllowed = Defaults[.isTouchIDOn]
|
||||
let shouldRequestTouchIDImmediately = true
|
||||
let maximumInccorectPasscodeAttempts = 3
|
||||
|
||||
init(repository: PasscodeRepositoryType) {
|
||||
|
||||
self.repository = repository
|
||||
}
|
||||
|
||||
init() {
|
||||
|
||||
self.repository = PasscodeLockRepository()
|
||||
}
|
||||
}
|
||||
40
pass/Models/PasscodeLockRepository.swift
Normal file
40
pass/Models/PasscodeLockRepository.swift
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
//
|
||||
// PasscodeRepository.swift
|
||||
// pass
|
||||
//
|
||||
// Created by Mingshen Sun on 7/2/2017.
|
||||
// Copyright © 2017 Bob Sun. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import PasscodeLock
|
||||
import SwiftyUserDefaults
|
||||
|
||||
public class PasscodeLockRepository: PasscodeRepositoryType {
|
||||
private let passcodeKey = "passcode.lock.passcode"
|
||||
|
||||
public var hasPasscode: Bool {
|
||||
|
||||
if passcode != nil {
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
private var passcode: String? {
|
||||
return Defaults[.passcodeKey]
|
||||
}
|
||||
|
||||
public func save(passcode: String) {
|
||||
Defaults[.passcodeKey] = passcode
|
||||
}
|
||||
|
||||
public func check(passcode: String) -> Bool {
|
||||
return self.passcode == passcode
|
||||
}
|
||||
|
||||
public func delete() {
|
||||
Defaults[.passcodeKey] = nil
|
||||
}
|
||||
}
|
||||
74
pass/Models/Password.swift
Normal file
74
pass/Models/Password.swift
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
//
|
||||
// Password.swift
|
||||
// pass
|
||||
//
|
||||
// Created by Mingshen Sun on 2/2/2017.
|
||||
// Copyright © 2017 Bob Sun. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import SwiftyUserDefaults
|
||||
|
||||
struct AdditionField {
|
||||
var title: String
|
||||
var content: String
|
||||
}
|
||||
|
||||
class Password {
|
||||
var name: String
|
||||
var username: String
|
||||
var password: String
|
||||
var additions: [AdditionField]
|
||||
|
||||
init() {
|
||||
name = ""
|
||||
password = ""
|
||||
username = ""
|
||||
additions = []
|
||||
}
|
||||
|
||||
init(name: String, username: String, password: String, additions: [AdditionField]) {
|
||||
self.name = name
|
||||
self.username = username
|
||||
self.password = password
|
||||
self.additions = additions
|
||||
}
|
||||
}
|
||||
|
||||
extension PasswordEntity {
|
||||
func decrypt() throws -> Password? {
|
||||
var password: Password?
|
||||
let encryptedDataPath = URL(fileURLWithPath: "\(Globals.documentPath)/\(rawPath!)")
|
||||
let encryptedData = try Data(contentsOf: encryptedDataPath)
|
||||
let decryptedData = try PasswordStore.shared.pgp.decryptData(encryptedData, passphrase: Defaults[.pgpKeyPassphrase])
|
||||
let plain = String(data: decryptedData, encoding: .ascii) ?? ""
|
||||
var decrypted_password = ""
|
||||
var username = ""
|
||||
var decrypted_addtions = [AdditionField]()
|
||||
var i = 0
|
||||
plain.enumerateLines(invoking: { line, _ in
|
||||
if i == 0 {
|
||||
decrypted_password = line
|
||||
} else {
|
||||
let items = line.characters.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: true).map(String.init)
|
||||
if items.count == 2 && items[0].lowercased() == "username" {
|
||||
username = items[1].trimmingCharacters(in: .whitespaces)
|
||||
} else {
|
||||
var key = ""
|
||||
var value = ""
|
||||
if items.count == 1 {
|
||||
key = "unknown"
|
||||
value = items[0]
|
||||
} else {
|
||||
key = items[0]
|
||||
value = items[1].trimmingCharacters(in: .whitespaces)
|
||||
}
|
||||
decrypted_addtions.append(AdditionField(title: key, content: value))
|
||||
}
|
||||
}
|
||||
i += 1
|
||||
})
|
||||
password = Password(name: name!, username: username, password: decrypted_password, additions: decrypted_addtions)
|
||||
return password
|
||||
}
|
||||
}
|
||||
210
pass/Models/PasswordStore.swift
Normal file
210
pass/Models/PasswordStore.swift
Normal file
|
|
@ -0,0 +1,210 @@
|
|||
//
|
||||
// PasswordStore.swift
|
||||
// pass
|
||||
//
|
||||
// Created by Mingshen Sun on 19/1/2017.
|
||||
// Copyright © 2017 Bob Sun. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Result
|
||||
import CoreData
|
||||
import UIKit
|
||||
import SwiftyUserDefaults
|
||||
import ObjectiveGit
|
||||
|
||||
struct GitCredential {
|
||||
|
||||
enum Credential {
|
||||
case http(userName: String, password: String)
|
||||
case ssh(userName: String, password: String, publicKeyFile: URL, privateKeyFile: URL)
|
||||
}
|
||||
|
||||
var credential: Credential
|
||||
|
||||
func credentialProvider() throws -> GTCredentialProvider {
|
||||
return GTCredentialProvider { (_, _, _) -> (GTCredential) in
|
||||
let credential: GTCredential?
|
||||
switch self.credential {
|
||||
case let .http(userName, password):
|
||||
credential = try? GTCredential(userName: userName, password: password)
|
||||
case let .ssh(userName, password, publicKeyFile, privateKeyFile):
|
||||
credential = try? GTCredential(userName: userName, publicKeyURL: publicKeyFile, privateKeyURL: privateKeyFile, passphrase: password)
|
||||
}
|
||||
return credential ?? GTCredential()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class PasswordStore {
|
||||
static let shared = PasswordStore()
|
||||
|
||||
let storeURL = URL(fileURLWithPath: "\(Globals.documentPath)/password-store")
|
||||
let tempStoreURL = URL(fileURLWithPath: "\(Globals.documentPath)/password-store-temp")
|
||||
var storeRepository: GTRepository?
|
||||
var gitCredential: GitCredential?
|
||||
|
||||
let pgp: ObjectivePGP = ObjectivePGP()
|
||||
|
||||
let context = (UIApplication.shared.delegate as! AppDelegate).persistentContainer.viewContext
|
||||
|
||||
|
||||
private init() {
|
||||
do {
|
||||
if FileManager.default.fileExists(atPath: storeURL.path) {
|
||||
try storeRepository = GTRepository.init(url: storeURL)
|
||||
}
|
||||
} catch {
|
||||
print(error)
|
||||
}
|
||||
if Defaults[.pgpKeyID] != "" {
|
||||
pgp.importKeys(fromFile: Globals.secringPath, allowDuplicates: false)
|
||||
}
|
||||
if Defaults[.gitRepositoryAuthenticationMethod] == "Password" {
|
||||
gitCredential = GitCredential(credential: GitCredential.Credential.http(userName: Defaults[.gitRepositoryUsername], password: Defaults[.gitRepositoryPassword]))
|
||||
} else if Defaults[.gitRepositoryAuthenticationMethod] == "SSH Key"{
|
||||
gitCredential = GitCredential(credential: GitCredential.Credential.ssh(userName: Defaults[.gitRepositoryUsername], password: Defaults[.gitRepositorySSHPrivateKeyPassphrase]!, publicKeyFile: Globals.sshPublicKeyURL, privateKeyFile: Globals.sshPrivateKeyURL))
|
||||
} else {
|
||||
gitCredential = nil
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func initPGP(pgpKeyURL: URL, pgpKeyLocalPath: String) throws {
|
||||
let pgpData = try Data(contentsOf: pgpKeyURL)
|
||||
try pgpData.write(to: URL(fileURLWithPath: pgpKeyLocalPath), options: .atomic)
|
||||
pgp.importKeys(fromFile: pgpKeyLocalPath, allowDuplicates: false)
|
||||
let key = pgp.keys[0]
|
||||
Defaults[.pgpKeyID] = key.keyID!.shortKeyString
|
||||
if let gpgUser = key.users[0] as? PGPUser {
|
||||
Defaults[.pgpKeyUserID] = gpgUser.userID
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
func cloneRepository(remoteRepoURL: URL,
|
||||
credential: GitCredential,
|
||||
transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void,
|
||||
checkoutProgressBlock: @escaping (String?, UInt, UInt) -> Void) throws {
|
||||
let credentialProvider = try credential.credentialProvider()
|
||||
let options: [String: Any] = [
|
||||
GTRepositoryCloneOptionsCredentialProvider: credentialProvider,
|
||||
]
|
||||
storeRepository = try GTRepository.clone(from: remoteRepoURL, toWorkingDirectory: tempStoreURL, options: options, transferProgressBlock:transferProgressBlock, checkoutProgressBlock: checkoutProgressBlock)
|
||||
let fm = FileManager.default
|
||||
do {
|
||||
if fm.fileExists(atPath: storeURL.path) {
|
||||
try fm.removeItem(at: storeURL)
|
||||
}
|
||||
try fm.copyItem(at: tempStoreURL, to: storeURL)
|
||||
try fm.removeItem(at: tempStoreURL)
|
||||
} catch {
|
||||
print(error)
|
||||
}
|
||||
storeRepository = try GTRepository(url: storeURL)
|
||||
updatePasswordEntityCoreData()
|
||||
gitCredential = credential
|
||||
}
|
||||
|
||||
func pullRepository(transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void) throws {
|
||||
let credentialProvider = try gitCredential!.credentialProvider()
|
||||
let options: [String: Any] = [
|
||||
GTRepositoryRemoteOptionsCredentialProvider: credentialProvider
|
||||
]
|
||||
let remote = try GTRemote(name: "origin", in: storeRepository!)
|
||||
try storeRepository?.pull((storeRepository?.currentBranch())!, from: remote, withOptions: options, progress: transferProgressBlock)
|
||||
updatePasswordEntityCoreData()
|
||||
}
|
||||
|
||||
func updatePasswordEntityCoreData() {
|
||||
deleteCoreData(entityName: "PasswordEntity")
|
||||
deleteCoreData(entityName: "PasswordCategoryEntity")
|
||||
|
||||
let fm = FileManager.default
|
||||
fm.enumerator(atPath: storeURL.path)?.forEach({ (e) in
|
||||
if let e = e as? String, let url = URL(string: e) {
|
||||
if url.pathExtension == "gpg" {
|
||||
let passwordEntity = PasswordEntity(context: context)
|
||||
let endIndex = url.lastPathComponent.index(url.lastPathComponent.endIndex, offsetBy: -4)
|
||||
passwordEntity.name = url.lastPathComponent.substring(to: endIndex)
|
||||
passwordEntity.rawPath = "password-store/\(url.path)"
|
||||
let items = url.path.characters.split(separator: "/").map(String.init)
|
||||
for i in 0 ..< items.count - 1 {
|
||||
let passwordCategoryEntity = PasswordCategoryEntity(context: context)
|
||||
passwordCategoryEntity.category = items[i]
|
||||
passwordCategoryEntity.level = Int16(i)
|
||||
passwordCategoryEntity.password = passwordEntity
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
do {
|
||||
try context.save()
|
||||
} catch {
|
||||
print("Error with save: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
func fetchPasswordEntityCoreData() -> [PasswordEntity] {
|
||||
let passwordEntityFetch = NSFetchRequest<NSFetchRequestResult>(entityName: "PasswordEntity")
|
||||
do {
|
||||
let fetchedPasswordEntities = try context.fetch(passwordEntityFetch) as! [PasswordEntity]
|
||||
return fetchedPasswordEntities.sorted(by: { (p1, p2) -> Bool in
|
||||
return p1.name! < p2.name!;
|
||||
})
|
||||
} catch {
|
||||
fatalError("Failed to fetch employees: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
func fetchPasswordCategoryEntityCoreData(password: PasswordEntity) -> [PasswordCategoryEntity] {
|
||||
let passwordCategoryEntityFetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "PasswordCategoryEntity")
|
||||
passwordCategoryEntityFetchRequest.predicate = NSPredicate(format: "password = %@", password)
|
||||
passwordCategoryEntityFetchRequest.sortDescriptors = [NSSortDescriptor(key: "level", ascending: true)]
|
||||
do {
|
||||
let passwordCategoryEntities = try context.fetch(passwordCategoryEntityFetchRequest) as! [PasswordCategoryEntity]
|
||||
return passwordCategoryEntities
|
||||
} catch {
|
||||
fatalError("Failed to fetch employees: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
func updateRemoteRepo() {
|
||||
}
|
||||
|
||||
func deleteCoreData(entityName: String) {
|
||||
let deleteFetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: entityName)
|
||||
let deleteRequest = NSBatchDeleteRequest(fetchRequest: deleteFetchRequest)
|
||||
|
||||
do {
|
||||
try context.execute(deleteRequest)
|
||||
} catch let error as NSError {
|
||||
print(error)
|
||||
}
|
||||
}
|
||||
|
||||
func erase() {
|
||||
Utils.removeFileIfExists(at: storeURL)
|
||||
Utils.removeFileIfExists(atPath: Globals.secringPath)
|
||||
Utils.removeFileIfExists(at: Globals.sshPrivateKeyURL)
|
||||
Utils.removeFileIfExists(at: Globals.sshPublicKeyURL)
|
||||
|
||||
deleteCoreData(entityName: "PasswordEntity")
|
||||
deleteCoreData(entityName: "PasswordCategoryEntity")
|
||||
|
||||
Defaults.remove(.pgpKeyURL)
|
||||
|
||||
Defaults.remove(.pgpKeyPassphrase)
|
||||
Defaults.remove(.pgpKeyID)
|
||||
Defaults.remove(.pgpKeyUserID)
|
||||
|
||||
Defaults.remove(.gitRepositoryURL)
|
||||
Defaults.remove(.gitRepositoryAuthenticationMethod)
|
||||
Defaults.remove(.gitRepositoryUsername)
|
||||
Defaults.remove(.gitRepositoryPassword)
|
||||
Defaults.remove(.gitRepositorySSHPublicKeyURL)
|
||||
Defaults.remove(.gitRepositorySSHPrivateKeyURL)
|
||||
Defaults.remove(.gitRepositorySSHPrivateKeyPassphrase)
|
||||
Defaults.remove(.lastUpdatedTime)
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue