Diff
Modified: branches/safari-537.78-branch/Source/WebKit2/ChangeLog (171272 => 171273)
--- branches/safari-537.78-branch/Source/WebKit2/ChangeLog 2014-07-19 23:19:28 UTC (rev 171272)
+++ branches/safari-537.78-branch/Source/WebKit2/ChangeLog 2014-07-19 23:31:14 UTC (rev 171273)
@@ -1,5 +1,23 @@
2014-07-19 Lucas Forschler <[email protected]>
+ Merge r169448
+
+ 2014-05-29 Alexey Proskuryakov <[email protected]>
+
+ Add a sandbox profile for com.apple.appstore.CodeRedeemerNetscapePlugin
+ https://bugs.webkit.org/show_bug.cgi?id=133360
+
+ Reviewed by Sam Weinig.
+
+ * Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb: Looks like
+ anyone using camera would need access to CoreMedia preferences.
+
+ * Resources/PlugInSandboxProfiles/com.apple.appstore.CodeRedeemerNetscapePlugin.sb: Added.
+
+ * WebKit2.xcodeproj/project.pbxproj: Added the profile.
+
+2014-07-19 Lucas Forschler <[email protected]>
+
Merge r169757
2014-06-10 Alexey Proskuryakov <[email protected]>
Modified: branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb (171272 => 171273)
--- branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb 2014-07-19 23:19:28 UTC (rev 171272)
+++ branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb 2014-07-19 23:31:14 UTC (rev 171273)
@@ -323,6 +323,7 @@
;; Camera
(define (webkit-camera)
+ (shared-preferences-read "com.apple.coremedia")
(allow mach-lookup (extension "com.apple.app-sandbox.mach"))
(allow mach-lookup
(global-name "com.apple.cmio.AppleCameraAssistant")
Copied: branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.appstore.CodeRedeemerNetscapePlugin.sb (from rev 169448, trunk/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.appstore.CodeRedeemerNetscapePlugin.sb) (0 => 171273)
--- branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.appstore.CodeRedeemerNetscapePlugin.sb (rev 0)
+++ branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.appstore.CodeRedeemerNetscapePlugin.sb 2014-07-19 23:31:14 UTC (rev 171273)
@@ -0,0 +1,24 @@
+; Copyright (C) 2014 Apple Inc. All rights reserved.
+;
+; Redistribution and use in source and binary forms, with or without
+; modification, are permitted provided that the following conditions
+; are met:
+; 1. Redistributions of source code must retain the above copyright
+; notice, this list of conditions and the following disclaimer.
+; 2. Redistributions in binary form must reproduce the above copyright
+; notice, this list of conditions and the following disclaimer in the
+; documentation and/or other materials provided with the distribution.
+;
+; THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+; THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+; PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+; BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+; THE POSSIBILITY OF SUCH DAMAGE.
+
+(webkit-camera)
Modified: branches/safari-537.78-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (171272 => 171273)
--- branches/safari-537.78-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-19 23:19:28 UTC (rev 171272)
+++ branches/safari-537.78-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-19 23:31:14 UTC (rev 171273)
@@ -1166,6 +1166,7 @@
E18E6918169B667B009B6670 /* SecItemShimProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = E18E6914169B667B009B6670 /* SecItemShimProxyMessages.h */; };
E19582D3153CBFD700B60875 /* PDFKitImports.h in Headers */ = {isa = PBXBuildFile; fileRef = E19582D2153CBFD700B60875 /* PDFKitImports.h */; };
E19582D6153CC05400B60875 /* PDFKitImports.mm in Sources */ = {isa = PBXBuildFile; fileRef = E19582D4153CC05300B60875 /* PDFKitImports.mm */; };
+ E19BDA86193665E300B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = E19BDA8419365F4B00B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb */; };
E199875E142C045400BB2DE7 /* SimplePDFPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = E199875C142BFC9700BB2DE7 /* SimplePDFPlugin.mm */; };
E1A31732134CEA6C007C9A4F /* AttributedString.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A31731134CEA6C007C9A4F /* AttributedString.h */; };
E1A31735134CEA80007C9A4F /* AttributedString.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1A31734134CEA80007C9A4F /* AttributedString.mm */; };
@@ -1435,6 +1436,7 @@
7CB16FF31724BA2F007A0A95 /* com.microsoft.SilverlightPlugin.sb in Copy Plug-in Sandbox Profiles */,
7CB16FF41724BA30007A0A95 /* com.oracle.java.JavaAppletPlugin.sb in Copy Plug-in Sandbox Profiles */,
7CB16FF11724BA26007A0A95 /* com.apple.WebKit.plugin-common.sb in Copy Plug-in Sandbox Profiles */,
+ E19BDA86193665E300B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb in Copy Plug-in Sandbox Profiles */,
);
name = "Copy Plug-in Sandbox Profiles";
runOnlyForDeploymentPostprocessing = 0;
@@ -2697,6 +2699,7 @@
E19582D2153CBFD700B60875 /* PDFKitImports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFKitImports.h; sourceTree = "<group>"; };
E19582D4153CC05300B60875 /* PDFKitImports.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PDFKitImports.mm; sourceTree = "<group>"; };
E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.WebProcess.sb; sourceTree = "<group>"; };
+ E19BDA8419365F4B00B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.appstore.CodeRedeemerNetscapePlugin.sb; sourceTree = "<group>"; };
E199875A142BF9B800BB2DE7 /* SimplePDFPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SimplePDFPlugin.h; path = PDF/SimplePDFPlugin.h; sourceTree = "<group>"; };
E199875C142BFC9700BB2DE7 /* SimplePDFPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SimplePDFPlugin.mm; path = PDF/SimplePDFPlugin.mm; sourceTree = "<group>"; };
E1A31731134CEA6C007C9A4F /* AttributedString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AttributedString.h; sourceTree = "<group>"; };
@@ -3840,6 +3843,7 @@
7CB16FE21724B9B5007A0A95 /* com.apple.ist.ds.appleconnect.webplugin.sb */,
7CB16FE31724B9B5007A0A95 /* com.apple.QuickTime Plugin.plugin.sb */,
7CB16FE41724B9B5007A0A95 /* com.apple.WebKit.plugin-common.sb */,
+ E19BDA8419365F4B00B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb */,
7CB16FE51724B9B5007A0A95 /* com.macromedia.Flash Player.plugin.sb */,
7CB16FE61724B9B5007A0A95 /* com.microsoft.SilverlightPlugin.sb */,
7CB16FE71724B9B5007A0A95 /* com.oracle.java.JavaAppletPlugin.sb */,
