MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-59369 IJPL-59368 rewrite messages, add learn more action, add logging

Browse Source 
GitOrigin-RevId: e70924abacc9857f0ead64cbcb135cbbfb687571
This commit is contained in:
Vladimir Kharitonov
2024-05-17 00:22:52 +02:00
committed by intellij-monorepo-bot
parent 5b3986df4b
commit be9a2f202a
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/platform-api/resources/messages/IdeBundle.properties
View File

@@ -2600,11 +2600,12 @@ notification.content.jcef.gpucrash.message=GPU process restarts too many times a
notification.content.jcef.gpucrash.action.restart=Restart
notification.content.jcef.gpucrash.action.disable=Disable GPU and restart
notification.content.jcef.unprivileged.userns.restricted.title=JCEF sandbox in unavailable
notification.content.jcef.unprivileged.userns.restricted.message=OS restricts unprivileged user namespaces. \
Starting JCEF requires either installing the corresponding AppArmor profile or turning sandbox off.
notification.content.jcef.unprivileged.userns.restricted.action.add.apparmor.profile=Install AppArmor profile\u2026
notification.content.jcef.unprivileged.userns.restricted.title=Embedded Browser is suspended
notification.content.jcef.unprivileged.userns.restricted.message=The system restricts the embedded browser from running with the sandbox enabled. \
A corresponding AppArmor profile must be installed to start the browser sandboxed.
notification.content.jcef.unprivileged.userns.restricted.action.add.apparmor.profile=Install profile\u2026
notification.content.jcef.unprivileged.userns.restricted.action.disable.sandbox=Disable sandbox
notification.content.jcef.unprivileged.userns.restricted.action.learn.more=Learn more\u2026
notification.content.jcef.unprivileged.userns.restricted.install.apparmor.profile.prompt=Install AppArmor profile for %s
notification.content.jcef.failed.to.install.apparmor.profile=Failed to install AppArmor profile

10
platform/platform-api/src/com/intellij/ui/jcef/JBCefApp.java
View File

@@ -1,6 +1,7 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.ui.jcef;
import com.intellij.ide.BrowserUtil;
import com.intellij.ide.IdeBundle;
import com.intellij.notification.*;
import com.intellij.openapi.Disposable;
@@ -127,6 +128,15 @@ public final class JBCefApp {
})
);
notification.addAction(
NotificationAction.createSimple(
IdeBundle.message("notification.content.jcef.unprivileged.userns.restricted.action.learn.more"),
() -> {
// TODO(kharitonov): move to https://intellij-support.jetbrains.com/hc/en-us/sections/201620045-Troubleshooting
BrowserUtil.browse("https://youtrack.jetbrains.com/articles/JBR-A-11");
})
);
Notifications.Bus.notify(notification);
}
});

3
platform/platform-api/src/com/intellij/ui/jcef/JBCefAppArmorUtils.java
View File

@@ -44,10 +44,11 @@ final class JBCefAppArmorUtils {
return true;
}
LOG.warn("Unprivileged user name spaces check failed: " + output.getStderr());
LOG.warn("Unprivileged user namespaces check failed: " + output.getStderr());
return false;
}
catch (ExecutionException e) {
LOG.warn("Failed to check unprivileged user namespaces restrictions(considered as restricted): " + e.getMessage());
return false;
}
}