Remove global cookie workaround from sandbox profiles
authoroliver@apple.com <oliver@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 22 Jul 2014 00:38:38 +0000 (00:38 +0000)
committeroliver@apple.com <oliver@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 22 Jul 2014 00:38:38 +0000 (00:38 +0000)
https://bugs.webkit.org/show_bug.cgi?id=135138
<rdar://17513375>

Reviewed by Alexey Proskuryakov.

Remove the workaround needed for global cookie access, and silencing
of the associated sandbox violation.

* Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb:
* Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformDefaultCookieStorageDirectory):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171326 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb
Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb
Source/WebKit2/UIProcess/mac/WebContextMac.mm

index 136d066..bb7d6ee 100644 (file)
@@ -1,5 +1,21 @@
 2014-07-21  Oliver Hunt  <oliver@apple.com>
 
+        Remove global cookie workaround from sandbox profiles
+        https://bugs.webkit.org/show_bug.cgi?id=135138
+        <rdar://17513375>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove the workaround needed for global cookie access, and silencing
+        of the associated sandbox violation.
+
+        * Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb:
+        * Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:
+        * UIProcess/mac/WebContextMac.mm:
+        (WebKit::WebContext::platformDefaultCookieStorageDirectory):
+
+2014-07-21  Oliver Hunt  <oliver@apple.com>
+
         Correct sandbox profiles to fix some excess privileges
         https://bugs.webkit.org/show_bug.cgi?id=135134
         <rdar://problem/17741886>
index 2a0fdfd..0412415 100644 (file)
 (import "common.sb")
 (import "removed-dev-nodes.sb")
 
-;; Access CFNetwork shared cookies
-;; This is too generous -- <rdar://problem/17496756>
-(apple-cookie-access 'with-read-write)
-
 ;; Sandbox extensions
 (allow file-read* (extension "com.apple.webkit.read"))
 
index 7162c21..9a89dec 100644 (file)
 (apple-ui-app "com.apple.WebKit.WebContent" 'with-opengl)
 (opengl)
 
-;; Access CFNetwork shared cookies
-;; This is too generous -- <rdar://problem/17496756>
-(apple-cookie-access 'with-read-write)
-
 ;; Access to media controls
 (play-media)
 (media-remote)
index ba61443..18dc74c 100644 (file)
@@ -277,10 +277,6 @@ String WebContext::platformDefaultCookieStorageDirectory() const
 
     path = path + "/Library/Cookies";
     path = stringByResolvingSymlinksInPath(path);
-    // Temporary work around for <rdar://<rdar://problem/17513375>
-    if (path == "/private/var/mobile/Library/Cookies")
-        return String();
-
     return path;
 #else
     notImplemented();