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.

Sign up for GitHub

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

Jump to bottom

cdh/kms: modify get_secret() function #624

Merged
merged 1 commit into from
Jul 23, 2024
Merged

cdh/kms: modify get_secret() function #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions confidential-data-hub/kms/src/plugins/aliyun/client/client_key_client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use tokio::fs;
mod config;
mod credential;

use crate::{Annotations, Decrypter, Encrypter, Getter, ProviderSettings};
use crate::{Annotations, Decrypter, Encrypter, ProviderSettings};
use crate::{Error, Result};

use super::super::annotations::*;
Expand Down Expand Up @@ -238,9 +238,8 @@ impl Decrypter for ClientKeyClient {
}
}

#[async_trait]
impl Getter for ClientKeyClient {
async fn get_secret(&mut self, name: &str, annotations: &Annotations) -> Result<Vec<u8>> {
impl ClientKeyClient {
pub async fn get_secret(&self, name: &str, annotations: &Annotations) -> Result<Vec<u8>> {
let secret_settings: AliSecretAnnotations =
serde_json::from_value(Value::Object(annotations.clone())).map_err(|e| {
Error::AliyunKmsError(format!(
Expand Down Expand Up @@ -279,9 +278,7 @@ impl Getter for ClientKeyClient {

Ok(secret_data)
}
}

impl ClientKeyClient {
const API_VERSION: &'static str = "dkms-gcs-0.2";
const SIGNATURE_METHOD: &'static str = "RSA_PKCS1_SHA_256";
const CONTENT_TYPE: &'static str = "application/x-protobuf";
Expand Down
4 changes: 2 additions & 2 deletions confidential-data-hub/kms/src/plugins/aliyun/client/ecs_ram_role_client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ impl EcsRamRoleClient {
Ok(credential)
}

pub async fn get_secret(&mut self, name: &str, annotations: &Annotations) -> Result<Vec<u8>> {
pub async fn get_secret(&self, name: &str, annotations: &Annotations) -> Result<Vec<u8>> {
let sts_credential = self
.get_session_credential()
.await
.map_err(|e| Error::AliyunKmsError(format!("Get sts token from IMDS failed: {e}")))?;

let mut client = StsTokenClient::from_sts_token(
let client = StsTokenClient::from_sts_token(
sts_credential,
self.endpoint.clone(),
self.region_id.clone(),
Expand Down
12 changes: 4 additions & 8 deletions confidential-data-hub/kms/src/plugins/aliyun/client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,16 +191,12 @@ impl Decrypter for AliyunKmsClient {
#[async_trait]
impl Getter for AliyunKmsClient {
async fn get_secret(&mut self, name: &str, annotations: &Annotations) -> Result<Vec<u8>> {
match &mut self {
AliyunKmsClient::ClientKey { ref mut inner } => {
inner.get_secret(name, annotations).await
}
match &self {
AliyunKmsClient::ClientKey { ref inner } => inner.get_secret(name, annotations).await,
AliyunKmsClient::EcsRamRole {
ref mut ecs_ram_role_client,
ref ecs_ram_role_client,
} => ecs_ram_role_client.get_secret(name, annotations).await,
AliyunKmsClient::StsToken { ref mut client } => {
client.get_secret(name, annotations).await
}
AliyunKmsClient::StsToken { ref client } => client.get_secret(name, annotations).await,
}
}
}
Expand Down
6 changes: 1 addition & 5 deletions confidential-data-hub/kms/src/plugins/aliyun/client/sts_token_client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,7 @@ impl StsTokenClient {
})
}

pub async fn get_secret(
&mut self,
name: &str,
secret_settings: &Annotations,
) -> Result<Vec<u8>> {
pub async fn get_secret(&self, name: &str, secret_settings: &Annotations) -> Result<Vec<u8>> {
let secret_settings: AliSecretAnnotations =
serde_json::from_value(Value::Object(secret_settings.clone())).map_err(|_| {
Error::AliyunKmsError("illegal Secret annotations format".to_string())
Expand Down
Loading