Changeset 169422 in webkit

Timestamp:

May 28, 2014 7:28:56 AM (10 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Can't use bundle-defined classes for bundle parameters
​https://bugs.webkit.org/show_bug.cgi?id=133339

Reviewed by Anders Carlsson.

Ensure that bundle parameters are decoded only after the injected bundle is loaded.

• WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::create): Moved the definition from the header to here, added the
lagacy initializationUserData as a parameter, and made this function set the sandbox
extension and load the bundle.
(WebKit::InjectedBundle::InjectedBundle): Removed call to platformInitialize.

• WebProcess/InjectedBundle/InjectedBundle.h:

(WebKit::InjectedBundle::setSandboxExtension): Deleted.

• WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:

(WebKit::InjectedBundle::initialize): Renamed the load function to this, and added the
creation parameters as a parameter. Moved code to initialize the bundle paramters from
platformInitialize to here. Changed the class passed to -decodeObjectOfClass:forKey: to
NSObject, to allow arbitrary types in the values, and added an assertion that the
top-level object is a dictionary.
(WebKit::InjectedBundle::platformInitialize): Deleted.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeWebProcess): Changed to pass the legacy initialization user
data to InjectedBundle::create() and removed code to separately set the sandbox extension
and load the bundle, which is now done by create().

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• WebProcess/InjectedBundle/InjectedBundle.h (modified) (2 diffs)
• WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp (modified) (2 diffs)
• WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp (modified) (2 diffs)
• WebProcess/InjectedBundle/mac/InjectedBundleMac.mm (modified) (3 diffs)
• WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-28  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Can't use bundle-defined classes for bundle parameters
+        https://bugs.webkit.org/show_bug.cgi?id=133339
+
+        Reviewed by Anders Carlsson.
+
+        Ensure that bundle parameters are decoded only after the injected bundle is loaded.
+
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::create): Moved the definition from the header to here, added the
+        lagacy initializationUserData as a parameter, and made this function set the sandbox
+        extension and load the bundle.
+        (WebKit::InjectedBundle::InjectedBundle): Removed call to platformInitialize.
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+        (WebKit::InjectedBundle::setSandboxExtension): Deleted.
+        * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
+        (WebKit::InjectedBundle::initialize): Renamed the load function to this, and added the
+        creation parameters as a parameter. Moved code to initialize the bundle paramters from
+        platformInitialize to here. Changed the class passed to -decodeObjectOfClass:forKey: to
+        NSObject, to allow arbitrary types in the values, and added an assertion that the
+        top-level object is a dictionary.
+        (WebKit::InjectedBundle::platformInitialize): Deleted.
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess): Changed to pass the legacy initialization user
+        data to InjectedBundle::create() and removed code to separately set the sandbox extension
+        and load the bundle, which is now done by create().
+
 2014-05-28  Alberto Garcia  <berto@igalia.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -86 +86 @@
 namespace WebKit {
 
+PassRefPtr<InjectedBundle> InjectedBundle::create(const WebProcessCreationParameters& parameters, API::Object* initializationUserData)
+{
+    RefPtr<InjectedBundle> bundle = adoptRef(new InjectedBundle(parameters));
+
+    bundle->m_sandboxExtension = SandboxExtension::create(parameters.injectedBundlePathExtensionHandle);
+    if (!bundle->initialize(parameters, initializationUserData))
+        return nullptr;
+
+    return bundle.release();
+}
+
 InjectedBundle::InjectedBundle(const WebProcessCreationParameters& parameters)
     : m_path(parameters.injectedBundlePath)
     , m_platformBundle(0)
 {
-    platformInitialize(parameters);
 }
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h

@@ -82 +82 @@
 class InjectedBundle : public API::ObjectImpl<API::Object::Type::Bundle> {
 public:
-    static PassRefPtr<InjectedBundle> create(const WebProcessCreationParameters& parameters)
-    {
-        return adoptRef(new InjectedBundle(parameters));
-    }
+    static PassRefPtr<InjectedBundle> create(const WebProcessCreationParameters&, API::Object* initializationUserData);
+
     ~InjectedBundle();
 
-    bool load(API::Object* initializationUserData);
-    void setSandboxExtension(PassRefPtr<SandboxExtension> sandboxExtension) { m_sandboxExtension = sandboxExtension; }
+    bool initialize(const WebProcessCreationParameters&, API::Object* initializationUserData);
 
     void setBundleParameter(const String& key, const IPC::DataReference&);
@@ -182 +179 @@
     explicit InjectedBundle(const WebProcessCreationParameters&);
 
-    void platformInitialize(const WebProcessCreationParameters&);
-
     String m_path;
     PlatformBundle m_platformBundle; // This is leaked right now, since we never unload the bundle/module.

trunk/Source/WebKit2/WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp

@@ -35 +35 @@
 namespace WebKit {
 
-bool InjectedBundle::load(API::Object* initializationUserData)
+bool InjectedBundle::initialize(const WebProcessCreationParameters&, API::Object* initializationUserData)
 {
     m_platformBundle = eina_module_new(m_path.utf8().data());
@@ -67 +67 @@
 }
 
-void InjectedBundle::platformInitialize(const WebProcessCreationParameters&)
-{
-}
-
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp

@@ -37 +37 @@
 namespace WebKit {
 
-bool InjectedBundle::load(API::Object* initializationUserData)
+bool InjectedBundle::initialize(const WebProcessCreationParameters&, API::Object* initializationUserData)
 {
     m_platformBundle = g_module_open(fileSystemRepresentation(m_path).data(), G_MODULE_BIND_LOCAL);
@@ -59 +59 @@
 }
 
-void InjectedBundle::platformInitialize(const WebProcessCreationParameters&)
-{
-}
-
 void InjectedBundle::setBundleParameter(WTF::String const&, IPC::DataReference const&)
 {

trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm

@@ -48 +48 @@
 namespace WebKit {
 
-bool InjectedBundle::load(API::Object* initializationUserData)
+bool InjectedBundle::initialize(const WebProcessCreationParameters& parameters, API::Object* initializationUserData)
 {
     if (m_sandboxExtension) {
@@ -90 +90 @@
     
 #if WK_API_ENABLED
+    if (parameters.bundleParameterData) {
+        auto bundleParameterData = adoptNS([[NSData alloc] initWithBytesNoCopy:const_cast<void*>(static_cast<const void*>(parameters.bundleParameterData->bytes())) length:parameters.bundleParameterData->size() freeWhenDone:NO]);
+
+        auto unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingWithData:bundleParameterData.get()]);
+        [unarchiver setRequiresSecureCoding:YES];
+
+        NSDictionary *dictionary = nil;
+        @try {
+            dictionary = [unarchiver.get() decodeObjectOfClass:[NSObject class] forKey:@"parameters"];
+            ASSERT([dictionary isKindOfClass:[NSDictionary class]]);
+        } @catch (NSException *exception) {
+            LOG_ERROR("Failed to decode bundle parameters: %@", exception);
+        }
+
+        m_bundleParameters = adoptNS([[WKWebProcessBundleParameters alloc] initWithDictionary:dictionary]);
+    }
+
     // Otherwise, look to see if the bundle has a principal class
     Class principalClass = [m_platformBundle principalClass];
@@ -163 +180 @@
 }
 
-
-void InjectedBundle::platformInitialize(const WebProcessCreationParameters& parameters)
-{
-#if WK_API_ENABLED
-    if (!parameters.bundleParameterData)
-        return;
-
-    auto bundleParameterData = adoptNS([[NSData alloc] initWithBytesNoCopy:const_cast<void*>(static_cast<const void*>(parameters.bundleParameterData->bytes())) length:parameters.bundleParameterData->size() freeWhenDone:NO]);
-
-    auto unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingWithData:bundleParameterData.get()]);
-    [unarchiver setRequiresSecureCoding:YES];
-
-    NSDictionary *dictionary = nil;
-    @try {
-        dictionary = [unarchiver.get() decodeObjectOfClass:[NSDictionary class] forKey:@"parameters"];
-    } @catch (NSException *exception) {
-        LOG_ERROR("Failed to decode bundle parameters: %@", exception);
-    }
-
-    m_bundleParameters = adoptNS([[WKWebProcessBundleParameters alloc] initWithDictionary:dictionary]);
-#endif
-}
-
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -278 +278 @@
         return;
 
-    if (!parameters.injectedBundlePath.isEmpty()) {
-        m_injectedBundle = InjectedBundle::create(parameters);
-        m_injectedBundle->setSandboxExtension(SandboxExtension::create(parameters.injectedBundlePathExtensionHandle));
-
-        if (!m_injectedBundle->load(injectedBundleInitializationUserData.get())) {
-            // Don't keep around the InjectedBundle reference if the load fails.
-            m_injectedBundle.clear();
-        }
-    }
+    if (!parameters.injectedBundlePath.isEmpty())
+        m_injectedBundle = InjectedBundle::create(parameters, injectedBundleInitializationUserData.get());
 
     WebProcessSupplementMap::const_iterator it = m_supplements.begin();