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

fix(bottlecap): secure random id on snap start lambdas #427

Merged
merged 1 commit into from
Oct 24, 2024
Merged

fix(bottlecap): secure random id on snap start lambdas #427

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
8 changes: 6 additions & 2 deletions bottlecap/src/lifecycle/invocation/span_inferrer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::collections::HashMap;

use datadog_trace_protobuf::pb::Span;
use rand::Rng;
use rand::{rngs::OsRng, Rng, RngCore};
use serde_json::Value;
use tracing::debug;

Expand All @@ -11,6 +11,7 @@ use crate::lifecycle::invocation::triggers::{
api_gateway_http_event::APIGatewayHttpEvent, api_gateway_rest_event::APIGatewayRestEvent,
Trigger,
};
use crate::tags::lambda::tags::{INIT_TYPE, SNAP_START_VALUE};

const FUNCTION_TRIGGER_EVENT_SOURCE_TAG: &str = "function_trigger.event_source";
const FUNCTION_TRIGGER_EVENT_SOURCE_ARN_TAG: &str = "function_trigger.event_source_arn";
Expand Down Expand Up @@ -133,7 +134,10 @@ impl SpanInferrer {
}

fn generate_span_id() -> u64 {
// todo: secure random id with OsRng for SnapStart
if std::env::var(INIT_TYPE).map_or(false, |it| it == SNAP_START_VALUE) {
return OsRng.next_u64();
}

let mut rng = rand::thread_rng();
rng.gen()
}
Expand Down
4 changes: 3 additions & 1 deletion bottlecap/src/tags/lambda/tags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ use tracing::debug;
const QUALIFIER_ENV_VAR: &str = "AWS_LAMBDA_FUNCTION_VERSION";
const RUNTIME_VAR: &str = "AWS_EXECUTION_ENV";
const MEMORY_SIZE_VAR: &str = "AWS_LAMBDA_FUNCTION_MEMORY_SIZE";
const INIT_TYPE: &str = "AWS_LAMBDA_INITIALIZATION_TYPE";
pub const INIT_TYPE: &str = "AWS_LAMBDA_INITIALIZATION_TYPE";
const INIT_TYPE_KEY: &str = "init_type";
// Value for INIT_TYPE when the function is using SnapStart
pub const SNAP_START_VALUE: &str = "snap-start";

// FunctionARNKey is the tag key for a function's arn
pub const FUNCTION_ARN_KEY: &str = "function_arn";
Expand Down
Loading