Changeset 243465 in webkit

Timestamp:

Mar 25, 2019 3:10:16 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Do not terminate the NetworkProcess if a third party application sends a NSCredential with a SecIdentityRef
​https://bugs.webkit.org/show_bug.cgi?id=196213

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-03-25
Reviewed by Geoff Garen.

Source/WebKit:

A release assertion added in r230225 was reachable. I reached it in a unit test that responds to a challenge
with a SecIdentityRef wrapped in an NSCredential.

• Shared/cf/ArgumentCodersCF.cpp:

(IPC::decode):

Tools:

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm: Added.

(credentialWithIdentityAndKeychainPath):
(-[ChallengeDelegate webView:didFinishNavigation:]):
(-[ChallengeDelegate webView:didReceiveAuthenticationChallenge:completionHandler:]):
(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/cf/ArgumentCodersCF.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm (added)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-25  Alex Christensen  <achristensen@webkit.org>
+
+        Do not terminate the NetworkProcess if a third party application sends a NSCredential with a SecIdentityRef
+        https://bugs.webkit.org/show_bug.cgi?id=196213
+
+        Reviewed by Geoff Garen.
+
+        A release assertion added in r230225 was reachable.  I reached it in a unit test that responds to a challenge
+        with a SecIdentityRef wrapped in an NSCredential.
+
+        * Shared/cf/ArgumentCodersCF.cpp:
+        (IPC::decode):
+
 2019-03-25  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp

@@ -698 +698 @@
 bool decode(Decoder& decoder, RetainPtr<SecIdentityRef>& result)
 {
-#if PLATFORM(COCOA)
-    RELEASE_ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessCredentials));
-#endif
-
     RetainPtr<SecCertificateRef> certificate;
     if (!decode(decoder, certificate))
@@ -716 +712 @@
     if (!decode(decoder, keyData))
         return false;
+
+#if PLATFORM(COCOA)
+    if (!hasProcessPrivilege(ProcessPrivilege::CanAccessCredentials))
+        return true;
+#endif
 
     SecKeyRef key = nullptr;

trunk/Tools/ChangeLog

@@ +1 @@
+2019-03-25  Alex Christensen  <achristensen@webkit.org>
+
+        Do not terminate the NetworkProcess if a third party application sends a NSCredential with a SecIdentityRef
+        https://bugs.webkit.org/show_bug.cgi?id=196213
+
+        Reviewed by Geoff Garen.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm: Added.
+        (credentialWithIdentityAndKeychainPath):
+        (-[ChallengeDelegate webView:didFinishNavigation:]):
+        (-[ChallengeDelegate webView:didReceiveAuthenticationChallenge:completionHandler:]):
+        (TestWebKitAPI::TEST):
+
 2019-03-25  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -312 +312 @@
                 5C0BF8951DD599CD00B00328 /* NavigatorLanguage.mm in Sources */ = {isa = PBXBuildFile; fileRef = E19DB9781B32137C00DB38D4 /* NavigatorLanguage.mm */; };
                 5C19A5241FD0F60100EEA323 /* CookiePrivateBrowsing.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C19A5231FD0F32600EEA323 /* CookiePrivateBrowsing.mm */; };
+                5C23DF0B2246015800F454B6 /* Challenge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C23DF0A2245C9D700F454B6 /* Challenge.mm */; };
                 5C2936931D5BF70D00DEAB1E /* CookieAcceptPolicy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C2936911D5BF63E00DEAB1E /* CookieAcceptPolicy.mm */; };
                 5C2936961D5C00ED00DEAB1E /* CookieMessage.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5C2936941D5BFD1900DEAB1E /* CookieMessage.html */; };
@@ -1721 +1722 @@
                 5C0BF88F1DD5999B00B00328 /* WebViewCanPasteZeroPng.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewCanPasteZeroPng.mm; sourceTree = "<group>"; };
                 5C19A5231FD0F32600EEA323 /* CookiePrivateBrowsing.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CookiePrivateBrowsing.mm; sourceTree = "<group>"; };
+                5C23DF0A2245C9D700F454B6 /* Challenge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Challenge.mm; sourceTree = "<group>"; };
                 5C2936911D5BF63E00DEAB1E /* CookieAcceptPolicy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CookieAcceptPolicy.mm; sourceTree = "<group>"; };
                 5C2936941D5BFD1900DEAB1E /* CookieMessage.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = CookieMessage.html; sourceTree = "<group>"; };
@@ -2531 +2533 @@
                                 1C2B817E1C891E4200A5529F /* CancelFontSubresource.mm */,
                                 1C2B81811C891EFA00A5529F /* CancelFontSubresourcePlugIn.mm */,
+                                5C23DF0A2245C9D700F454B6 /* Challenge.mm */,
                                 5CB18BA71F5645B200EE23C4 /* ClickAutoFillButton.mm */,
                                 CDF92236216D186400647AA7 /* CloseWebViewAfterEnterFullscreen.mm */,
@@ -4027 +4030 @@
                                 57303BC9200824D300355965 /* CBORValueTest.cpp in Sources */,
                                 57303BCA20082C0100355965 /* CBORWriterTest.cpp in Sources */,
+                                5C23DF0B2246015800F454B6 /* Challenge.mm in Sources */,
                                 F44A531221B8990A00DBB99C /* ClassMethodSwizzler.mm in Sources */,
                                 7CCE7EE61A411AE600447C4C /* CloseFromWithinCreatePage.cpp in Sources */,