Changeset 277658 in webkit

Timestamp:

May 18, 2021 10:04:34 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

Add nil checks for LAContexts before inserting them in the dictionaries.
​https://bugs.webkit.org/show_bug.cgi?id=225897

Patch by Garrett Davidson <​garrett_davidson@apple.com> on 2021-05-18
Reviewed by Tim Horton.

In 225218 we stopped dropping requests that didn't have LAContexts. However, that let us
proceed only until we tried to put the (nil) LAContext in an NSDictionary to make a Sec*
call, which throws an exception. This patch adds proper nil checking before inserting the
contexts into the dictionaries.

Manually tested registration and assertion on macOS with and without LAContexts.

• UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:

(WebKit::LocalAuthenticator::continueGetAssertionAfterUserVerification):

• UIProcess/WebAuthentication/Cocoa/LocalConnection.mm:

(WebKit::LocalConnection::createCredentialPrivateKey const):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm (modified) (2 diffs)
• UIProcess/WebAuthentication/Cocoa/LocalConnection.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-05-18  Garrett Davidson  <garrett_davidson@apple.com>
+
+        Add nil checks for LAContexts before inserting them in the dictionaries.
+        https://bugs.webkit.org/show_bug.cgi?id=225897
+
+        Reviewed by Tim Horton.
+
+        In 225218 we stopped dropping requests that didn't have LAContexts. However, that let us
+        proceed only until we tried to put the (nil) LAContext in an NSDictionary to make a Sec*
+        call, which throws an exception. This patch adds proper nil checking before inserting the
+        contexts into the dictionaries.
+
+        Manually tested registration and assertion on macOS with and without LAContexts.
+
+        * UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:
+        (WebKit::LocalAuthenticator::continueGetAssertionAfterUserVerification):
+        * UIProcess/WebAuthentication/Cocoa/LocalConnection.mm:
+        (WebKit::LocalConnection::createCredentialPrivateKey const):
+
 2021-05-18  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm

@@ -603 +603 @@
     auto nsCredentialId = toNSData(response->rawId());
     {
-        auto query = adoptNS([[NSMutableDictionary alloc] init]);
-        [query setDictionary:@{
+        NSMutableDictionary *queryDictionary = [@{
             (id)kSecClass: (id)kSecClassKey,
             (id)kSecAttrKeyClass: (id)kSecAttrKeyClassPrivate,
             (id)kSecAttrApplicationLabel: nsCredentialId.get(),
-            (id)kSecUseAuthenticationContext: context,
             (id)kSecReturnRef: @YES,
 #if HAVE(DATA_PROTECTION_KEYCHAIN)
@@ -615 +613 @@
             (id)kSecAttrNoLegacy: @YES
 #endif
-        }];
+        } mutableCopy];
+
+        if (context)
+            queryDictionary[(id)kSecUseAuthenticationContext] = context;
+
+        auto query = adoptNS(queryDictionary);
         updateQueryIfNecessary(query.get());
 

trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalConnection.mm

@@ -160 +160 @@
 RetainPtr<SecKeyRef> LocalConnection::createCredentialPrivateKey(LAContext *context, SecAccessControlRef accessControlRef, const String& secAttrLabel, NSData *secAttrApplicationTag) const
 {
+    NSDictionary *privateKeyAttributes = @{
+        (id)kSecAttrAccessControl: (id)accessControlRef,
+        (id)kSecAttrIsPermanent: @YES,
+        (id)kSecAttrAccessGroup: (id)String(LocalAuthenticatiorAccessGroup),
+        (id)kSecAttrLabel: secAttrLabel,
+        (id)kSecAttrApplicationTag: secAttrApplicationTag,
+    };
+
+    if (context) {
+        privateKeyAttributes = [privateKeyAttributes mutableCopy];
+        ((NSMutableDictionary *)privateKeyAttributes)[(id)kSecUseAuthenticationContext] = context;
+    }
+
     NSDictionary *attributes = @{
         (id)kSecAttrTokenID: (id)kSecAttrTokenIDSecureEnclave,
         (id)kSecAttrKeyType: (id)kSecAttrKeyTypeECSECPrimeRandom,
         (id)kSecAttrKeySizeInBits: @256,
-        (id)kSecPrivateKeyAttrs: @{
-            (id)kSecUseAuthenticationContext: context,
-            (id)kSecAttrAccessControl: (id)accessControlRef,
-            (id)kSecAttrIsPermanent: @YES,
-            (id)kSecAttrAccessGroup: (id)String(LocalAuthenticatiorAccessGroup),
-            (id)kSecAttrLabel: secAttrLabel,
-            (id)kSecAttrApplicationTag: secAttrApplicationTag,
-        }};
+        (id)kSecPrivateKeyAttrs: privateKeyAttributes,
+    };
+
     LOCAL_CONNECTION_ADDITIONS
     CFErrorRef errorRef = nullptr;