diff options
| author | toofar <toofar@spalge.com> | 2023-08-05 17:02:06 +1200 |
|---|---|---|
| committer | toofar <toofar@spalge.com> | 2023-08-12 13:36:50 +1200 |
| commit | b018f3f081db60029be35ee800170e3c3a32d3e7 (patch) | |
| tree | fbc455a2c6b001cc1ec6f43bf21cb925de03c714 | |
| parent | 64af5f0e264f5a79dc474838603f584b346f6ac4 (diff) | |
| download | qutebrowser-b018f3f081db60029be35ee800170e3c3a32d3e7.tar.gz qutebrowser-b018f3f081db60029be35ee800170e3c3a32d3e7.zip | |
Revert "qt6: Add macOS sandboxing warning"
This reverts commit 8715263c757072fcca14d4e543efa631fda149cd.
ref: #7803
| -rw-r--r-- | qutebrowser/app.py | 9 | ||||
| -rw-r--r-- | qutebrowser/browser/qutescheme.py | 3 | ||||
| -rw-r--r-- | qutebrowser/html/warning-sandboxing.html | 16 |
3 files changed, 0 insertions, 28 deletions
diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 94cc53c72..60eedeb1b 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -346,15 +346,6 @@ def _open_special_pages(args): True, 'qute://warning/sessions'), - ('sandboxing-warning-shown', - ( - hasattr(sys, "frozen") and - utils.is_mac and - machinery.IS_QT6 and - os.environ.get("QTWEBENGINE_DISABLE_SANDBOX") == "1" - ), - 'qute://warning/sandboxing'), - ('qt5-warning-shown', ( machinery.IS_QT5 and diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py index dae862b8b..f325ff9e3 100644 --- a/qutebrowser/browser/qutescheme.py +++ b/qutebrowser/browser/qutescheme.py @@ -568,9 +568,6 @@ def qute_warning(url: QUrl) -> _HandlerRet: title='Qt 5.15 sessions warning', datadir=standarddir.data(), sep=os.sep) - elif path == '/sandboxing': - src = jinja.render('warning-sandboxing.html', - title='Qt 6 macOS sandboxing warning') elif path == '/qt5': is_venv = hasattr(sys, 'real_prefix') or sys.base_prefix != sys.prefix src = jinja.render('warning-qt5.html', diff --git a/qutebrowser/html/warning-sandboxing.html b/qutebrowser/html/warning-sandboxing.html deleted file mode 100644 index 186d938e7..000000000 --- a/qutebrowser/html/warning-sandboxing.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "styled.html" %} - -{% block content %} -<h1>{{ title }}</h1> -<span class="note">Note this warning will only appear once. Use <span class="mono">:open -qute://warning/sandboxing</span> to show it again at a later time.</span> - -<p> - Due to a <a href="https://github.com/pyinstaller/pyinstaller/pull/6903">PyInstaller issue</a>, - Chromium's <a href="https://chromium.googlesource.com/chromium/src/+/HEAD/docs/design/sandbox_faq.md">sandboxing</a> - is currently disabled for macOS builds with Qt 6. This means that there will be no additional layer of protection - in case of Chromium security bugs. Thus, it's advised to - <b>not use this build in production</b>. Hopefully, this situation will be - resolved before the final 3.0.0 release. -</p> -{% endblock %} |