transaction added

This commit is contained in:
Katarzyna Miernikiewicz 2020-09-14 16:24:21 +00:00
parent 490ffeb683
commit 63147e42b3
6 changed files with 63 additions and 7 deletions

View File

@ -19,6 +19,7 @@
#include <iostream>
#include "jsonnet_sapi.sapi.h"
#include "sandboxed_api/util/flag.h"
class JsonnetSapiSandbox : public JsonnetSandbox {
public:
@ -66,12 +67,12 @@ int main(int argc, char *argv[]) {
// Initialize sandbox.
JsonnetSapiSandbox sandbox(in_file, out_file);
absl::Status status = sandbox.Init();
CHECK(status.ok()) << "Sandbox initialization failed " << status;
CHECK(status.ok()) << "Sandbox initialization failed: " << status;
JsonnetApi api(&sandbox);
// Initialize library's main structure.
sapi::StatusOr<JsonnetVm *> jsonnet_vm = api.c_jsonnet_make();
sapi::StatusOr<JsonnetVm*> jsonnet_vm = api.c_jsonnet_make();
sapi::v::RemotePtr vm_pointer(jsonnet_vm.value());
CHECK(jsonnet_vm.ok()) << "JsonnetVm initialization failed: "
<< jsonnet_vm.status();
@ -80,9 +81,9 @@ int main(int argc, char *argv[]) {
std::string in_file_in_sandboxee(std::string("/input/") +
basename(&in_file[0]));
sapi::v::ConstCStr in_file_var(in_file_in_sandboxee.c_str());
sapi::StatusOr<char *> input =
sapi::StatusOr<char*> input =
api.c_read_input(false, in_file_var.PtrBefore());
CHECK(input.ok()) << "Reading input file failed " << input.status();
CHECK(input.ok()) << "Reading input file failed: " << input.status();
// Process jsonnet data.
sapi::v::RemotePtr input_pointer(input.value());
@ -105,11 +106,11 @@ int main(int argc, char *argv[]) {
success = api.c_write_output_file(&output_pointer, out_file_var.PtrBefore());
CHECK(success.ok() && success.value())
<< "Writing to output file failed " << success.status() << " "
<< "Writing to output file failed: " << success.status() << " "
<< success.value();
// Clean up.
sapi::StatusOr<char *> result =
sapi::StatusOr<char*> result =
api.c_jsonnet_realloc(&vm_pointer, &output_pointer, 0);
CHECK(result.ok()) << "JsonnetVm realloc failed: " << result.status();

View File

@ -12,3 +12,39 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "jsonnet_base_transaction.h"
absl::Status JsonnetTransaction::Main() {
JsonnetApi api(sandbox());
SAPI_ASSIGN_OR_RETURN(JsonnetVm* jsonnet_vm, api.c_jsonnet_make());
sapi::v::RemotePtr vm_pointer(jsonnet_vm);
std::string in_file_in_sandboxee(std::string("/input/") +
basename(&in_file_[0]));
sapi::v::ConstCStr in_file_var(in_file_in_sandboxee.c_str());
SAPI_ASSIGN_OR_RETURN(char* input, api.c_read_input(false, in_file_var.PtrBefore()));
sapi::v::RemotePtr input_pointer(input);
sapi::v::Int error;
SAPI_ASSIGN_OR_RETURN(char* output, api.c_jsonnet_evaluate_snippet(&vm_pointer, in_file_var.PtrBefore(), &input_pointer, error.PtrAfter()));
TRANSACTION_FAIL_IF_NOT(error.GetValue() != 0, "Jsonnet code evaluation failed.");
std::string out_file_in_sandboxee(std::string("/output/") +
basename(&out_file_[0]));
sapi::v::ConstCStr out_file_var(out_file_in_sandboxee.c_str());
sapi::v::RemotePtr output_pointer(output);
SAPI_ASSIGN_OR_RETURN(bool success, api.c_write_output_file(&output_pointer, out_file_var.PtrBefore()));
TRANSACTION_FAIL_IF_NOT(success, "Writing to output file failed.");
SAPI_ASSIGN_OR_RETURN(char* result, api.c_jsonnet_realloc(&vm_pointer, &output_pointer, 0));
SAPI_RETURN_IF_ERROR(api.c_jsonnet_destroy(&vm_pointer));
SAPI_RETURN_IF_ERROR(api.c_free_input(&input_pointer));
return absl::OkStatus();
}

View File

@ -23,7 +23,7 @@
class JsonnetSapiTransactionSandbox : public JsonnetSandbox {
public:
explicit JsonnetSapiTransactionSandbox(std::string in_file, std::string out_file)
: in_file_(std::move(in_file)), out_file_(std::move(out_file)) {}
: in_file_(in_file), out_file_(out_file) {}
std::unique_ptr<sandbox2::Policy> ModifyPolicy(
sandbox2::PolicyBuilder *) override {
@ -49,3 +49,19 @@ class JsonnetSapiTransactionSandbox : public JsonnetSandbox {
std::string out_file_;
};
class JsonnetTransaction : public sapi::Transaction {
public:
JsonnetTransaction(std::string in_file, std::string out_file)
: sapi::Transaction(std::make_unique<JsonnetSapiTransactionSandbox>(in_file, out_file)),
in_file_(in_file), out_file_(out_file)
{
sapi::Transaction::set_retry_count(0); // Try once, no retries
sapi::Transaction::SetTimeLimit(0); // Infinite time limit
}
private:
absl::Status Main() override;
std::string in_file_;
std::string out_file_;
};

View File

@ -19,6 +19,7 @@
#include <iostream>
#include "jsonnet_sapi.sapi.h"
#include "sandboxed_api/util/flag.h"
class JsonnetSapiSandbox : public JsonnetSandbox {
public:

View File

@ -20,6 +20,7 @@
#include "jsonnet_sapi.sapi.h"
#include "sandboxed_api/sandbox2/util/path.h"
#include "sandboxed_api/util/flag.h"
class JsonnetSapiSandbox : public JsonnetSandbox {
public:

View File

@ -19,6 +19,7 @@
#include <iostream>
#include "jsonnet_sapi.sapi.h"
#include "sandboxed_api/util/flag.h"
class JsonnetSapiSandbox : public JsonnetSandbox {
public: