The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu
Go agent-ai-cliagent-harnessesagent-securitybrowser-extensionciclaude-codecloudcodexcursordetection-engineeringjevknowledge-basememorymobile-device-managementobservabilitysecuritysecurity-information-and-event-managementsecurity-toolstelemetrytraces
Persist S3 forwarder AWS provider env
shukieshahcfdde7085fa0
diff --git a/docs/log-forwarding/s3.mdx b/docs/log-forwarding/s3.mdxindex 0e75180e..b4b3404f 100644--- a/docs/log-forwarding/s3.mdx+++ b/docs/log-forwarding/s3.mdx@@ -113,7 +113,7 @@ vector validate /etc/vector/beacon-s3.tomlvector --config /etc/vector/beacon-s3.toml```-In managed deployments, provide `BEACON_S3_BUCKET`, optional `BEACON_S3_PREFIX`, `AWS_REGION`, optional `BEACON_S3_STORAGE_CLASS`, and any AWS credential-provider settings through the Vector service environment, host identity, or MDM/secret tooling. Do not store AWS destination secrets in Beacon endpoint configuration.+In managed deployments, provide `BEACON_S3_BUCKET`, optional `BEACON_S3_PREFIX`, `AWS_REGION`, optional `BEACON_S3_STORAGE_CLASS`, and any AWS credential-provider settings through the Vector service environment, host identity, or MDM/secret tooling. The packaged macOS S3 helper persists set AWS provider-chain environment variables such as `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, `AWS_SESSION_TOKEN`, `AWS_PROFILE`, `AWS_SHARED_CREDENTIALS_FILE`, `AWS_CONFIG_FILE`, `AWS_WEB_IDENTITY_TOKEN_FILE`, and `AWS_ROLE_ARN` to `/Library/Application Support/Beacon/Forwarders/s3-vector.env` with mode `0600` for the launchd-managed Vector process. Do not store AWS destination secrets in Beacon endpoint configuration.The template expects a Vector version with the `file` source, `remap` transform, and `aws_s3` sink. It parses each Beacon JSONL line and re-encodes the original Beacon event as JSON with newline-delimited framing so S3 receives one Beacon event per line, without a Vector wrapper.diff --git a/docs/mdm/jamf/claude.mdx b/docs/mdm/jamf/claude.mdxindex 1ba612c4..18ada7ad 100644--- a/docs/mdm/jamf/claude.mdx+++ b/docs/mdm/jamf/claude.mdx@@ -68,7 +68,7 @@ Create a dedicated bucket prefix for the pilot and grant the identity used by th}```-Provide AWS credentials through host identity, MDM secret tooling, or the standard AWS credential provider chain available to the LaunchDaemon. Do not place AWS access keys in Beacon endpoint configuration.+Provide AWS credentials through host identity, MDM secret tooling, or the standard AWS credential provider chain available to the LaunchDaemon. When `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, `AWS_SESSION_TOKEN`, `AWS_PROFILE`, `AWS_SHARED_CREDENTIALS_FILE`, `AWS_CONFIG_FILE`, `AWS_WEB_IDENTITY_TOKEN_FILE`, or `AWS_ROLE_ARN` are present in the MDM script environment, the helper persists them to the root-owned forwarder environment file so launchd-started Vector can use them. Do not place AWS access keys in Beacon endpoint configuration.## Jamf Policy@@ -90,6 +90,8 @@ Environment variables take precedence over Jamf parameters:| 9 | `BEACON_OTLP_GRPC_PORT` | Optional Beacon OTLP gRPC port, default `4317` || 10 | `BEACON_OTLP_HTTP_PORT` | Optional Beacon OTLP HTTP port, default `4318` |+The S3 helper also persists any standard AWS provider-chain environment variables listed above when they are set. This supports MDM secret injection without baking secrets into the package.+The helper:- writes `/Library/Application Support/Beacon/Forwarders/s3-vector.toml`@@ -107,6 +109,8 @@ For a one-Mac pilot without Jamf policy parameters, install the signed package a```bashsudo BEACON_S3_BUCKET="example-security-logs" \AWS_REGION="us-west-2" \+ AWS_ACCESS_KEY_ID="AKIA..." \+ AWS_SECRET_ACCESS_KEY="..." \BEACON_S3_PREFIX="beacon/claude" \/opt/beacon/jamf/claude/s3/repair-hooks-and-forwarder.sh```diff --git a/packaging/macos/jamf/claude/s3/install-forwarder.sh b/packaging/macos/jamf/claude/s3/install-forwarder.shindex a9eedc7f..d2a03928 100755--- a/packaging/macos/jamf/claude/s3/install-forwarder.sh+++ b/packaging/macos/jamf/claude/s3/install-forwarder.sh@@ -45,6 +45,14 @@ shell_quote() {printf "'%s'" "$(printf '%s' "$1" | sed "s/'/'\\\\''/g")"}+write_env_if_set() {+ name="$1"+ eval "value=\${$name:-}"+ if [ -n "$value" ]; then+ printf 'export %s=%s\n' "$name" "$(shell_quote "$value")"+ fi+}+toml_quote() {printf '"%s"' "$(printf '%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g')"}@@ -139,6 +147,14 @@ chmod 0644 "$CONFIG_PATH"printf 'export BEACON_S3_PREFIX=%s\n' "$(shell_quote "$S3_PREFIX")"printf 'export BEACON_S3_STORAGE_CLASS=%s\n' "$(shell_quote "$S3_STORAGE_CLASS")"printf 'export BEACON_VECTOR_READ_FROM=%s\n' "$(shell_quote "$VECTOR_READ_FROM")"+ write_env_if_set AWS_ACCESS_KEY_ID+ write_env_if_set AWS_SECRET_ACCESS_KEY+ write_env_if_set AWS_SESSION_TOKEN+ write_env_if_set AWS_PROFILE+ write_env_if_set AWS_SHARED_CREDENTIALS_FILE+ write_env_if_set AWS_CONFIG_FILE+ write_env_if_set AWS_WEB_IDENTITY_TOKEN_FILE+ write_env_if_set AWS_ROLE_ARN} >"$ENV_PATH"chmod 0600 "$ENV_PATH"diff --git a/packaging/macos/test-endpoint-scripts.sh b/packaging/macos/test-endpoint-scripts.shindex 078b2ca1..5bb2e92f 100644--- a/packaging/macos/test-endpoint-scripts.sh+++ b/packaging/macos/test-endpoint-scripts.sh@@ -450,7 +450,14 @@ BEACON_FORWARDER_BASE_DIR="$S3_FORWARDER_BASE" \BEACON_LAUNCHDAEMONS_DIR="$S3_LAUNCHDAEMONS_DIR" \BEACON_RUNTIME_LOG_PATHS="$TMP_DIR/s3-runtime.jsonl" \BEACON_NO_START="1" \-AWS_SECRET_ACCESS_KEY="dont-write-me" \+AWS_ACCESS_KEY_ID="test-access-key" \+AWS_SECRET_ACCESS_KEY="test-secret-key" \+AWS_SESSION_TOKEN="test-session-token" \+AWS_PROFILE="test-profile" \+AWS_SHARED_CREDENTIALS_FILE="/tmp/test-aws-credentials" \+AWS_CONFIG_FILE="/tmp/test-aws-config" \+AWS_WEB_IDENTITY_TOKEN_FILE="/tmp/test-web-identity-token" \+AWS_ROLE_ARN="arn:aws:iam::123456789012:role/beacon-demo" \"$ROOT_DIR/packaging/macos/jamf/claude/s3/install-forwarder.sh" _ _ _ "beacon-test-bucket" "us-west-2" "beacon/claude" "STANDARD_IA" "end" >/dev/nullif [ ! -f "$S3_FORWARDER_BASE/s3-vector.toml" ]; then@@ -481,8 +488,8 @@ if ! grep -q 'bucket = "${BEACON_S3_BUCKET}"' "$S3_FORWARDER_BASE/s3-vector.tomlecho "S3 Vector config should reference bucket env var" >&2exit 1fi-if grep -q 'beacon-test-bucket\|dont-write-me' "$S3_FORWARDER_BASE/s3-vector.toml"; then- echo "S3 Vector config should not contain bucket values or AWS secrets" >&2+if grep -q 'beacon-test-bucket\|test-access-key\|test-secret-key\|test-session-token' "$S3_FORWARDER_BASE/s3-vector.toml"; then+ echo "S3 Vector config should not contain bucket values or AWS credentials" >&2exit 1fiif ! grep -q "beacon-test-bucket" "$S3_FORWARDER_BASE/s3-vector.env"; then@@ -493,10 +500,21 @@ if ! grep -q "us-west-2" "$S3_FORWARDER_BASE/s3-vector.env"; thenecho "S3 Vector env missing region" >&2exit 1fi-if grep -q "dont-write-me" "$S3_FORWARDER_BASE/s3-vector.env"; then- echo "S3 Vector env should not contain AWS secrets" >&2- exit 1-fi+for expected in \+ "AWS_ACCESS_KEY_ID='test-access-key'" \+ "AWS_SECRET_ACCESS_KEY='test-secret-key'" \+ "AWS_SESSION_TOKEN='test-session-token'" \+ "AWS_PROFILE='test-profile'" \+ "AWS_SHARED_CREDENTIALS_FILE='/tmp/test-aws-credentials'" \+ "AWS_CONFIG_FILE='/tmp/test-aws-config'" \+ "AWS_WEB_IDENTITY_TOKEN_FILE='/tmp/test-web-identity-token'" \+ "AWS_ROLE_ARN='arn:aws:iam::123456789012:role/beacon-demo'"+do+ if ! grep -q "$expected" "$S3_FORWARDER_BASE/s3-vector.env"; then+ echo "S3 Vector env missing AWS provider setting: $expected" >&2+ exit 1+ fi+donecase "$(ls -l "$S3_FORWARDER_BASE/s3-vector.env" | awk '{print $1}')" in-rw-------*) ;;*)