Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow passing label to node_create #811

Merged
merged 1 commit into from
Apr 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions docs/abi.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,21 +176,23 @@ return the channel handles for its read and write halves.

### node_create

`node_create: (usize, usize, usize, usize, u64) -> u32` creates a new Node
running the Node configuration identified by args 0 and 1, using the entrypoint
specified by args 2 and 3, passing in an initial handle to the read half of a
channel identified by arg 4. The entrypoint name is ignored when creating
non-WebAssembly Nodes.
`node_create: (usize, usize, usize, usize, usize, usize, u64) -> u32` creates a
new Node running the Node configuration identified by args 0 and 1, using the
entrypoint specified by args 2 and 3, passing in an initial handle to the read
half of a channel identified by arg 4. The entrypoint name is ignored when
creating non-WebAssembly Nodes.

If creating the specified node would violate
[information flow control](/docs/concepts.md#labels), returns
`PERMISSION_DENIED`.

- arg 0: Source buffer holding node configuration name
- arg 1: Node configuration name size in bytes
- arg 2: Source buffer holding entrypoint name.
- arg 2: Source buffer holding entrypoint name
- arg 3: Entrypoint name size in bytes
- arg 4: Handle to channel
- arg 4: Source buffer holding label
- arg 5: Label size in bytes
- arg 6: Handle to channel
- return 0: Status of operation

### random_get
Expand Down
43 changes: 43 additions & 0 deletions examples/abitest/module_0/rust/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use byteorder::WriteBytesExt;
use expect::{expect, expect_eq, expect_matches};
use log::{debug, info};
use oak::{grpc, ChannelReadStatus, OakError, OakStatus};
use oak_abi::label::Label;
use prost::Message;
use proto::{
AbiTestRequest, AbiTestResponse, GrpcTestRequest, GrpcTestResponse, OakAbiTestService,
Expand Down Expand Up @@ -991,14 +992,50 @@ impl FrontendNode {

let valid = "a_string";
let non_utf8_name: Vec<u8> = vec![0xc3, 0x28];
let valid_label_bytes = Label::public_trusted().serialize();

// This sequence of bytes should not deserialize as a [`oak_abi::proto::policy::Label`]
// protobuf. We make sure here that this continues to be the case by making sure that
// [`Label::deserialize`] fails to parse these bytes.
let invalid_label_bytes = vec![0, 88, 0];
assert_eq!(None, Label::deserialize(&invalid_label_bytes));

unsafe {
expect_eq!(
OakStatus::Ok as u32,
oak_abi::node_create(
BACKEND_CONFIG_NAME.as_ptr(),
BACKEND_CONFIG_NAME.len(),
BACKEND_ENTRYPOINT_NAME.as_ptr(),
BACKEND_ENTRYPOINT_NAME.len(),
valid_label_bytes.as_ptr(),
valid_label_bytes.len(),
in_channel
)
);

expect_eq!(
OakStatus::ErrInvalidArgs as u32,
oak_abi::node_create(
BACKEND_CONFIG_NAME.as_ptr(),
BACKEND_CONFIG_NAME.len(),
BACKEND_ENTRYPOINT_NAME.as_ptr(),
BACKEND_ENTRYPOINT_NAME.len(),
invalid_label_bytes.as_ptr(),
invalid_label_bytes.len(),
in_channel
)
);

expect_eq!(
OakStatus::ErrInvalidArgs as u32,
oak_abi::node_create(
invalid_raw_offset() as *mut u8,
1,
valid.as_ptr(),
valid.len(),
valid_label_bytes.as_ptr(),
valid_label_bytes.len(),
in_channel
)
);
Expand All @@ -1010,6 +1047,8 @@ impl FrontendNode {
non_utf8_name.len(),
valid.as_ptr(),
valid.len(),
valid_label_bytes.as_ptr(),
valid_label_bytes.len(),
in_channel
)
);
Expand All @@ -1021,6 +1060,8 @@ impl FrontendNode {
valid.len(),
invalid_raw_offset() as *mut u8,
1,
valid_label_bytes.as_ptr(),
valid_label_bytes.len(),
in_channel
)
);
Expand All @@ -1032,6 +1073,8 @@ impl FrontendNode {
valid.len(),
non_utf8_name.as_ptr(),
non_utf8_name.len(),
valid_label_bytes.as_ptr(),
valid_label_bytes.len(),
in_channel
)
);
Expand Down
2 changes: 2 additions & 0 deletions oak/server/rust/oak_abi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ extern "C" {
config_len: usize,
entrypoint_buf: *const u8,
entrypoint_len: usize,
label_buf: *const u8,
label_len: usize,
handle: u64,
) -> u32;

Expand Down
Loading