Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions .github/workflows/swiftfmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ jobs:
with:
show-progress: false

# Re-enable in follow-up PR that does the formatting.
# - name: Check formating
# run: swiftformat --lint . --reporter github-actions-log
- name: Check formating
run: swiftformat --lint . --reporter github-actions-log
44 changes: 21 additions & 23 deletions ios/NebulaNetworkExtension/Keychain.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@ let groupName = "group.net.defined.mobileNebula"
class KeyChain {
class func save(key: String, data: Data, managed: Bool) -> Bool {
var query: [String: Any] = [
kSecClass as String : kSecClassGenericPassword as String,
kSecAttrAccount as String : key,
kSecValueData as String : data,
kSecClass as String: kSecClassGenericPassword as String,
kSecAttrAccount as String: key,
kSecValueData as String: data,
kSecAttrAccessGroup as String: groupName,
]
if (managed) {

if managed {
query[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock
}

// Attempt to delete an existing key to allow for an overwrite
_ = self.delete(key: key)
_ = delete(key: key)
return SecItemAdd(query as CFDictionary, nil) == 0
}

class func load(key: String) -> Data? {
let query: [String: Any] = [
kSecClass as String : kSecClassGenericPassword,
kSecAttrAccount as String : key,
kSecReturnData as String : kCFBooleanTrue!,
kSecMatchLimit as String : kSecMatchLimitOne,
kSecClass as String: kSecClassGenericPassword,
kSecAttrAccount as String: key,
kSecReturnData as String: kCFBooleanTrue!,
kSecMatchLimit as String: kSecMatchLimitOne,
kSecAttrAccessGroup as String: groupName,
]

var dataTypeRef: AnyObject? = nil
var dataTypeRef: AnyObject?

let status: OSStatus = SecItemCopyMatching(query as CFDictionary, &dataTypeRef)

Expand All @@ -39,31 +39,29 @@ class KeyChain {
return nil
}
}

class func delete(key: String) -> Bool {
let query: [String: Any] = [
kSecClass as String : kSecClassGenericPassword as String,
kSecAttrAccount as String : key,
kSecAttrAccessGroup as String: groupName,
]
let query: [String: Any] = [
kSecClass as String: kSecClassGenericPassword as String,
kSecAttrAccount as String: key,
kSecAttrAccessGroup as String: groupName,
]

return SecItemDelete(query as CFDictionary) == 0
}
}

extension Data {

init<T>(from value: T) {
var value = value
var data = Data()
withUnsafePointer(to: &value, { (ptr: UnsafePointer<T>) -> Void in
withUnsafePointer(to: &value) { (ptr: UnsafePointer<T>) in
data = Data(buffer: UnsafeBufferPointer(start: ptr, count: 1))
})
}
self.init(data)
}

func to<T>(type: T.Type) -> T {
return self.withUnsafeBytes { $0.load(as: T.self) }
func to<T>(type _: T.Type) -> T {
return withUnsafeBytes { $0.load(as: T.self) }
}
}

Loading