Move reusable code from keylime-agent to the keylime library

keylime-agent/src/agent_handler.rs

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Keylime Authors
 
-use crate::common::JsonWrapper;
 use crate::{tpm, Error as KeylimeError, QuoteData};
 use actix_web::{http, web, HttpRequest, HttpResponse, Responder};
 use base64::{engine::general_purpose, Engine as _};
+use keylime::json_wrapper::JsonWrapper;
 use log::*;
 use serde::{Deserialize, Serialize};
 

keylime-agent/src/api.rs

@@ -1,15 +1,16 @@
 use crate::{
-    agent_handler, common::JsonWrapper, config, errors_handler, keys_handler,
+    agent_handler, config, errors_handler, keys_handler,
     notifications_handler, quotes_handler, QuoteData,
 };
 use actix_web::{http, web, HttpRequest, HttpResponse, Responder, Scope};
-use keylime::{list_parser::parse_list, version::KeylimeVersion};
+use keylime::{
+    config::SUPPORTED_API_VERSIONS, json_wrapper::JsonWrapper,
+    list_parser::parse_list, version::KeylimeVersion,
+};
 use log::*;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
-pub static SUPPORTED_API_VERSIONS: &[&str] = &["2.1", "2.2"];
-
 #[derive(Error, Debug, PartialEq)]
 pub enum APIError {
     #[error("API version \"{0}\" not supported")]

keylime-agent/src/errors_handler.rs

@@ -1,17 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2021 Keylime Authors
 
-use crate::{
-    common::{APIVersion, JsonWrapper},
-    QuoteData,
-};
+use crate::QuoteData;
 use actix_web::{
     body, dev,
     error::{InternalError, JsonPayloadError, PathError, QueryPayloadError},
     http,
     middleware::{ErrorHandlerResponse, ErrorHandlers},
     web, Error, HttpRequest, HttpResponse, Responder, Result,
 };
+use keylime::{json_wrapper::JsonWrapper, version::Version};
 use log::*;
 
 pub(crate) async fn app_default(
@@ -70,9 +68,9 @@ pub(crate) async fn app_default(
 
 pub(crate) async fn version_not_supported(
     req: HttpRequest,
-    version: web::Path<APIVersion>,
+    version: web::Path<Version>,
 ) -> impl Responder {
-    let message = format!("API version not supported: {version}");
+    let message = format!("API version not supported: v{version}");
 
     warn!("{} returning 400 response. {}", req.head().method, message);
 

keylime-agent/src/keys_handler.rs

@@ -2,18 +2,20 @@
 // Copyright 2021 Keylime Authors
 
 use crate::{
-    common::JsonWrapper,
     config::KeylimeConfig,
     payloads::{Payload, PayloadMessage},
     Error, QuoteData, Result,
 };
 use actix_web::{http, web, HttpRequest, HttpResponse, Responder};
 use base64::{engine::general_purpose, Engine as _};
-use keylime::crypto::{
-    self,
-    auth_tag::AuthTag,
-    encrypted_data::EncryptedData,
-    symmkey::{KeySet, SymmKey},
+use keylime::{
+    crypto::{
+        self,
+        auth_tag::AuthTag,
+        encrypted_data::EncryptedData,
+        symmkey::{KeySet, SymmKey},
+    },
+    json_wrapper::JsonWrapper,
 };
 use log::*;
 use serde::{Deserialize, Serialize};