Changeset 171060 in webkit

Timestamp:

Jul 14, 2014, 12:18:44 AM (11 years ago)

Author:

mitz@apple.com

Message:

NetworkProcess sometimes hangs under copyDefaultCredentialForProtectionSpace
​https://bugs.webkit.org/show_bug.cgi?id=134666

Reviewed by Tim Horton.

A SecItem may have an attribute whose value is a SecAccessControlRef, which is not supported
by ArgumentCodersCF. In debug builds, trying to encode a CFDictionary containing a value of
unsupprted type causes an assertion to fail, but in release builds encoding succeeds, and
only decoding fails, in this case silently, simply not delivering the
SecItemShim::secItemResponse message.

The fix is to teach ArgumentCodersCF about SecAccessControlRef.

• Shared/cf/ArgumentCodersCF.cpp:

(IPC::typeFromCFTypeRef): Check for the SecAccessControlRef type.
(IPC::encode): Encode the SecAccessControl serialized into CFData.
(IPC::decode): Deserialize a SecAccessControl from the decoded CFData.

• Shared/cf/ArgumentCodersCF.h:
• config.h: Defined HAVE_SEC_ACCESS_CONTROL.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/cf/ArgumentCodersCF.cpp (modified) (6 diffs)
• Shared/cf/ArgumentCodersCF.h (modified) (1 diff)
• config.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-14  Dan Bernstein  <mitz@apple.com>
+
+        NetworkProcess sometimes hangs under copyDefaultCredentialForProtectionSpace
+        https://bugs.webkit.org/show_bug.cgi?id=134666
+
+        Reviewed by Tim Horton.
+
+        A SecItem may have an attribute whose value is a SecAccessControlRef, which is not supported
+        by ArgumentCodersCF. In debug builds, trying to encode a CFDictionary containing a value of
+        unsupprted type causes an assertion to fail, but in release builds encoding succeeds, and
+        only decoding fails, in this case silently, simply not delivering the
+        SecItemShim::secItemResponse message.
+
+        The fix is to teach ArgumentCodersCF about SecAccessControlRef.
+
+        * Shared/cf/ArgumentCodersCF.cpp:
+        (IPC::typeFromCFTypeRef): Check for the SecAccessControlRef type.
+        (IPC::encode): Encode the SecAccessControl serialized into CFData.
+        (IPC::decode): Deserialize a SecAccessControl from the decoded CFData.
+        * Shared/cf/ArgumentCodersCF.h:
+        * config.h: Defined HAVE_SEC_ACCESS_CONTROL.
+
 2014-07-13  Dan Bernstein  <mitz@apple.com>
 

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

@@ -52 +52 @@
 #endif
 
+#if HAVE(SEC_ACCESS_CONTROL)
+#if defined(__has_include) && __has_include(<Security/SecAccessControlPriv.h>)
+#include <Security/SecAccessControlPriv.h>
+#endif
+
+extern "C" SecAccessControlRef SecAccessControlCreateFromData(CFAllocatorRef allocator, CFDataRef data, CFErrorRef *error);
+extern "C" CFDataRef SecAccessControlCopyData(SecAccessControlRef access_control);
+#endif
+
 using namespace WebCore;
 
@@ -78 +87 @@
 #if HAVE(SEC_KEYCHAIN)
     SecKeychainItem,
+#endif
+#if HAVE(SEC_ACCESS_CONTROL)
+    SecAccessControl,
 #endif
     Null,
@@ -119 +131 @@
         return SecKeychainItem;
 #endif
+#if HAVE(SEC_ACCESS_CONTROL)
+    if (typeID == SecAccessControlGetTypeID())
+        return SecAccessControl;
+#endif
 
     ASSERT_NOT_REACHED();
@@ -167 +183 @@
     case SecKeychainItem:
         encode(encoder, (SecKeychainItemRef)typeRef);
+        return;
+#endif
+#if HAVE(SEC_ACCESS_CONTROL)
+    case SecAccessControl:
+        encode(encoder, (SecAccessControlRef)typeRef);
         return;
 #endif
@@ -266 +287 @@
             return false;
         result = adoptCF(keychainItem.leakRef());
+        return true;
+    }
+#endif
+#if HAVE(SEC_ACCESS_CONTROL)
+    case SecAccessControl: {
+        RetainPtr<SecAccessControlRef> accessControl;
+        if (!decode(decoder, accessControl))
+            return false;
+        result = adoptCF(accessControl.leakRef());
         return true;
     }
@@ -685 +715 @@
 #endif
 
+#if HAVE(SEC_ACCESS_CONTROL)
+void encode(ArgumentEncoder& encoder, SecAccessControlRef accessControl)
+{
+    RetainPtr<CFDataRef> data = adoptCF(SecAccessControlCopyData(accessControl));
+    if (data)
+        encode(encoder, data.get());
+}
+
+bool decode(ArgumentDecoder& decoder, RetainPtr<SecAccessControlRef>& result)
+{
+    RetainPtr<CFDataRef> data;
+    if (!decode(decoder, data))
+        return false;
+
+    result = adoptCF(SecAccessControlCreateFromData(kCFAllocatorDefault, data.get(), nullptr));
+    if (!result)
+        return false;
+
+    return true;
+}
+
+#endif
+
 } // namespace IPC

trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.h

@@ -89 +89 @@
 #endif
 
+#if HAVE(SEC_ACCESS_CONTROL)
+// SecAccessControlRef
+void encode(ArgumentEncoder&, SecAccessControlRef);
+bool decode(ArgumentDecoder&, RetainPtr<SecAccessControlRef>& result);
+#endif
+
 #if PLATFORM(IOS)
 void setAllowsDecodingSecKeyRef(bool);

trunk/Source/WebKit2/config.h

@@ -92 +92 @@
 #endif
 #endif
+
+#ifndef HAVE_SEC_ACCESS_CONTROL
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
+#define HAVE_SEC_ACCESS_CONTROL 1
+#endif
+#endif