StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Enable log forwarding from sandboxee if enabled by the supervisor.

Browse Source 
If the sandboxer calls `IPC::EnableLogServer()` (and modifies the sandbox policy
accordingly), sandbox logs will be sent back to the sandboxer.

PiperOrigin-RevId: 340663308
Change-Id: I5e8d89314178dfd1b49fc25b8cd2dd02642be43a
This commit is contained in:
Peter Lundblad 2020-11-04 09:24:13 -08:00 committed by Copybara-Service
parent 2acec65a58
commit 2955d20c9f
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sandboxed_api/BUILD.bazel
View File

@ -173,6 +173,7 @@ cc_library(
"//sandboxed_api/sandbox2:client", "//sandboxed_api/sandbox2:client",
"//sandboxed_api/sandbox2:comms", "//sandboxed_api/sandbox2:comms",
"//sandboxed_api/sandbox2:forkingclient", "//sandboxed_api/sandbox2:forkingclient",
"//sandboxed_api/sandbox2:logsink",
"//sandboxed_api/util:flags", "//sandboxed_api/util:flags",
"@com_google_absl//absl/strings", "@com_google_absl//absl/strings",
"@com_google_glog//:glog", "@com_google_glog//:glog",

1
sandboxed_api/CMakeLists.txt
View File

@ -168,6 +168,7 @@ target_link_libraries(sapi_client PRIVATE
sandbox2::client sandbox2::client
sandbox2::comms sandbox2::comms
sandbox2::forkingclient sandbox2::forkingclient
sandbox2::logsink
sapi::base sapi::base
sapi::call sapi::call
sapi::flags sapi::flags

6
sandboxed_api/client.cc
View File

@ -32,6 +32,7 @@
#include "sandboxed_api/proto_arg.pb.h" #include "sandboxed_api/proto_arg.pb.h"
#include "sandboxed_api/sandbox2/comms.h" #include "sandboxed_api/sandbox2/comms.h"
#include "sandboxed_api/sandbox2/forkingclient.h" #include "sandboxed_api/sandbox2/forkingclient.h"
#include "sandboxed_api/sandbox2/logsink.h"
#include "sandboxed_api/vars.h" #include "sandboxed_api/vars.h"
#ifdef MEMORY_SANITIZER #ifdef MEMORY_SANITIZER
@ -451,6 +452,11 @@ extern "C" ABSL_ATTRIBUTE_WEAK int main(int argc, char** argv) {
// Child thread. // Child thread.
s2client.SandboxMeHere(); s2client.SandboxMeHere();
// Enable log forwarding if enabled by the sandboxer.
if (s2client.HasMappedFD(sandbox2::LogSink::kLogFDName)) {
s2client.SendLogsToSupervisor();
}
// Run SAPI stub. // Run SAPI stub.
while (true) { while (true) {
sapi::client::ServeRequest(&comms); sapi::client::ServeRequest(&comms);