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

Use Abseil's flag library released in aa468ad75539619b47979911297efbb629c52e44

Browse Source 
PiperOrigin-RevId: 247424939
Change-Id: I22a4696f705f9dcfa7394b329c78bd126f42bd16
This commit is contained in:
Christian Blichmann 2019-05-09 07:57:33 -07:00 committed by Copybara-Service
parent 7800fd7402
commit 5f3c7171b7
35 changed files with 53 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
WORKSPACE
View File

@ -20,8 +20,9 @@ load("//sandboxed_api/bazel:repositories.bzl", "autotools_repository")
# Abseil
http_archive(
name = "com_google_absl",
strip_prefix = "abseil-cpp-master",
urls = ["https://github.com/abseil/abseil-cpp/archive/master.zip"],
sha256 = "57cadb5f4e35e479de395490994db5cd91a23b3a4d6fba85ffbe86590d70f606", # 2019-05-07
strip_prefix = "abseil-cpp-aa468ad75539619b47979911297efbb629c52e44",
urls = ["https://github.com/abseil/abseil-cpp/archive/aa468ad75539619b47979911297efbb629c52e44.zip"],
)
# Abseil-py

2
cmake/SuperBuild.cmake
View File

@ -7,7 +7,7 @@ set(EXTRA_CMAKE_ARGS)
ExternalProject_Add(absl
GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
GIT_TAG 88a152ae747c3c42dc9167d46c590929b048d436
GIT_TAG aa468ad75539619b47979911297efbb629c52e44 # 2019-05-07
# Just clone into directory
CONFIGURE_COMMAND ""
BUILD_COMMAND ""

2
sandboxed_api/BUILD.bazel
View File

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

2
sandboxed_api/client.cc
View File

@ -23,7 +23,7 @@
#include <glog/logging.h>
#include "google/protobuf/descriptor.h"
#include "google/protobuf/message.h"
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "absl/strings/str_cat.h"
#include "sandboxed_api/call.h"
#include "sandboxed_api/lenval_core.h"

2
sandboxed_api/examples/stringop/BUILD.bazel
View File

@ -28,9 +28,9 @@ cc_test(
"//sandboxed_api:vars",
"//sandboxed_api/examples/stringop/lib:stringop-sapi",
"//sandboxed_api/examples/stringop/lib:stringop_params_proto_cc",
"//sandboxed_api/util:flag",
"//sandboxed_api/util:status",
"//sandboxed_api/util:status_matchers",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/time",
"@com_google_googletest//:gtest_main",

2
sandboxed_api/examples/stringop/main_stringop.cc
View File

@ -19,7 +19,7 @@
#include <glog/logging.h>
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "absl/memory/memory.h"
#include "absl/time/time.h"
#include "sandboxed_api/examples/stringop/lib/sandbox.h"

2
sandboxed_api/examples/sum/BUILD.bazel
View File

@ -26,8 +26,8 @@ cc_binary(
"//sandboxed_api:vars",
"//sandboxed_api/examples/sum/lib:sum-sapi",
"//sandboxed_api/examples/sum/lib:sum_params_proto_cc",
"//sandboxed_api/util:flag",
"//sandboxed_api/util:status",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/strings",
],

2
sandboxed_api/examples/sum/main_sum.cc
View File

@ -17,7 +17,7 @@
#include <sys/types.h>
#include <glog/logging.h>
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "absl/memory/memory.h"
#include "absl/strings/str_cat.h"
#include "sandboxed_api/examples/sum/lib/sandbox.h"

2
sandboxed_api/examples/zlib/BUILD.bazel
View File

@ -42,7 +42,7 @@ cc_binary(
":zlib-sapi",
":zlib-sapi_embed",
"//sandboxed_api:vars",
"//sandboxed_api/util:flag",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/flags:flag",
],
)

2
sandboxed_api/examples/zlib/main_zlib.cc
View File

@ -17,7 +17,7 @@
#include <glog/logging.h>
#include "absl/base/macros.h"
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "sandboxed_api/examples/zlib/zlib-sapi.sapi.h"
#include "sandboxed_api/examples/zlib/zlib-sapi_embed.h"
#include "sandboxed_api/vars.h"

6
sandboxed_api/sandbox2/BUILD.bazel
View File

@ -185,8 +185,8 @@ cc_library(
":syscall",
":violation_proto_cc",
"//sandboxed_api/sandbox2/util:bpf_helper",
"//sandboxed_api/util:flag",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/types:optional",
"@org_kernel_libcap//:libcap",
],
@ -303,7 +303,7 @@ cc_library(
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/container:flat_hash_set",
"//sandboxed_api/util:flag",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
@ -728,8 +728,8 @@ cc_test(
"//sandboxed_api/sandbox2/util:bpf_helper",
"//sandboxed_api/sandbox2/util:fileops",
"//sandboxed_api/sandbox2/util:temp_file",
"//sandboxed_api/util:flag",
"//sandboxed_api/util:status_matchers",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/strings",
"@com_google_googletest//:gtest_main",

12
sandboxed_api/sandbox2/CMakeLists.txt
View File

@ -187,6 +187,7 @@ add_library(sandbox2_policy STATIC
add_library(sandbox2::policy ALIAS sandbox2_policy)
target_link_libraries(sandbox2_policy PRIVATE
absl::core_headers
absl::flags
absl::optional
libcap::libcap
sandbox2::bpf_helper
@ -197,7 +198,6 @@ target_link_libraries(sandbox2_policy PRIVATE
sandbox2::syscall
sandbox2::violation_proto
sapi::base
sapi::flag
)
# sandboxed_api/sandbox2:notify
@ -284,6 +284,7 @@ add_library(sandbox2::sandbox2 ALIAS sandbox2_sandbox2)
target_link_libraries(sandbox2_sandbox2
PRIVATE absl::core_headers
absl::flat_hash_map
absl::flags
absl::flat_hash_set
absl::memory
absl::optional
@ -318,8 +319,7 @@ target_link_libraries(sandbox2_sandbox2
sapi::base
sapi::status
sapi::statusor
PUBLIC sapi::flag
sandbox2::logsink
PUBLIC sandbox2::logsink
)
# sandboxed_api/sandbox2:client
@ -770,6 +770,7 @@ add_dependencies(stack-trace_test
sandbox2::testcase_symbolize
)
target_link_libraries(stack-trace_test PRIVATE
absl::flags
absl::memory
absl::strings
sandbox2::bpf_helper
@ -781,7 +782,6 @@ target_link_libraries(stack-trace_test PRIVATE
sandbox2::util
sapi::status_matchers
sapi::test_main
sapi::flag
)
gtest_discover_tests(stack-trace_test PROPERTIES
ENVIRONMENT "TEST_TMPDIR=/tmp"
@ -796,6 +796,7 @@ add_dependencies(ipc_test
sandbox2::testcase_ipc
)
target_link_libraries(ipc_test PRIVATE
absl::flags
absl::memory
sandbox2::bpf_helper
sandbox2::comms
@ -803,7 +804,6 @@ target_link_libraries(ipc_test PRIVATE
sandbox2::testing
sapi::status_matchers
sapi::test_main
sapi::flag
)
gtest_discover_tests(ipc_test PROPERTIES
ENVIRONMENT "TEST_TMPDIR=/tmp"
@ -845,6 +845,7 @@ add_dependencies(policybuilder_test
sandbox2::testcase_print_fds
)
target_link_libraries(policybuilder_test PRIVATE
absl::flags
absl::memory
absl::strings
glog::glog
@ -854,7 +855,6 @@ target_link_libraries(policybuilder_test PRIVATE
sandbox2::testing
sapi::status_matchers
sapi::test_main
sapi::flag
)
gtest_discover_tests(policybuilder_test PROPERTIES
ENVIRONMENT "TEST_TMPDIR=/tmp"

4
sandboxed_api/sandbox2/examples/crc4/BUILD.bazel
View File

@ -34,7 +34,7 @@ cc_binary(
"//sandboxed_api/sandbox2:comms",
"//sandboxed_api/sandbox2/util:bpf_helper",
"//sandboxed_api/sandbox2/util:runfiles",
"//sandboxed_api/util:flag",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/memory",
],
)
@ -48,8 +48,8 @@ cc_binary(
"//sandboxed_api/sandbox2:client",
"//sandboxed_api/sandbox2:comms",
"//sandboxed_api/sandbox2:util",
"//sandboxed_api/util:flag",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/flags:flag",
],
)

2
sandboxed_api/sandbox2/examples/crc4/crc4bin.cc
View File

@ -21,7 +21,7 @@
#include <cstring>
#include <glog/logging.h>
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "sandboxed_api/sandbox2/client.h"
#include "sandboxed_api/sandbox2/comms.h"
#include "sandboxed_api/sandbox2/util.h"

4
sandboxed_api/sandbox2/examples/crc4/crc4sandbox.cc
View File

@ -28,7 +28,7 @@
#include <vector>
#include <glog/logging.h>
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "absl/memory/memory.h"
#include "sandboxed_api/sandbox2/comms.h"
#include "sandboxed_api/sandbox2/executor.h"
@ -41,7 +41,7 @@
#include "sandboxed_api/sandbox2/util/bpf_helper.h"
#include "sandboxed_api/sandbox2/util/runfiles.h"
ABSL_FLAG(string, input, "", "Input to calculate CRC4 of.");
ABSL_FLAG(std::string, input, "", "Input to calculate CRC4 of.");
ABSL_FLAG(bool, call_syscall_not_allowed, false,
"Have sandboxee call clone (violation).");

4
sandboxed_api/sandbox2/examples/custom_fork/BUILD.bazel
View File

@ -31,9 +31,9 @@ cc_binary(
"//sandboxed_api/sandbox2:comms",
"//sandboxed_api/sandbox2:forkserver",
"//sandboxed_api/sandbox2/util:runfiles",
"//sandboxed_api/util:flag",
"//sandboxed_api/util:raw_logging",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/memory",
],
)
@ -46,7 +46,7 @@ cc_binary(
deps = [
"//sandboxed_api/sandbox2:comms",
"//sandboxed_api/sandbox2:forkingclient",
"//sandboxed_api/util:flag",
"//sandboxed_api/util:raw_logging",
"@com_google_absl//absl/flags:flag",
],
)

2
sandboxed_api/sandbox2/examples/custom_fork/custom_fork_bin.cc
View File

@ -20,7 +20,7 @@
#include <cstdint>
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "sandboxed_api/sandbox2/comms.h"
#include "sandboxed_api/sandbox2/forkingclient.h"
#include "sandboxed_api/util/raw_logging.h"

2
sandboxed_api/sandbox2/examples/custom_fork/custom_fork_sandbox.cc
View File

@ -24,7 +24,7 @@
#include <vector>
#include <glog/logging.h>
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "absl/memory/memory.h"
#include "sandboxed_api/sandbox2/comms.h"
#include "sandboxed_api/sandbox2/executor.h"

2
sandboxed_api/sandbox2/examples/static/BUILD.bazel
View File

@ -33,7 +33,7 @@ cc_binary(
"//sandboxed_api/sandbox2",
"//sandboxed_api/sandbox2/util:bpf_helper",
"//sandboxed_api/sandbox2/util:runfiles",
"//sandboxed_api/util:flag",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/memory",
],
)

2
sandboxed_api/sandbox2/examples/static/static_sandbox.cc
View File

@ -28,7 +28,7 @@
#include <vector>
#include <glog/logging.h>
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "absl/memory/memory.h"
#include "sandboxed_api/sandbox2/executor.h"
#include "sandboxed_api/sandbox2/ipc.h"

2
sandboxed_api/sandbox2/examples/tool/BUILD.bazel
View File

@ -33,7 +33,7 @@ cc_binary(
"//sandboxed_api/sandbox2",
"//sandboxed_api/sandbox2:util",
"//sandboxed_api/sandbox2/util:bpf_helper",
"//sandboxed_api/util:flag",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",

6
sandboxed_api/sandbox2/examples/tool/sandbox2tool.cc
View File

@ -30,7 +30,7 @@
#include <vector>
#include <glog/logging.h>
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "absl/memory/memory.h"
#include "absl/strings/str_format.h"
#include "absl/strings/str_split.h"
@ -69,9 +69,9 @@ ABSL_FLAG(uint64_t, sandbox2tool_walltime_timeout, 60U,
"Wall-time timeout in seconds (if >0)");
ABSL_FLAG(uint64_t, sandbox2tool_file_size_creation_limit, 1024U,
"Maximum size of created files");
ABSL_FLAG(string, sandbox2tool_cwd, "/",
ABSL_FLAG(std::string, sandbox2tool_cwd, "/",
"If not empty, chdir to the directory before sandboxed");
ABSL_FLAG(string, sandbox2tool_additional_bind_mounts, "",
ABSL_FLAG(std::string, sandbox2tool_additional_bind_mounts, "",
"If user namespaces are enabled, this option will add additional "
"bind mounts. Mounts are separated by comma and can optionally "
"specify a target using \"=>\" "

2
sandboxed_api/sandbox2/examples/zlib/BUILD.bazel
View File

@ -27,7 +27,7 @@ cc_binary(
"//sandboxed_api/sandbox2:comms",
"//sandboxed_api/sandbox2/util:bpf_helper",
"//sandboxed_api/sandbox2/util:runfiles",
"//sandboxed_api/util:flag",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/memory",
],
)

6
sandboxed_api/sandbox2/examples/zlib/zpipe_sandbox.cc
View File

@ -27,7 +27,7 @@
#include <vector>
#include <glog/logging.h>
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "absl/memory/memory.h"
#include "sandboxed_api/sandbox2/comms.h"
#include "sandboxed_api/sandbox2/executor.h"
@ -40,8 +40,8 @@
#include "sandboxed_api/sandbox2/util/bpf_helper.h"
#include "sandboxed_api/sandbox2/util/runfiles.h"
ABSL_FLAG(string, input, "", "Input file");
ABSL_FLAG(string, output, "", "Output file");
ABSL_FLAG(std::string, input, "", "Input file");
ABSL_FLAG(std::string, output, "", "Output file");
ABSL_FLAG(bool, decompress, false, "Decompress instead of compress.");
namespace {

4
sandboxed_api/sandbox2/monitor.cc
View File

@ -42,7 +42,7 @@
#include <string>
#include <glog/logging.h>
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "absl/memory/memory.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
@ -69,7 +69,7 @@ ABSL_FLAG(bool, sandbox2_report_on_sandboxee_timeout, true,
"Report sandbox2 sandboxee timeouts");
ABSL_DECLARE_FLAG(bool, sandbox2_danger_danger_permit_all);
ABSL_DECLARE_FLAG(string, sandbox2_danger_danger_permit_all_and_log);
ABSL_DECLARE_FLAG(std::string, sandbox2_danger_danger_permit_all_and_log);
namespace sandbox2 {

5
sandboxed_api/sandbox2/policy.cc
View File

@ -27,7 +27,7 @@
#include <string>
#include <glog/logging.h>
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "external/org_kernel_libcap/libcap/include/sys/capability.h"
#include "sandboxed_api/sandbox2/bpfdisassembler.h"
#include "sandboxed_api/sandbox2/comms.h"
@ -37,8 +37,7 @@
ABSL_FLAG(bool, sandbox2_danger_danger_permit_all, false,
"Allow all syscalls, useful for testing");
ABSL_FLAG(string, sandbox2_danger_danger_permit_all_and_log, "",
ABSL_FLAG(std::string, sandbox2_danger_danger_permit_all_and_log, "",
"Allow all syscalls and log them into specified file");
namespace sandbox2 {

2
sandboxed_api/sandbox2/stack-trace.cc
View File

@ -24,7 +24,7 @@
#include <vector>
#include <glog/logging.h>
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "absl/memory/memory.h"
#include "absl/strings/numbers.h"
#include "absl/strings/str_cat.h"

2
sandboxed_api/sandbox2/stack-trace.h
View File

@ -24,7 +24,7 @@
#include <memory>
#include <string>
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "sandboxed_api/sandbox2/mounts.h"
#include "sandboxed_api/sandbox2/policy.h"
#include "sandboxed_api/sandbox2/regs.h"

4
sandboxed_api/sandbox2/stack-trace_test.cc
View File

@ -19,7 +19,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "sandboxed_api/util/flag.h"
#include "absl/flags/flag.h"
#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
@ -48,7 +48,7 @@ namespace {
template <typename T>
class TemporaryFlagOverride {
public:
using Flag = T;
using Flag = absl::Flag<T>;
TemporaryFlagOverride(Flag* flag, T value)
: flag_(flag), original_value_(absl::GetFlag(*flag)) {
absl::SetFlag(flag, value);

2
sandboxed_api/sandbox2/util/BUILD.bazel
View File

@ -221,9 +221,9 @@ cc_library(
copts = sapi_platform_copts(),
deps = [
":file_base",
"//sandboxed_api/util:flag",
"//sandboxed_api/util:raw_logging",
"@bazel_tools//tools/cpp/runfiles",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
],

2
sandboxed_api/sandbox2/util/CMakeLists.txt
View File

@ -210,10 +210,10 @@ add_library(sandbox2_util_runfiles STATIC
)
add_library(sandbox2::runfiles ALIAS sandbox2_util_runfiles)
target_link_libraries(sandbox2_util_runfiles PRIVATE
absl::flags
absl::str_format
absl::strings
sandbox2::file_base
sapi::base
sapi::flag
sapi::raw_logging
)

5
sandboxed_api/sandbox2/util/runfiles.cc
View File

@ -14,10 +14,10 @@
#include <cstdlib>
#include "absl/flags/internal/program_name.h"
#include "absl/strings/str_format.h"
#include "sandboxed_api/sandbox2/util/path.h"
#include "sandboxed_api/sandbox2/util/runfiles.h"
#include "sandboxed_api/util/flag.h"
#include "sandboxed_api/util/raw_logging.h"
#include "tools/cpp/runfiles/runfiles.h"
@ -28,7 +28,8 @@ namespace sandbox2 {
std::string GetDataDependencyFilePath(absl::string_view relative_path) {
static Runfiles* runfiles = []() {
std::string error;
auto* runfiles = Runfiles::Create(gflags::GetArgv0(), &error);
auto* runfiles =
Runfiles::Create(absl::flags_internal::ProgramInvocationName(), &error);
SAPI_RAW_CHECK(runfiles != nullptr, "%s", error);
// Setup environment for child processes.

8
sandboxed_api/util/BUILD.bazel
View File

@ -115,14 +115,6 @@ cc_test(
],
)
# Compatibility layer for Abseil's flags vs. gFlags
cc_library(
name = "flag",
hdrs = ["flag.h"],
copts = sapi_platform_copts(),
deps = ["@com_github_gflags_gflags//:gflags"],
)
# Small support library emulating verbose logging using Abseil's raw logging
# facility.
cc_library(

9
sandboxed_api/util/CMakeLists.txt
View File

@ -81,15 +81,6 @@ target_link_libraries(status_test PRIVATE
)
gtest_discover_tests(status_test)
# sandboxed_api/util:flag
add_library(sapi_util_flag STATIC
flag.h
)
add_library(sapi::flag ALIAS sapi_util_flag)
target_link_libraries(sapi_util_flag PUBLIC
gflags
)
# sandboxed_api/util:raw_logging
add_library(sapi_util_raw_logging STATIC
raw_logging.cc

49
sandboxed_api/util/flag.h
View File

@ -1,49 +0,0 @@
// Copyright 2019 Google LLC. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SANDBOXED_API_UTIL_FLAG_H_
#define SANDBOXED_API_UTIL_FLAG_H_
#include <gflags/gflags.h>
#define ABSL_FLAG(type, name, default_value, help) \
DEFINE_##type(name, default_value, help)
#define ABSL_RETIRED_FLAG ABSL_FLAG
#define ABSL_DECLARE_FLAG(type, name) DECLARE_##type(name)
// Internal defines for compatility with gflags and standard integer types.
#define DECLARE_int32_t DECLARE_int32
#define DECLARE_int64_t DECLARE_int64
#define DECLARE_uint32_t DECLARE_uint32
#define DECLARE_uint64_t DECLARE_uint64
#define DEFINE_int32_t DEFINE_int32
#define DEFINE_int64_t DEFINE_int64
#define DEFINE_uint32_t DEFINE_uint32
#define DEFINE_uint64_t DEFINE_uint64
namespace absl {
template <typename T>
const T& GetFlag(const T& flag) {
return flag;
}
template <typename T>
void SetFlag(T* flag, const T& value) {
*flag = value;
}
} // namespace absl
#endif // SANDBOXED_API_UTIL_FLAG_H_