Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(calls): use cloudfront for calls (#4871)
Will Hutchinsona8719ce81544
diff --git a/Cargo.lock b/Cargo.lockindex db3536ae61..94c20f11b0 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -2367,6 +2367,7 @@ dependencies = ["axum","channels","chrono",+ "cloudfront_sign","connection","entity_access","entity_access_db_utils",@@ -2394,6 +2395,7 @@ dependencies = ["thiserror 2.0.18","tokio","tracing",+ "urlencoding","utoipa","uuid","workspace-hack",diff --git a/crates/call/Cargo.toml b/crates/call/Cargo.tomlindex 400576de4a..3c55928e34 100644--- a/crates/call/Cargo.toml+++ b/crates/call/Cargo.toml@@ -20,6 +20,7 @@ outbound = ["dep:agent","dep:ai_usage","dep:aws-sdk-s3",+ "dep:cloudfront_sign","channels/outbound","dep:entity_access_db_utils","dep:futures",@@ -28,6 +29,7 @@ outbound = ["dep:macro_aws_config","dep:pgvector","dep:sqlx",+ "dep:urlencoding","ports",]ports = ["dep:entity_access", "dep:tokio"]@@ -41,6 +43,7 @@ async-trait = { workspace = true, optional = true }aws-sdk-s3 = { workspace = true, optional = true }axum = { workspace = true, optional = true }chrono = { workspace = true }+cloudfront_sign = { workspace = true, optional = true }channels = { path = "../channels", default-features = false, optional = true }connection = { path = "../connection", default-features = false, features = ["ports",@@ -74,6 +77,7 @@ thiserror = { workspace = true }tokio = { workspace = true, features = ["macros"], optional = true }tracing = { workspace = true }utoipa = { workspace = true, optional = true }+urlencoding = { workspace = true, optional = true }uuid = { workspace = true }workspace-hack = { version = "0.1", path = "../workspace-hack" }diff --git a/crates/call/src/domain/ports.rs b/crates/call/src/domain/ports.rsindex 5ddf1f9d9e..5ee7cfb7a1 100644--- a/crates/call/src/domain/ports.rs+++ b/crates/call/src/domain/ports.rs@@ -334,9 +334,9 @@ pub trait CallRepository: Send + Sync + 'static {) -> impl Future<Output = Result<(), Self::Err>> + Send;}-/// Storage port for generating presigned recording URLs.+/// Storage port for generating signed recording GET URLs and deleting objects.pub trait RecordingStorage: Send + Sync + 'static {- /// Generate a presigned GET URL for a recording key.+ /// Generate a storage- or distribution-signed GET URL for a recording key.////// The key is in `UUID/TIMESTAMP.ext` format. Implementations must/// prepend the appropriate prefix (e.g. `calls/`) when constructing@@ -346,9 +346,9 @@ pub trait RecordingStorage: Send + Sync + 'static {recording_key: &str,) -> impl Future<Output = anyhow::Result<String>> + Send;- /// Generate a presigned GET URL for a stored preview image key/path.+ /// Generate a storage- or distribution-signed GET URL for a preview key.///- /// The preview key/path is stored as a full S3 object key, for example+ /// The preview key/path is stored as a full storage object key, for example/// `calls/{room}/{recording_stem}/PREVIEW.jpg`.fn presign_recording_preview_url(&self,diff --git a/crates/call/src/outbound/s3_recording_storage.rs b/crates/call/src/outbound/s3_recording_storage.rsindex 0a69a56d08..c5cf4d332b 100644--- a/crates/call/src/outbound/s3_recording_storage.rs+++ b/crates/call/src/outbound/s3_recording_storage.rs@@ -1,21 +1,62 @@-//! S3-backed implementation of [`RecordingStorage`](crate::domain::ports::RecordingStorage).+//! S3-backed recording storage with signed storage or distribution GET URLs.-use std::time::Duration;+use std::time::{Duration, SystemTime, UNIX_EPOCH};++use cloudfront_sign::{SignedOptions, get_signed_url};use crate::domain::ports::RecordingStorage;-/// Presigned-URL generator backed by an S3 client from [`macro_aws_config`].+/// CloudFront settings used to sign recording GET URLs.+pub struct RecordingCloudFrontConfig {+ /// CloudFront distribution URL, with or without a trailing slash.+ pub distribution_url: String,+ /// Public key ID associated with the signing private key.+ pub signer_public_key_id: String,+ /// PEM-encoded PKCS#1 private signing key.+ pub signer_private_key: String,+ /// Lifetime of each signed URL in seconds.+ pub presigned_url_expiry_seconds: u64,+}++/// S3-backed recording storage that serves production GETs through CloudFront.pub struct S3RecordingStorage {client: aws_sdk_s3::Client,bucket: String,+ cloudfront_config: RecordingCloudFrontConfig,}impl S3RecordingStorage {- /// Build using the shared AWS config from [`macro_aws_config`] and- /// the bucket name from the egress configuration.- pub async fn new(bucket: String) -> Self {+ /// Build using the shared AWS config, egress bucket, and CloudFront signer.+ pub async fn new(bucket: String, cloudfront_config: RecordingCloudFrontConfig) -> Self {let client = macro_aws_config::s3_client().await;- Self { client, bucket }+ Self {+ client,+ bucket,+ cloudfront_config,+ }+ }++ async fn presign_s3_url(&self, object_key: &str) -> anyhow::Result<String> {+ let presigning_config = aws_sdk_s3::presigning::PresigningConfig::expires_in(+ Duration::from_secs(self.cloudfront_config.presigned_url_expiry_seconds),+ )?;++ let presigned = self+ .client+ .get_object()+ .bucket(&self.bucket)+ .key(object_key)+ .presigned(presigning_config)+ .await?;++ Ok(macro_aws_config::transform_aws_url(presigned.uri()))+ }++ fn presign_get_url(&self, object_key: &str) -> anyhow::Result<String> {+ let expires_at = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs()+ + self.cloudfront_config.presigned_url_expiry_seconds;++ cloudfront_signed_url(&self.cloudfront_config, object_key, expires_at)}}@@ -27,36 +68,62 @@ fn preview_object_key(preview_key: &str) -> &str {preview_key}-impl RecordingStorage for S3RecordingStorage {- async fn presign_recording_url(&self, recording_key: &str) -> anyhow::Result<String> {- let full_key = recording_object_key(recording_key);- let presigning_config =- aws_sdk_s3::presigning::PresigningConfig::expires_in(Duration::from_secs(3600))?;-- let presigned = self- .client- .get_object()- .bucket(&self.bucket)- .key(full_key)- .presigned(presigning_config)- .await?;+fn encode_object_key(object_key: &str) -> String {+ object_key+ .split('/')+ .map(|segment| match segment {+ "." => "%2E".into(),+ ".." => "%2E%2E".into(),+ _ => urlencoding::encode(segment),+ })+ .collect::<Vec<_>>()+ .join("/")+}- Ok(macro_aws_config::transform_aws_url(presigned.uri()))+fn cloudfront_signed_url(+ config: &RecordingCloudFrontConfig,+ object_key: &str,+ expires_at: u64,+) -> anyhow::Result<String> {+ let distribution_url = config.distribution_url.trim_end_matches('/');+ let has_valid_scheme =+ distribution_url.starts_with("https://") || distribution_url.starts_with("http://");+ let host = distribution_url+ .split_once("://")+ .map(|(_, host)| host)+ .unwrap_or_default();+ if !has_valid_scheme || host.is_empty() || distribution_url.contains(['?', '#']) {+ anyhow::bail!("invalid CloudFront distribution URL");}- async fn presign_recording_preview_url(&self, preview_key: &str) -> anyhow::Result<String> {- let presigning_config =- aws_sdk_s3::presigning::PresigningConfig::expires_in(Duration::from_secs(3600))?;+ let resource_url = format!("{distribution_url}/{}", encode_object_key(object_key));+ let options = SignedOptions {+ key_pair_id: config.signer_public_key_id.clone(),+ private_key: config.signer_private_key.clone(),+ date_less_than: expires_at,+ ..Default::default()+ };- let presigned = self- .client- .get_object()- .bucket(&self.bucket)- .key(preview_object_key(preview_key))- .presigned(presigning_config)- .await?;+ Ok(get_signed_url(&resource_url, &options)?)+}- Ok(macro_aws_config::transform_aws_url(presigned.uri()))+impl RecordingStorage for S3RecordingStorage {+ async fn presign_recording_url(&self, recording_key: &str) -> anyhow::Result<String> {+ let object_key = recording_object_key(recording_key);+ if macro_aws_config::is_local_aws() {+ self.presign_s3_url(&object_key).await+ } else {+ self.presign_get_url(&object_key)+ }+ }++ async fn presign_recording_preview_url(&self, preview_key: &str) -> anyhow::Result<String> {+ let object_key = preview_object_key(preview_key);+ if macro_aws_config::is_local_aws() {+ self.presign_s3_url(object_key).await+ } else {+ self.presign_get_url(object_key)+ }}async fn delete_recording(&self, recording_key: &str) -> anyhow::Result<()> {@@ -81,22 +148,4 @@ impl RecordingStorage for S3RecordingStorage {}#[cfg(test)]-mod test {- use super::*;-- #[test]- fn recording_object_key_adds_calls_prefix() {- assert_eq!(- recording_object_key("room/recording.mp4"),- "calls/room/recording.mp4"- );- }-- #[test]- fn preview_object_key_uses_stored_key_path_without_prefix_changes() {- assert_eq!(- preview_object_key("calls/room/recording/PREVIEW.jpg"),- "calls/room/recording/PREVIEW.jpg"- );- }-}+mod test;diff --git a/crates/call/src/outbound/s3_recording_storage/test.rs b/crates/call/src/outbound/s3_recording_storage/test.rsnew file mode 100644index 0000000000..6be6ffd3ab--- /dev/null+++ b/crates/call/src/outbound/s3_recording_storage/test.rs@@ -0,0 +1,101 @@+use super::*;++const PRIVATE_KEY: &str = include_str!("test_private_key.pem");+const KEY_PAIR_ID: &str = "TEST-CLOUDFRONT-KEY";+const EXPIRES_AT: u64 = 2_000_000_000;++fn cloudfront_config(distribution_url: &str) -> RecordingCloudFrontConfig {+ RecordingCloudFrontConfig {+ distribution_url: distribution_url.to_string(),+ signer_public_key_id: KEY_PAIR_ID.to_string(),+ signer_private_key: PRIVATE_KEY.to_string(),+ presigned_url_expiry_seconds: 3600,+ }+}++fn assert_signature_parameters(url: &str) {+ let query = url.split_once('?').expect("signed URL must have a query").1;+ let parameters = query.split('&').collect::<Vec<_>>();++ assert!(parameters.contains(&format!("Expires={EXPIRES_AT}").as_str()));+ assert!(+ parameters+ .iter()+ .any(|parameter| parameter.starts_with("Signature=") && parameter.len() > 10)+ );+ assert!(parameters.contains(&format!("Key-Pair-Id={KEY_PAIR_ID}").as_str()));+}++#[test]+fn recording_url_uses_distribution_and_adds_calls_prefix() {+ let object_key = recording_object_key("room-id/recording.mp4");+ let url = cloudfront_signed_url(+ &cloudfront_config("https://location.example.test"),+ &object_key,+ EXPIRES_AT,+ )+ .unwrap();++ assert!(url.starts_with("https://location.example.test/calls/room-id/recording.mp4?"));+ assert_signature_parameters(&url);+}++#[test]+fn preview_url_normalizes_trailing_slash_without_adding_a_second_prefix() {+ let object_key = preview_object_key("calls/room-id/recording/PREVIEW.jpg");+ let url = cloudfront_signed_url(+ &cloudfront_config("https://location.example.test/"),+ object_key,+ EXPIRES_AT,+ )+ .unwrap();++ assert!(url.starts_with("https://location.example.test/calls/room-id/recording/PREVIEW.jpg?"));+ assert!(!url.contains("//calls"));+ assert!(!url.contains("calls/calls"));+ assert_signature_parameters(&url);+}++#[test]+fn path_sensitive_key_characters_are_encoded_without_changing_key_separators() {+ let object_key = recording_object_key("room name/a?#%/../café.mp4");+ let url = cloudfront_signed_url(+ &cloudfront_config("https://location.example.test///"),+ &object_key,+ EXPIRES_AT,+ )+ .unwrap();++ assert!(url.starts_with(+ "https://location.example.test/calls/room%20name/a%3F%23%25/%2E%2E/caf%C3%A9.mp4?"+ ));+ assert_signature_parameters(&url);+}++#[test]+fn malformed_distribution_url_is_rejected() {+ let error = cloudfront_signed_url(+ &cloudfront_config("location.example.test?origin=unexpected"),+ "calls/room/recording.mp4",+ EXPIRES_AT,+ )+ .unwrap_err();++ assert_eq!(error.to_string(), "invalid CloudFront distribution URL");+}++#[test]+fn recording_object_key_adds_calls_prefix() {+ assert_eq!(+ recording_object_key("room/recording.mp4"),+ "calls/room/recording.mp4"+ );+}++#[test]+fn preview_object_key_uses_stored_key_path_without_prefix_changes() {+ assert_eq!(+ preview_object_key("calls/room/recording/PREVIEW.jpg"),+ "calls/room/recording/PREVIEW.jpg"+ );+}diff --git a/crates/call/src/outbound/s3_recording_storage/test_private_key.pem b/crates/call/src/outbound/s3_recording_storage/test_private_key.pemnew file mode 100644index 0000000000..48c8e73156--- /dev/null+++ b/crates/call/src/outbound/s3_recording_storage/test_private_key.pem@@ -0,0 +1,27 @@+-----BEGIN RSA PRIVATE KEY-----+MIIEpAIBAAKCAQEAtvcJDzzgXScqL62NwlDb4C9NosjorDTJz0VOfVk48/DEm+vT+na+Ts+Y2LYWCRx4RpaufDn9W7CqHLCi/eN6H6WdFWH9+LMF+9Q5PBwPmj3t7BAwc+3aHtzagr6e0Gc9aEbzKhdA5DKN7thAbAR8XrTU0Ahyo9INReigO0aHFjP4oizx+E+yiTSJxKxc7Bmmxjjr0i9ydpNbdpVkc//qjKo7Vx/V2czzWy8zhOjK/bRW1jshm+7+TDopBu6Lq5m9RmKTEC7L3fBNp4xvVx0Fku/mj4jFu8qhK/2evy3Ep+yynb97R6OZ+euqIOuVDULrm4ukTbUdXR5qlCaWb9sX9xaMhnQIDAQABAoIBAQCEagiudHpUMHIB+i3NavDZE6zceppRtfM7JKPmDEj17njZMOcIvDtCwk92F2GfOnF5dLfWxAkugI68s+MFlSWoq2Sr0PLUXdkjQVmkNralFEajM/XJzPcc+u1RTi+V2AHDJAX74lReUpAR2Y+PWKPDxgaG65UJCeVSN0auU+pftY7Nr5wfEUdppV4aq/4DAvcAKxWAft7FeZfW6ry+1+uKbWFSdG+1b8w8amhXk3JYJWwCRCXfqmk32Wv5GFRhPC+mfFTnU4ZbRU4s4neC+FRJJ6/MIEx30fj64/0BFXIwEhHDgrB0nwy1L48RjY6FIyM4lNWPwUWKVodoiUUsW+ViIhy4ypAoGBANpNhMblv5rEgoUlPyoxYqSR7YUaxTDDKqMQpxiuvkV5sO0m7Z6o+LtiTPr88loFAVtluw2qFwwPTKRbswqZ+BRrM80TA0mA0BjQU9yd1LslUgwSOmF+W+PzbE2uPgYPeIT2WOS/7EXjnydcdCuV7eQ/5AvR4vwphBov39RAcks92LAoGBANaP+V6zsT0OsyaoViCHjxDaYBwCyLxZbEvROpV1pJaFtDePESqM1w+UPpHyWWjD/FLoy+pd3BMa5vN4n1r5Byp3B9/1Ze5Ev7FSn+lG0yWYLET4bHSrMxr7fjisx6uiblkW5c+eOaYXCM81LcRZSQnpO+p1uehMgE1Um/9lN+ahjJ3AoGAENW1jZkeI5NP9XCf5GMW+llZimMctucrzOMwJ9s9TAQyXZlKANKIHqtAAIMNNX/5UNERkcYyLM3pPSuNLR4ek+YSK5B+5Oyvh4GgAb50EUMJaB3BIbEhQGH/UiZDxjffNXHB/TIHyIP7PA/XLZ1MUT+PUJE01UfjppRNYEYg+yCqm0CgYAHRXJWNOf2xitLbVFgvKRQqVRLbL51xn5c8zFd+egvBbb2zw1o4L8FEyQPtCPdjg7GDIeZHHp39aF18emwJvCj6gfqeRbb88DRmaO9E+yBkKenarfaOFcSCgXcC9b0dRvCPyloWuYul0dEJNNfS0hfdr+9iBnw/fxJvXmcNq+1ITJvwKBgQCG37bLWo4YatjFZrorLOj2bu5JQzJsWhQny63BLqhwZgjEUvujwHip+HQ5jZXWjfEcWm0t+lc+uE8GT16yo5hivSZp/oNaSN/oDu372VIEn2juaoChSeHcN+VURUtwum3CbXbDuZgutIIWW2z7KhcRINN6lkJNp0q9nKRZBYZcZCtQ==+-----END RSA PRIVATE KEY-----diff --git a/infra/stacks/call-recording/index.ts b/infra/stacks/call-recording/index.tsindex 7358ec17ac..38db09bca7 100644--- a/infra/stacks/call-recording/index.ts+++ b/infra/stacks/call-recording/index.ts@@ -28,6 +28,8 @@ const callRecordingBucket = createBucket({export const callRecordingBucketId = callRecordingBucket.id;export const callRecordingBucketArn = callRecordingBucket.arn;+export const callRecordingBucketRegionalDomainName =+ callRecordingBucket.bucketRegionalDomainName;// ---------------------------------------------------------------------------// 1. IAM Policies (attach to users or roles)@@ -209,6 +211,22 @@ const bucketPolicy = new aws.s3.BucketPolicy(JSON.stringify({Version: '2012-10-17',Statement: [+ {+ Sid: 'AllowCloudFrontCallsRead',+ Effect: 'Allow',+ Principal: { Service: 'cloudfront.amazonaws.com' },+ Action: 's3:GetObject',+ Resource: `${bucketArn}/calls/*`,+ Condition: {+ StringEquals: {+ 'aws:SourceAccount': '569036502058',+ },+ ArnLike: {+ 'aws:SourceArn':+ 'arn:aws:cloudfront::569036502058:distribution/*',+ },+ },+ },{Sid: 'DenyWithoutTag',Effect: 'Deny',@@ -223,6 +241,9 @@ const bucketPolicy = new aws.s3.BucketPolicy(ArnNotEquals: {'aws:PrincipalArn': `arn:aws:iam::569036502058:root`,},+ Bool: {+ 'aws:PrincipalIsAWSService': 'false',+ },},},],diff --git a/infra/stacks/link-sharing/index.ts b/infra/stacks/link-sharing/index.tsindex 14797967ab..d19fbf94e9 100644--- a/infra/stacks/link-sharing/index.ts+++ b/infra/stacks/link-sharing/index.ts@@ -21,6 +21,10 @@ const cloudStorageServiceStack = new pulumi.StackReference(});+const callRecordingStack = new pulumi.StackReference('call-recording-stack', {+ name: `macro-inc/call-recording/${stack}`,+});+const shaCleanupStack = new pulumi.StackReference('cloud-storage-sha-cleanup', {name: `macro-inc/cloud-storage-sha-cleanup/${stack}`,});@@ -60,8 +64,19 @@ export const fileStorageBucketName: pulumi.Output<string> = cloudStorageStack.apply((bucketName) => bucketName as string);const fileStorageBucket = getStorageBucketFromName(fileStorageBucketName);+const callRecordingBucketId = callRecordingStack+ .getOutput('callRecordingBucketId')+ .apply((bucketId) => bucketId as string);+const callRecordingBucketRegionalDomainName = callRecordingStack+ .getOutput('callRecordingBucketRegionalDomainName')+ .apply((domainName) => domainName as string);+const s3CloudfrontDistribution = getCloudfrontDistribution({bucket: fileStorageBucket,+ callRecordingOrigin: {+ bucketId: callRecordingBucketId,+ bucketRegionalDomainName: callRecordingBucketRegionalDomainName,+ },privateKeySecretName: CLOUDFRONT_SIGNER_PRIVATE_KEY_SECRET_NAME,});export const s3CloudfrontDistributionId =diff --git a/infra/stacks/link-sharing/s3-cloudfront-distribution.ts b/infra/stacks/link-sharing/s3-cloudfront-distribution.tsindex 11cc02cc1f..8be58588fb 100644--- a/infra/stacks/link-sharing/s3-cloudfront-distribution.ts+++ b/infra/stacks/link-sharing/s3-cloudfront-distribution.ts@@ -18,9 +18,14 @@ const BASE_NAME = 'cf-dist-s3-sign';export const getCloudfrontDistribution = ({bucket,+ callRecordingOrigin,privateKeySecretName,}: {bucket: pulumi.Output<GetStorageBucketResult>;+ callRecordingOrigin: {+ bucketId: pulumi.Output<string>;+ bucketRegionalDomainName: pulumi.Output<string>;+ };privateKeySecretName: string;}) => {/* KEY PAIR GENERATION INFO@@ -213,6 +218,20 @@ export const getCloudfrontDistribution = ({originRequestPolicyId,responseHeadersPolicyId,},+ orderedCacheBehaviors: [+ {+ pathPattern: '/calls/*',+ allowedMethods: ['GET', 'HEAD', 'OPTIONS'],+ cachedMethods: ['GET', 'HEAD', 'OPTIONS'],+ compress: true,+ targetOriginId: callRecordingOrigin.bucketId,+ viewerProtocolPolicy: 'https-only',+ trustedKeyGroups: [cloudFrontKeyGroup.id],+ cachePolicyId: cachePolicy.id,+ originRequestPolicyId,+ responseHeadersPolicyId,+ },+ ],enabled: true,origins: [{@@ -220,6 +239,11 @@ export const getCloudfrontDistribution = ({originId: bucket.id,originAccessControlId: originAccessControl.id,},+ {+ domainName: callRecordingOrigin.bucketRegionalDomainName,+ originId: callRecordingOrigin.bucketId,+ originAccessControlId: originAccessControl.id,+ },],restrictions: {geoRestriction: {diff --git a/services/document_storage_service/src/config.rs b/services/document_storage_service/src/config.rsindex a13f03b471..7e7a3c45bf 100644--- a/services/document_storage_service/src/config.rs+++ b/services/document_storage_service/src/config.rs@@ -12,7 +12,9 @@ env_vars! {pub struct DatabaseUrlReadonly;pub struct DocumentStorageBucket;pub struct DocxDocumentUploadBucket;+ /// Shared CloudFront distribution URL for document content and call recording GET URLs.pub struct DocumentStorageServiceCloudfrontDistributionUrl;+ /// Shared CloudFront signer public key ID for document content and call recordings.pub struct DocumentStorageServiceCloudfrontSignerPublicKeyId;pub struct RedisUri;pub struct BulkUploadRequestsTable;@@ -36,8 +38,10 @@ env_vars! {/// as `COHERE_API_KEY`, following the same pattern as `OPENAI_API_KEY`.pub struct CohereApiKey;pub struct DocumentLimit;+ /// Shared signed URL lifetime for document content and call recordings.pub struct DocumentStorageServicePresignedUrlExpirySeconds;pub struct DocumentStorageServicePresignedUrlBrowserCacheExpirySeconds;+ /// Shared CloudFront signer private key for document content and call recordings.pub struct DocumentStorageServiceCloudfrontSignerPrivateKey;#[derive(Clone)]pub struct DocumentPermissionJwt;@@ -136,13 +140,14 @@ pub struct Config {#[macro_config_default(20)]pub document_limit: u64,- /// The number of seconds a presigned url is valid for+ /// The number of seconds a signed document or call recording URL is valid for.#[macro_config_default(DEFAULT_PRESIGNED_URL_EXPIRY_SECONDS)]pub document_storage_service_presigned_url_expiry_seconds: u64,/// The number of seconds a browser cache for a presigned url is valid for#[macro_config_default(DEFAULT_PRESIGNED_URL_BROWSER_CACHE_EXPIRY_SECONDS)]pub document_storage_service_presigned_url_browser_cache_expiry_seconds: u64,+ /// The CloudFront private key shared by document content and call recording URL signing.pub document_storage_service_cloudfront_signer_private_key:LocalOrRemoteSecret<DocumentStorageServiceCloudfrontSignerPrivateKey>,diff --git a/services/document_storage_service/src/main.rs b/services/document_storage_service/src/main.rsindex 1692195bef..067a4091d9 100644--- a/services/document_storage_service/src/main.rs+++ b/services/document_storage_service/src/main.rs@@ -18,8 +18,11 @@ use call::{domain::service::CallServiceImpl,inbound::axum_router::{CallRouterState, InternalCallRouterState, WebhookRouterState},outbound::{- ai_call_summarizer::AiCallSummarizer, livekit_rtc_client::LivekitRtcClient,- pg_call_repo::PgCallRepo, pg_voice_repo::PgVoiceRepo,+ ai_call_summarizer::AiCallSummarizer,+ livekit_rtc_client::LivekitRtcClient,+ pg_call_repo::PgCallRepo,+ pg_voice_repo::PgVoiceRepo,+ s3_recording_storage::{RecordingCloudFrontConfig, S3RecordingStorage},},};use channels::{@@ -515,10 +518,25 @@ async fn main() -> anyhow::Result<()> {_ => None,};let recording_storage = match &egress_config {- Some(config) => Some(- call::outbound::s3_recording_storage::S3RecordingStorage::new(config.bucket.clone())- .await,- ),+ Some(egress_config) => {+ let cloudfront_config = RecordingCloudFrontConfig {+ distribution_url: config+ .document_storage_service_cloudfront_distribution_url+ .as_ref()+ .to_string(),+ signer_public_key_id: config+ .document_storage_service_cloudfront_signer_public_key_id+ .as_ref()+ .to_string(),+ signer_private_key: config+ .document_storage_service_cloudfront_signer_private_key+ .as_ref()+ .to_string(),+ presigned_url_expiry_seconds: config+ .document_storage_service_presigned_url_expiry_seconds,+ };+ Some(S3RecordingStorage::new(egress_config.bucket.clone(), cloudfront_config).await)+ }None => None,};let mut call_service_builder = CallServiceImpl::<_, _, _, _, _, _, AiCallSummarizer>::new(