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

Fix factory method sapi:✌️:Proto<>::FromMessage

Browse Source 
This was missing a friend declaration in order to actually compile.
It's now being used in the "stringop" example, so we test it as well.

Drive-by:
- Do not copy the proto's bytes the constructor, but use `std::move`
PiperOrigin-RevId: 387774353
Change-Id: Ic8824af911ac744e2e68130e1f4673c4dddd4939
This commit is contained in:
Christian Blichmann 2021-07-30 03:54:45 -07:00 committed by Copybara-Service
parent fd20eb0b4d
commit 8b1dfd7343
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sandboxed_api/BUILD.bazel
View File

@ -164,6 +164,7 @@ cc_library(
"@com_google_absl//absl/strings", "@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/strings:str_format",
"@com_google_absl//absl/synchronization", "@com_google_absl//absl/synchronization",
"@com_google_absl//absl/utility",
"@com_google_glog//:glog", "@com_google_glog//:glog",
], ],
) )

1
sandboxed_api/CMakeLists.txt
View File

@ -156,6 +156,7 @@ target_link_libraries(sapi_vars
absl::str_format absl::str_format
absl::strings absl::strings
absl::synchronization absl::synchronization
absl::utility
sandbox2::comms sandbox2::comms
sapi::base sapi::base
sapi::call sapi::call

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

@ -69,12 +69,12 @@ TEST(StringopTest, ProtobufStringReversal) {
stringop::StringReverse proto; stringop::StringReverse proto;
proto.set_input("Hello"); proto.set_input("Hello");
sapi::v::Proto<stringop::StringReverse> pp(proto); auto pp = sapi::v::Proto<stringop::StringReverse>::FromMessage(proto);
SAPI_ASSERT_OK_AND_ASSIGN(int return_value, SAPI_ASSERT_OK_AND_ASSIGN(int return_value,
api.pb_reverse_string(pp.PtrBoth())); api.pb_reverse_string(pp->PtrBoth()));
EXPECT_THAT(return_value, Ne(0)) << "pb_reverse_string() failed"; EXPECT_THAT(return_value, Ne(0)) << "pb_reverse_string() failed";
SAPI_ASSERT_OK_AND_ASSIGN(auto pb_result, pp.GetMessage()); SAPI_ASSERT_OK_AND_ASSIGN(auto pb_result, pp->GetMessage());
LOG(INFO) << "Result PB: " << pb_result.DebugString(); LOG(INFO) << "Result PB: " << pb_result.DebugString();
EXPECT_THAT(pb_result.output(), StrEq("olleH")); EXPECT_THAT(pb_result.output(), StrEq("olleH"));
} }

11
sandboxed_api/var_proto.h
View File

@ -24,6 +24,7 @@
#include "absl/base/macros.h" #include "absl/base/macros.h"
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "absl/utility/utility.h"
#include "sandboxed_api/proto_helper.h" #include "sandboxed_api/proto_helper.h"
#include "sandboxed_api/util/status_macros.h" #include "sandboxed_api/util/status_macros.h"
#include "sandboxed_api/var_lenval.h" #include "sandboxed_api/var_lenval.h"
@ -44,7 +45,7 @@ class Proto : public Pointable, public Var {
static absl::StatusOr<Proto<T>> FromMessage(const T& proto) { static absl::StatusOr<Proto<T>> FromMessage(const T& proto) {
SAPI_ASSIGN_OR_RETURN(std::vector<uint8_t> len_val, SerializeProto(proto)); SAPI_ASSIGN_OR_RETURN(std::vector<uint8_t> len_val, SerializeProto(proto));
return Proto(len_val); return absl::StatusOr<Proto<T>>(absl::in_place, proto);
} }
size_t GetSize() const final { return wrapped_var_.GetSize(); } size_t GetSize() const final { return wrapped_var_.GetSize(); }
@ -68,8 +69,8 @@ class Proto : public Pointable, public Var {
ABSL_DEPRECATED("Use GetMessage() instead") ABSL_DEPRECATED("Use GetMessage() instead")
std::unique_ptr<T> GetProtoCopy() const { std::unique_ptr<T> GetProtoCopy() const {
if (auto result_or = GetMessage(); result_or.ok()) { if (auto proto = GetMessage(); proto.ok()) {
return absl::make_unique<T>(std::move(result_or).value()); return absl::make_unique<T>(*std::move(proto));
} }
return nullptr; return nullptr;
} }
@ -102,7 +103,9 @@ class Proto : public Pointable, public Var {
} }
private: private:
explicit Proto(std::vector<uint8_t> data) : wrapped_var_(data) {} friend class absl::StatusOr<Proto<T>>;
explicit Proto(std::vector<uint8_t> data) : wrapped_var_(std::move(data)) {}
// The management of reading/writing the data to the sandboxee is handled by // The management of reading/writing the data to the sandboxee is handled by
// the LenVal class. // the LenVal class.