Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4226)

Unified Diff: chrome/browser/ui/webui/about_ui.cc

Issue 916153003: Add namespace sandbox to about page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/test/data/webui/sandboxstatus_browsertest.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/about_ui.cc
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 3d99831d01c89d4b71897b6ad27c3df821c5061b..2e9eb6f49b4c4bc4cc4c366414e4afe97b176194 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -675,10 +675,8 @@ std::string AboutLinuxProxyConfig() {
return data;
}
-void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id,
- bool good) {
+void AboutSandboxRow(std::string* data, int name_id, bool good) {
data->append("<tr><td>");
- data->append(prefix);
data->append(l10n_util::GetStringUTF8(name_id));
if (good) {
data->append("</td><td style='color: green;'>");
@@ -705,31 +703,26 @@ std::string AboutSandbox() {
data.append("<table>");
- AboutSandboxRow(&data,
- std::string(),
- IDS_ABOUT_SANDBOX_SUID_SANDBOX,
+ AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_SUID_SANDBOX,
status & content::kSandboxLinuxSUID);
- AboutSandboxRow(&data, "&nbsp;&nbsp;", IDS_ABOUT_SANDBOX_PID_NAMESPACES,
+ AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NAMESPACE_SANDBOX,
+ status & content::kSandboxLinuxUserNS);
+ AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_PID_NAMESPACES,
status & content::kSandboxLinuxPIDNS);
- AboutSandboxRow(&data, "&nbsp;&nbsp;", IDS_ABOUT_SANDBOX_NET_NAMESPACES,
+ AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NET_NAMESPACES,
status & content::kSandboxLinuxNetNS);
- AboutSandboxRow(&data,
- std::string(),
- IDS_ABOUT_SANDBOX_SECCOMP_BPF_SANDBOX,
+ AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_SECCOMP_BPF_SANDBOX,
status & content::kSandboxLinuxSeccompBPF);
- AboutSandboxRow(&data,
- std::string(),
- IDS_ABOUT_SANDBOX_SECCOMP_BPF_SANDBOX_TSYNC,
+ AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_SECCOMP_BPF_SANDBOX_TSYNC,
status & content::kSandboxLinuxSeccompTSYNC);
- AboutSandboxRow(&data,
- std::string(),
- IDS_ABOUT_SANDBOX_YAMA_LSM,
+ AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_YAMA_LSM,
status & content::kSandboxLinuxYama);
data.append("</table>");
- // The setuid sandbox is required as our first-layer sandbox.
- bool good_layer1 = status & content::kSandboxLinuxSUID &&
+ // Require either the setuid or namespace sandbox for our first-layer sandbox.
+ bool good_layer1 = (status & content::kSandboxLinuxSUID ||
+ status & content::kSandboxLinuxUserNS) &&
status & content::kSandboxLinuxPIDNS &&
status & content::kSandboxLinuxNetNS;
// A second-layer sandbox is also required to be adequately sandboxed.
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/test/data/webui/sandboxstatus_browsertest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698