Add support for reading pRPC arguments from the URL query string

Cargo.toml

@@ -131,8 +131,8 @@ rcgen = { version = "0.13.1", features = ["pem"] }
 x509-parser = "0.16.0"
 
 # RPC/Protocol
-prpc = "0.3.0"
-prpc-build = "0.3.6"
+prpc = "0.4.0"
+prpc-build = "0.4.1"
 
 # Development/Testing
 bindgen = "0.70.1"

kms/src/main.rs

@@ -1,14 +1,14 @@
 use anyhow::{anyhow, Context, Result};
 use clap::Parser;
 use config::KmsConfig;
+use main_service::{KmsState, RpcHandler};
 use ra_rpc::rocket_helper::QuoteVerifier;
 use rocket::fairing::AdHoc;
 use tracing::info;
 
 mod config;
 mod ct_log;
 mod main_service;
-mod web_routes;
 
 fn app_version() -> String {
     const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -53,7 +53,7 @@ async fn main() -> Result<()> {
                 res.set_raw_header("X-App-Version", app_version());
             })
         }))
-        .mount("/", web_routes::routes())
+        .mount("/prpc", ra_rpc::prpc_routes!(KmsState, RpcHandler))
         .manage(state);
 
     if !pccs_url.is_empty() {

kms/src/main_service.rs

@@ -198,14 +198,7 @@ impl KmsRpc for RpcHandler {
 impl RpcCall<KmsState> for RpcHandler {
     type PrpcService = KmsServer<Self>;
 
-    fn into_prpc_service(self) -> Self::PrpcService {
-        KmsServer::new(self)
-    }
-
-    fn construct(context: CallContext<'_, KmsState>) -> Result<Self>
-    where
-        Self: Sized,
-    {
+    fn construct(context: CallContext<'_, KmsState>) -> Result<Self> {
         Ok(RpcHandler {
             state: context.state.clone(),
             attestation: context.attestation,

ra-rpc/src/lib.rs

@@ -33,31 +33,40 @@ pub struct CallContext<'a, State> {
     pub remote_endpoint: Option<RemoteEndpoint>,
 }
 
-pub trait RpcCall<State> {
-    type PrpcService: PrpcService + Send + 'static;
+pub trait RpcCall<State>: Sized {
+    type PrpcService: PrpcService + From<Self> + Send + 'static;
 
-    fn construct(context: CallContext<'_, State>) -> Result<Self>
-    where
-        Self: Sized;
-    fn into_prpc_service(self) -> Self::PrpcService;
-    async fn call(self, method: String, payload: Vec<u8>, is_json: bool) -> (u16, Vec<u8>)
-    where
-        Self: Sized,
-    {
-        dispatch_prpc(method, payload, is_json, self.into_prpc_service()).await
+    fn construct(context: CallContext<'_, State>) -> Result<Self>;
+
+    async fn call(
+        self,
+        method: String,
+        payload: Vec<u8>,
+        is_json: bool,
+        is_query: bool,
+    ) -> (u16, Vec<u8>) {
+        dispatch_prpc(
+            method,
+            payload,
+            is_json,
+            is_query,
+            <Self::PrpcService as From<Self>>::from(self),
+        )
+        .await
     }
 }
 
 async fn dispatch_prpc(
     path: String,
     data: Vec<u8>,
     json: bool,
+    query: bool,
     server: impl PrpcService + Send + 'static,
 ) -> (u16, Vec<u8>) {
     use prpc::server::Error;
 
     info!("dispatching request: {}", path);
-    let result = server.dispatch_request(&path, data, json).await;
+    let result = server.dispatch_request(&path, data, json, query).await;
     let (code, data) = match result {
         Ok(data) => (200, data),
         Err(err) => {