Skip to content

Ability to store a password in MD5 or so #6

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Ability to store a password in MD5 or so #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ab8401
support swift3
kmeinh Feb 24, 2017
03645a2
Merge branch 'swift3'
x128 Mar 30, 2017
6236b19
Swift 3.1
x128 Mar 30, 2017
02f7bf5
Safely check passcode without need to store it in plaintext
x128 Mar 30, 2017
fcb202a
Swift 4
x128 Oct 4, 2017
d05c162
Swift 4.2
x128 Nov 23, 2018
2bb8aeb
Swift 5
x128 Apr 24, 2019
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
21 changes: 15 additions & 6 deletions PasscodeLock.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,23 +456,26 @@
TargetAttributes = {
C99EAF3E1B90B05700D61E1B = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0800;
LastSwiftMigration = 0820;
};
C99EAF481B90B05700D61E1B = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0820;
};
C9D3DF0F1B91AD11008561EB = {
CreatedOnToolsVersion = 7.0;
DevelopmentTeam = JZ2H644EU7;
LastSwiftMigration = 0800;
LastSwiftMigration = 0820;
ProvisioningStyle = Manual;
};
C9D3DF221B91AD11008561EB = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0820;
TestTargetID = C9D3DF0F1B91AD11008561EB;
};
C9D3DF2D1B91AD12008561EB = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0820;
TestTargetID = C9D3DF0F1B91AD11008561EB;
};
};
Expand Down Expand Up @@ -786,7 +789,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 2.3;
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -805,7 +808,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.yankodimitrov.PasscodeLock;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -819,6 +822,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "PasscodeLockTests/PasscodeLockTests-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -831,6 +835,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.yankodimitrov.PasscodeLockTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "PasscodeLockTests/PasscodeLockTests-Bridging-Header.h";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -848,7 +853,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "c4ef3957-2c3b-4abf-b8dd-d5d2c5712664";
PROVISIONING_PROFILE_SPECIFIER = "XC Ad Hoc: *";
SWIFT_VERSION = 2.3;
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -864,7 +869,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yankodimitrov.PasscodeLockDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand All @@ -878,6 +883,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yankodimitrov.PasscodeLockDemoTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PasscodeLockDemo.app/PasscodeLockDemo";
};
name = Debug;
Expand All @@ -891,6 +897,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yankodimitrov.PasscodeLockDemoTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PasscodeLockDemo.app/PasscodeLockDemo";
};
name = Release;
Expand All @@ -903,6 +910,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yankodimitrov.PasscodeLockDemoUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_TARGET_NAME = PasscodeLockDemo;
USES_XCTRUNNER = YES;
};
Expand All @@ -916,6 +924,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yankodimitrov.PasscodeLockDemoUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_TARGET_NAME = PasscodeLockDemo;
USES_XCTRUNNER = YES;
};
Expand Down
12 changes: 6 additions & 6 deletions PasscodeLock/Functions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
// Copyright © 2015 Yanko Dimitrov. All rights reserved.
//

import Foundation
import UIKit

func localizedStringFor(key: String, comment: String) -> String {
func localizedStringFor(_ key: String, comment: String) -> String {

let name = "Localize"
let bundle = bundleForResource(name, ofType: "strings")

return NSLocalizedString(key, tableName: name, bundle: bundle, comment: comment)
}

func bundleForResource(name: String, ofType type: String) -> NSBundle {
func bundleForResource(_ name: String, ofType type: String) -> Bundle {

if(NSBundle.mainBundle().pathForResource(name, ofType: type) != nil) {
return NSBundle.mainBundle()
if(Bundle.main.path(forResource: name, ofType: type) != nil) {
return Bundle.main
}

return NSBundle(forClass: PasscodeLock.self)
return Bundle(for: PasscodeLock.self)
}

func defaultCustomColor() -> UIColor {
Expand Down
12 changes: 4 additions & 8 deletions PasscodeLock/PasscodeLock/ChangePasscodeState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2015 Yanko Dimitrov. All rights reserved.
//

import Foundation
import UIKit

struct ChangePasscodeState: PasscodeLockStateType {

Expand All @@ -24,16 +24,12 @@ struct ChangePasscodeState: PasscodeLockStateType {
self.title = (stringsToShow?.passcodeLockChangeTitle ?? localizedStringFor("PasscodeLockChangeTitle", comment: "Change passcode title"))
self.description = (stringsToShow?.passcodeLockChangeDescription ?? localizedStringFor("PasscodeLockChangeDescription", comment: "Change passcode description"))
self.tintColor = (tintColor ?? defaultColor)
self.font = (font ?? UIFont.systemFontOfSize(16))
self.font = (font ?? UIFont.systemFont(ofSize: 16))
}

func acceptPasscode(passcode: [String], fromLock lock: PasscodeLockType, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {
func acceptPasscode(_ passcode: [String], fromLock lock: PasscodeLockType, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {

guard let currentPasscode = lock.repository.passcode else {
return
}

if (passcode == currentPasscode) {
if lock.repository.isPasscodeCorrect(passcode) {
let nextState = SetPasscodeState(stringsToShow: stringsToShow, tintColor: tintColor, font: font)
lock.changeStateTo(nextState)

Expand Down
8 changes: 4 additions & 4 deletions PasscodeLock/PasscodeLock/ConfirmPasscodeState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2015 Yanko Dimitrov. All rights reserved.
//

import Foundation
import UIKit

struct ConfirmPasscodeState: PasscodeLockStateType {

Expand All @@ -17,7 +17,7 @@ struct ConfirmPasscodeState: PasscodeLockStateType {
var tintColor : UIColor?
var font : UIFont?

private var passcodeToConfirm: [String]
fileprivate var passcodeToConfirm: [String]

init(passcode: [String], stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {

Expand All @@ -26,10 +26,10 @@ struct ConfirmPasscodeState: PasscodeLockStateType {
self.title = (stringsToShow?.passcodeLockConfirmTitle ?? localizedStringFor("PasscodeLockConfirmTitle", comment: "Confirm passcode title"))
self.description = (stringsToShow?.passcodeLockConfirmDescription ?? localizedStringFor("PasscodeLockConfirmDescription", comment: "Confirm passcode description"))
self.tintColor = (tintColor ?? defaultColor)
self.font = (font ?? UIFont.systemFontOfSize(16))
self.font = (font ?? UIFont.systemFont(ofSize: 16))
}

func acceptPasscode(passcode: [String], fromLock lock: PasscodeLockType, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {
func acceptPasscode(_ passcode: [String], fromLock lock: PasscodeLockType, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {

if (passcode == passcodeToConfirm) {
lock.repository.savePasscode(passcode)
Expand Down
22 changes: 9 additions & 13 deletions PasscodeLock/PasscodeLock/EnterPasscodeState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2015 Yanko Dimitrov. All rights reserved.
//

import Foundation
import UIKit

public let PasscodeLockIncorrectPasscodeNotification = "passcode.lock.incorrect.passcode.notification"

Expand All @@ -19,8 +19,8 @@ struct EnterPasscodeState: PasscodeLockStateType {
var tintColor : UIColor?
var font : UIFont?

private var inccorectPasscodeAttempts = 0
private var isNotificationSent = false
fileprivate var inccorectPasscodeAttempts = 0
fileprivate var isNotificationSent = false

init(allowCancellation: Bool = false, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {

Expand All @@ -29,16 +29,12 @@ struct EnterPasscodeState: PasscodeLockStateType {
self.title = (stringsToShow?.passcodeLockEnterTitle ?? localizedStringFor("PasscodeLockEnterTitle", comment: "Enter passcode title"))
self.description = (stringsToShow?.passcodeLockEnterDescription ?? localizedStringFor("PasscodeLockEnterDescription", comment: "Enter passcode description"))
self.tintColor = (tintColor ?? defaultColor)
self.font = (font ?? UIFont.systemFontOfSize(16))
self.font = (font ?? UIFont.systemFont(ofSize: 16))
}

mutating func acceptPasscode(passcode: [String], fromLock lock: PasscodeLockType, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {
mutating func acceptPasscode(_ passcode: [String], fromLock lock: PasscodeLockType, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {

guard let currentPasscode = lock.repository.passcode else {
return
}

if (passcode == currentPasscode) {
if lock.repository.isPasscodeCorrect(passcode) {
lock.delegate?.passcodeLockDidSucceed(lock)

} else {
Expand All @@ -52,12 +48,12 @@ struct EnterPasscodeState: PasscodeLockStateType {
}
}

private mutating func postNotification() {
fileprivate mutating func postNotification() {

guard !isNotificationSent else { return }

let center = NSNotificationCenter.defaultCenter()
center.postNotificationName(PasscodeLockIncorrectPasscodeNotification, object: nil)
let center = NotificationCenter.default
center.post(name: Notification.Name(rawValue: PasscodeLockIncorrectPasscodeNotification), object: nil)
self.isNotificationSent = true
}
}
45 changes: 23 additions & 22 deletions PasscodeLock/PasscodeLock/PasscodeLock.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@
// Copyright © 2015 Yanko Dimitrov. All rights reserved.
//

import Foundation
import UIKit
import LocalAuthentication

public class PasscodeLock: PasscodeLockType {
open class PasscodeLock: PasscodeLockType {

public weak var delegate: PasscodeLockTypeDelegate?
open weak var delegate: PasscodeLockTypeDelegate?
public let configuration: PasscodeLockConfigurationType

public var repository: PasscodeRepositoryType {
open var repository: PasscodeRepositoryType {
return configuration.repository
}

public var state: PasscodeLockStateType {
open var state: PasscodeLockStateType {
return lockState
}

public var isTouchIDAllowed: Bool {
open var isTouchIDAllowed: Bool {
return isTouchIDEnabled() && configuration.isTouchIDAllowed && lockState.isTouchIDAllowed
}

public var isPincodeEmpty: Bool {
open var isPincodeEmpty: Bool {
return passcode.isEmpty
}

private var lockState: PasscodeLockStateType
private lazy var passcode = [String]()
fileprivate var lockState: PasscodeLockStateType
fileprivate lazy var passcode = [String]()

public init(state: PasscodeLockStateType, configuration: PasscodeLockConfigurationType) {

Expand All @@ -41,33 +41,34 @@ public class PasscodeLock: PasscodeLockType {
self.configuration = configuration
}

public func addSign(sign: String, stringsToBeDisplayed: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {
open func addSign(_ sign: String, stringsToBeDisplayed: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {

passcode.append(sign)
delegate?.passcodeLock(self, addedSignAtIndex: passcode.count - 1)

if (passcode.count >= configuration.passcodeLength) {

self.lockState.acceptPasscode(self.passcode, fromLock: self, stringsToShow: stringsToBeDisplayed, tintColor: tintColor, font: font)
self.passcode.removeAll(keepCapacity: true)
self.passcode.removeAll(keepingCapacity: true)
}
}

public func removeSign() {
open func removeSign() {

guard passcode.count > 0 else { return }

passcode.removeLast()
delegate?.passcodeLock(self, removedSignAtIndex: passcode.count)
}

public func changeStateTo(state: PasscodeLockStateType) {

lockState = state
delegate?.passcodeLockDidChangeState(self)
open func changeStateTo(_ state: PasscodeLockStateType) {
DispatchQueue.main.async {
self.lockState = state
self.delegate?.passcodeLockDidChangeState(self)
}
}

public func authenticateWithBiometrics(stringsToShow: StringsToBeDisplayed?) {
open func authenticateWithBiometrics(_ stringsToShow: StringsToBeDisplayed?) {

guard isTouchIDAllowed else { return }

Expand All @@ -76,16 +77,16 @@ public class PasscodeLock: PasscodeLockType {

context.localizedFallbackTitle = (stringsToShow?.passcodeLockTouchIDButton ?? localizedStringFor("PasscodeLockTouchIDButton", comment: "TouchID authentication fallback button"))

context.evaluatePolicy(.DeviceOwnerAuthenticationWithBiometrics, localizedReason: reason) {
context.evaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, localizedReason: reason) {
success, error in

self.handleTouchIDResult(success)
}
}

private func handleTouchIDResult(success: Bool) {
fileprivate func handleTouchIDResult(_ success: Bool) {

dispatch_async(dispatch_get_main_queue()) {
DispatchQueue.main.async {

if success {

Expand All @@ -94,10 +95,10 @@ public class PasscodeLock: PasscodeLockType {
}
}

private func isTouchIDEnabled() -> Bool {
fileprivate func isTouchIDEnabled() -> Bool {

let context = LAContext()

return context.canEvaluatePolicy(.DeviceOwnerAuthenticationWithBiometrics, error: nil)
return context.canEvaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, error: nil)
}
}
Loading