feat!: implement encryption scheme logic in storage

htsget-config/src/encryption_scheme.rs

@@ -1,10 +1,7 @@
 //! Types related to the experimental encryption scheme.
 //!
 
-use crate::error::Error;
-use crate::error::Result;
 use serde::{Deserialize, Serialize};
-use std::str::FromStr;
 
 /// The file encryption scheme
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]

htsget-config/src/storage/file.rs

@@ -33,7 +33,8 @@ impl File {
       scheme,
       authority,
       local_path,
-      ..Default::default()
+      #[cfg(feature = "experimental")]
+      keys: None,
     }
   }
 

htsget-config/src/types.rs

@@ -409,13 +409,6 @@ impl Query {
     self
   }
 
-  /// Set the encryption scheme.
-  #[cfg(feature = "experimental")]
-  pub fn with_encryption_scheme(mut self, encryption_scheme: EncryptionScheme) -> Self {
-    self.encryption_scheme = Some(encryption_scheme);
-    self
-  }
-
   /// Id.
   pub fn id(&self) -> &str {
     &self.id
@@ -460,6 +453,19 @@ impl Query {
   pub fn request(&self) -> &Request {
     &self.request
   }
+
+  /// Set the encryption scheme.
+  #[cfg(feature = "experimental")]
+  pub fn with_encryption_scheme(mut self, encryption_scheme: EncryptionScheme) -> Self {
+    self.encryption_scheme = Some(encryption_scheme);
+    self
+  }
+
+  /// Get the encryption scheme
+  #[cfg(feature = "experimental")]
+  pub fn encryption_scheme(&self) -> Option<EncryptionScheme> {
+    self.encryption_scheme
+  }
 }
 
 /// Htsget specific errors.

htsget-search/src/from_storage.rs

@@ -51,21 +51,21 @@ impl HtsGet for HtsGetFromStorage {
 #[async_trait]
 impl ResolveResponse for HtsGetFromStorage {
   async fn from_file(file_storage: &storage::file::File, query: &Query) -> Result<Response> {
-    let storage = Storage::from_file(file_storage).await?;
+    let storage = Storage::from_file(file_storage, query).await?;
     let searcher = HtsGetFromStorage::new(storage);
     searcher.search(query.clone()).await
   }
 
   #[cfg(feature = "aws")]
   async fn from_s3(s3_storage: &storage::s3::S3, query: &Query) -> Result<Response> {
-    let storage = Storage::from_s3(s3_storage).await;
+    let storage = Storage::from_s3(s3_storage, query).await;
     let searcher = HtsGetFromStorage::new(storage?);
     searcher.search(query.clone()).await
   }
 
   #[cfg(feature = "url")]
   async fn from_url(url_storage_config: &storage::url::Url, query: &Query) -> Result<Response> {
-    let storage = Storage::from_url(url_storage_config).await;
+    let storage = Storage::from_url(url_storage_config, query).await;
     let searcher = HtsGetFromStorage::new(storage?);
     searcher.search(query.clone()).await
   }

htsget-storage/src/error.rs

@@ -33,7 +33,7 @@ pub enum StorageError {
 
   #[error("invalid address: `{0}`")]
   InvalidAddress(AddrParseError),
-  
+
   #[error("`{0}`")]
   UnsupportedFormat(String),
 

htsget-storage/src/lib.rs

@@ -21,6 +21,8 @@ use async_trait::async_trait;
 use base64::engine::general_purpose;
 use base64::Engine;
 use cfg_if::cfg_if;
+#[cfg(feature = "experimental")]
+use htsget_config::encryption_scheme::EncryptionScheme;
 use htsget_config::storage;
 #[cfg(feature = "experimental")]
 use htsget_config::storage::c4gh::C4GHKeys;
@@ -134,28 +136,34 @@ impl StorageTrait for Storage {
 impl Storage {
   #[cfg(feature = "experimental")]
   /// Wrap an existing storage with C4GH storage
-  pub async fn from_c4gh_keys(keys: Option<&C4GHKeys>, storage: Storage) -> Result<Storage> {
-    if let Some(keys) = keys {
-      Ok(Storage::new(C4GHStorage::new_box(
+  pub async fn from_c4gh_keys(
+    keys: Option<&C4GHKeys>,
+    encryption_scheme: Option<EncryptionScheme>,
+    storage: Storage,
+  ) -> Result<Storage> {
+    match (keys, encryption_scheme) {
+      (Some(keys), Some(EncryptionScheme::C4GH)) => Ok(Storage::new(C4GHStorage::new_box(
         keys
           .clone()
           .keys()
           .await
           .map_err(|err| StorageError::InternalError(err.to_string()))?,
         storage.into_inner(),
-      )))
-    } else {
-      Ok(storage)
+      ))),
+      (None, Some(EncryptionScheme::C4GH)) => Err(StorageError::UnsupportedFormat(
+        "C4GH keys have not been configured for this id".to_string(),
+      )),
+      _ => Ok(storage),
     }
   }
 
   /// Create from local storage config.
-  pub async fn from_file(file: &storage::file::File) -> Result<Storage> {
+  pub async fn from_file(file: &storage::file::File, query: &Query) -> Result<Storage> {
     let storage = Storage::new(FileStorage::new(file.local_path(), file.clone())?);
 
     cfg_if! {
       if #[cfg(feature = "experimental")] {
-        Self::from_c4gh_keys(file.keys(), storage).await
+        Self::from_c4gh_keys(file.keys(), query.encryption_scheme(), storage).await
       } else {
         Ok(storage)
       }
@@ -164,7 +172,7 @@ impl Storage {
 
   /// Create from s3 config.
   #[cfg(feature = "aws")]
-  pub async fn from_s3(s3: &storage::s3::S3) -> Result<Storage> {
+  pub async fn from_s3(s3: &storage::s3::S3, query: &Query) -> Result<Storage> {
     let storage = Storage::new(
       S3Storage::new_with_default_config(
         s3.bucket().to_string(),
@@ -176,7 +184,7 @@ impl Storage {
 
     cfg_if! {
       if #[cfg(feature = "experimental")] {
-        Self::from_c4gh_keys(s3.keys(), storage).await
+        Self::from_c4gh_keys(s3.keys(), query.encryption_scheme(), storage).await
       } else {
         Ok(storage)
       }
@@ -185,7 +193,7 @@ impl Storage {
 
   /// Create from url config.
   #[cfg(feature = "url")]
-  pub async fn from_url(url: &storage::url::Url) -> Result<Storage> {
+  pub async fn from_url(url: &storage::url::Url, query: &Query) -> Result<Storage> {
     let storage = Storage::new(UrlStorage::new(
       url.client_cloned(),
       url.url().clone(),
@@ -196,7 +204,7 @@ impl Storage {
 
     cfg_if! {
       if #[cfg(feature = "experimental")] {
-        Self::from_c4gh_keys(url.keys(), storage).await
+        Self::from_c4gh_keys(url.keys(), query.encryption_scheme(), storage).await
       } else {
         Ok(storage)
       }