Move sessions logic into its own crate

remove unused deps

format

oak-prefix crate name for consistency

fix typo

Author: Juliette Pretot

Cargo.lock

@@ -45,6 +45,7 @@ members = [
   "oak_functions/util",
   "oak_idl",
   "remote_attestation/rust",
+  "remote_attestation_sessions",
   "xtask",
 ]
 exclude = [

Cargo.toml

@@ -19,13 +19,13 @@ syntax = "proto3";
 package oak.experimental.uefi;
 
 message EchoRequest {
-    bytes message = 1;
+  bytes message = 1;
 }
 
 message EchoResponse {
-    bytes message = 1;
+  bytes message = 1;
 }
 
 service Echo {
-    rpc Echo(EchoRequest) returns (EchoResponse) {}
+  rpc Echo(EchoRequest) returns (EchoResponse) {}
 }

experimental/uefi/proto/echo.proto

@@ -7,6 +7,7 @@ license = "Apache-2.0"
 
 [dependencies]
 oak_remote_attestation = { path = "../remote_attestation/rust/" }
+oak_remote_attestation_sessions = { path = "../remote_attestation_sessions/" }
 oak_functions_abi = { path = "../oak_functions/abi/" }
 anyhow = "*"
 prost = "*"
@@ -19,6 +20,7 @@ tokio = { version = "*", features = [
   "sync",
   "rt-multi-thread"
 ] }
+oak_utils = { path = "../oak_utils" }
 tonic = "*"
 tower = "*"
 rand = "*"

grpc_unary_attestation/Cargo.toml

@@ -17,10 +17,10 @@
 use crate::proto::{unary_session_client::UnarySessionClient, UnaryRequest};
 use anyhow::Context;
 use oak_functions_abi;
-use oak_remote_attestation::{
-    handshaker::{AttestationBehavior, ClientHandshaker, Encryptor, ServerIdentityVerifier},
-    sessions::SessionId,
+use oak_remote_attestation::handshaker::{
+    AttestationBehavior, ClientHandshaker, Encryptor, ServerIdentityVerifier,
 };
+use oak_remote_attestation_sessions::SessionId;
 use tonic::transport::Channel;
 
 /// gRPC Attestation Service client implementation.

grpc_unary_attestation/src/client.rs

@@ -18,8 +18,7 @@
 //! protocol.
 
 use crate::proto::{unary_session_server::UnarySession, UnaryRequest, UnaryResponse};
-use lru::LruCache;
-use oak_remote_attestation::sessions::{SessionId, SessionState, SessionTracker};
+use oak_remote_attestation_sessions::{SessionId, SessionState, SessionTracker};
 use oak_utils::LogError;
 use std::{convert::TryInto, sync::Mutex};
 use tonic;

grpc_unary_attestation/src/server.rs

@@ -15,8 +15,6 @@ bytes = { version = "*", default-features = false }
 log = "*"
 prost = { version = "*", default-features = false, features = ["prost-derive"] }
 ring = { path = "../../third_party/ring", default-features = false }
-lru = "*"
-oak_utils = { path = "../../oak_utils"}
 
 [build-dependencies]
 prost-build = "*"

oak_functions/loader/fuzz/Cargo.lock

@@ -27,6 +27,5 @@ pub mod crypto;
 pub mod handshaker;
 pub mod message;
 pub mod report;
-pub mod sessions;
 #[cfg(test)]
 mod tests;

remote_attestation/rust/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "oak_remote_attestation_sessions"
+version = "0.1.0"
+authors = ["Juliette Pretot <[email protected]>"]
+edition = "2021"
+license = "Apache-2.0"
+
+[features]
+default = []
+
+[dependencies]
+anyhow = { version = "*", default-features = false }
+oak_remote_attestation = { path = "../remote_attestation/rust/" }
+lru = "*"