Title: [284497] branches/safari-613.1.6-branch/Source/WebKit
- Revision
- 284497
- Author
- alanc...@apple.com
- Date
- 2021-10-19 14:41:53 -0700 (Tue, 19 Oct 2021)
Log Message
Cherry-pick r284495. rdar://problem/84433820
Unreviewed, reverting r284099.
https://bugs.webkit.org/show_bug.cgi?id=231984
Introduced build failure
Reverted changeset:
"[iOS] Stop including 'util.sb' in the WebContent process'
sandbox"
https://bugs.webkit.org/show_bug.cgi?id=231570
https://commits.webkit.org/r284099
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284495 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Removed Paths
Diff
Modified: branches/safari-613.1.6-branch/Source/WebKit/ChangeLog (284496 => 284497)
--- branches/safari-613.1.6-branch/Source/WebKit/ChangeLog 2021-10-19 21:40:00 UTC (rev 284496)
+++ branches/safari-613.1.6-branch/Source/WebKit/ChangeLog 2021-10-19 21:41:53 UTC (rev 284497)
@@ -1,5 +1,37 @@
2021-10-19 Alan Coon <alanc...@apple.com>
+ Cherry-pick r284495. rdar://problem/84433820
+
+ Unreviewed, reverting r284099.
+ https://bugs.webkit.org/show_bug.cgi?id=231984
+
+ Introduced build failure
+
+ Reverted changeset:
+
+ "[iOS] Stop including 'util.sb' in the WebContent process'
+ sandbox"
+ https://bugs.webkit.org/show_bug.cgi?id=231570
+ https://commits.webkit.org/r284099
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284495 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-10-19 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r284099.
+ https://bugs.webkit.org/show_bug.cgi?id=231984
+
+ Introduced build failure
+
+ Reverted changeset:
+
+ "[iOS] Stop including 'util.sb' in the WebContent process'
+ sandbox"
+ https://bugs.webkit.org/show_bug.cgi?id=231570
+ https://commits.webkit.org/r284099
+
+2021-10-19 Alan Coon <alanc...@apple.com>
+
Cherry-pick r284483. rdar://problem/84428759
LayoutTests/imported/w3c:
Modified: branches/safari-613.1.6-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in (284496 => 284497)
--- branches/safari-613.1.6-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in 2021-10-19 21:40:00 UTC (rev 284496)
+++ branches/safari-613.1.6-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in 2021-10-19 21:41:53 UTC (rev 284497)
@@ -30,13 +30,13 @@
;; Silence spurious logging due to rdar://20117923 and rdar://72366475
(deny system-privilege (privilege-id PRIV_GLOBAL_PROC_INFO) (with no-report))
-#include "Shared/Sandbox/util.sb"
-
;;;
;;; The following rules were originally contained in 'common.sb'. We are duplicating them here so we can
;;; remove unneeded sandbox extensions.
;;;
+(import "util.sb")
+
(define-once (allow-read-and-issue-generic-extensions . filters)
(allow file-read*
(apply require-any filters))
Deleted: branches/safari-613.1.6-branch/Source/WebKit/Shared/Sandbox/util.sb (284496 => 284497)
--- branches/safari-613.1.6-branch/Source/WebKit/Shared/Sandbox/util.sb 2021-10-19 21:40:00 UTC (rev 284496)
+++ branches/safari-613.1.6-branch/Source/WebKit/Shared/Sandbox/util.sb 2021-10-19 21:41:53 UTC (rev 284497)
@@ -1,94 +0,0 @@
-; Copyright (C) 2021 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.
-
-(macro (define-once form)
- (let* ((ps (cdr form))
- (signature (car ps))
- (body (cdr ps))
- (name (car signature)))
- (if (not (defined? name))
- `(define ,signature ,@body))))
-
-(define-once (home-literal . relative-subpaths)
- (apply literal (map home-relative-path relative-subpaths)))
-
-(define-once (home-subpath . relative-subpaths)
- (apply subpath (map home-relative-path relative-subpaths)))
-
-(define-once (home-prefix . relative-subpaths)
- (apply prefix (map home-relative-path relative-subpaths)))
-
-(define-once (home-regex . relative-regexes)
- (require-all
- (apply any-home-regex relative-regexes)
- (home-subpath "")))
-
-(define-once (home-relative-path relative-subpath)
- (string-append "${HOME}" relative-subpath))
-
-(define-once (front-user-home-subpath . relative-subpaths)
- (apply subpath (map front-user-home-relative-path relative-subpaths)))
-
-(define-once (front-user-home-relative-path relative-subpath)
- (string-append "${FRONT_USER_HOME}" relative-subpath))
-
-(define-once (%elevated-precedence-finalize)
- (lambda () #f))
-
-(macro (with-elevated-precedence form)
- (let* ((rules (cdr form)))
- ;; Later rules override earlier rules so emit the given rules as
- ;; late as possible to give them high precendence.
- `(%at-elevated-precedence-finalize (lambda () ,@rules))))
-
-(define-once (%at-elevated-precedence-finalize func)
- (let*
- ((orig-finalize %elevated-precedence-finalize)
- (new-finalize
- (lambda ()
- (orig-finalize)
- (func))))
- (set! %elevated-precedence-finalize new-finalize)))
-
-(define-once (well-known-system-group-container-path relative-subpath)
- (string-append "/private/var/containers/Shared/SystemGroup" relative-subpath))
-
-(define-once (well-known-system-group-container-literal . relative-subpaths)
- (apply literal (map well-known-system-group-container-path relative-subpaths)))
-
-(define-once (well-known-system-group-container-subpath . relative-subpaths)
- (apply subpath (map well-known-system-group-container-path relative-subpaths)))
-
-(define-once (allow-well-known-system-group-container-subpath-read . subpaths)
- (for-each
- (lambda (relative-path)
- (allow file-read*
- (well-known-system-group-container-subpath relative-path)))
- subpaths))
-
-(define-once (allow-well-known-system-group-container-literal-read . subpaths)
- (for-each
- (lambda (relative-path)
- (allow file-read*
- (well-known-system-group-container-literal relative-path)))
- subpaths))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
