feat(rust): add TRUST_CONTEXT_ID_UTF8 for type-safety

build-trust · Aug 24, 2023 · 540c7d8 · 540c7d8
1 parent d743363
commit 540c7d8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/implementations/rust/ockam/ockam_api/src/kafka/outlet_service/interceptor_listener.rs b/implementations/rust/ockam/ockam_api/src/kafka/outlet_service/interceptor_listener.rs
@@ -2,13 +2,12 @@ use crate::kafka::outlet_controller::KafkaOutletController;
 use crate::kafka::portal_worker::KafkaPortalWorker;
 use crate::kafka::protocol_aware::OutletInterceptorImpl;
 use crate::kafka::{KAFKA_OUTLET_BOOTSTRAP_ADDRESS, KAFKA_OUTLET_INTERCEPTOR_ADDRESS};
-use ockam::identity::{SecureChannels, TRUST_CONTEXT_ID};
+use ockam::identity::{SecureChannels, TRUST_CONTEXT_ID_UTF8};
 use ockam::{Any, Context, Result, Routed, Worker};
 use ockam_abac::AbacAccessControl;
 use ockam_core::flow_control::{FlowControlId, FlowControlOutgoingAccessControl, FlowControls};
 use ockam_core::Address;
 use ockam_node::WorkerBuilder;
-use std::str::from_utf8;
 use std::sync::Arc;
 
 /// This service handles the central component which is responsible for creating connections
@@ -50,7 +49,7 @@ impl OutletManagerService {
             outlet_controller: KafkaOutletController::new(),
             incoming_access_control: Arc::new(AbacAccessControl::create(
                 secure_channels.identities().repository(),
-                from_utf8(TRUST_CONTEXT_ID).unwrap(),
+                TRUST_CONTEXT_ID_UTF8,
                 trust_context_id,
             )),
             flow_control_id: flow_control_id.clone(),

diff --git a/implementations/rust/ockam/ockam_api/src/kafka/secure_channel_map.rs b/implementations/rust/ockam/ockam_api/src/kafka/secure_channel_map.rs
@@ -9,7 +9,7 @@ use crate::DefaultAddress;
 use minicbor::Decoder;
 use ockam::identity::{
     DecryptionRequest, DecryptionResponse, EncryptionRequest, EncryptionResponse,
-    SecureChannelRegistryEntry, SecureChannels, TRUST_CONTEXT_ID,
+    SecureChannelRegistryEntry, SecureChannels, TRUST_CONTEXT_ID_UTF8,
 };
 use ockam_abac::AbacAccessControl;
 use ockam_core::api::{Request, Response, Status};
@@ -22,7 +22,6 @@ use ockam_multiaddr::MultiAddr;
 use ockam_node::compat::tokio::sync::Mutex;
 use ockam_node::compat::tokio::sync::MutexGuard;
 use ockam_node::Context;
-use std::str::from_utf8;
 
 pub(crate) struct KafkaEncryptedContent {
     /// The encrypted content
@@ -213,7 +212,7 @@ impl<F: ForwarderCreator> KafkaSecureChannelControllerImpl<F> {
     ) -> KafkaSecureChannelControllerImpl<F> {
         let access_control = AbacAccessControl::create(
             secure_channels.identities().repository(),
-            from_utf8(TRUST_CONTEXT_ID).unwrap(),
+            TRUST_CONTEXT_ID_UTF8,
             &trust_context_id,
         );
 

diff --git a/implementations/rust/ockam/ockam_identity/src/credentials/credentials_issuer.rs b/implementations/rust/ockam/ockam_identity/src/credentials/credentials_issuer.rs
@@ -1,6 +1,6 @@
-use core::time::Duration;
-use minicbor::Decoder;
-use tracing::trace;
+use super::super::models::{Attributes, CredentialAndPurposeKey, Identifier, SchemaId};
+use super::super::utils::AttributesBuilder;
+use super::super::{Credentials, IdentitiesRepository, IdentitySecureChannelLocalInfo};
 
 use ockam_core::api::{Method, Request, Response};
 use ockam_core::compat::boxed::Box;
@@ -11,14 +11,17 @@ use ockam_core::compat::vec::Vec;
 use ockam_core::{api, Result, Route, Routed, Worker};
 use ockam_node::{Context, RpcClient};
 
-use super::super::models::{Attributes, CredentialAndPurposeKey, Identifier, SchemaId};
-use super::super::utils::AttributesBuilder;
-use super::super::{Credentials, IdentitiesRepository, IdentitySecureChannelLocalInfo};
+use core::time::Duration;
+use minicbor::Decoder;
+use tracing::trace;
 
 /// Name of the attribute identifying the trust context for that attribute, meaning
 /// from which set of trusted authorities the attribute comes from
 pub const TRUST_CONTEXT_ID: &[u8] = b"trust_context_id";
 
+/// The same as above but in string format
+pub const TRUST_CONTEXT_ID_UTF8: &str = "trust_context_id";
+
 /// Identifier for the schema of a project credential
 pub const PROJECT_MEMBER_SCHEMA: SchemaId = SchemaId(1);