feat: initial boundary integration with claude code (#455)
Closes # ## Description <!-- Briefly describe what this PR does and why --> ## Type of Change - [ ] New module - [ ] Bug fix - [x] Feature/enhancement - [ ] Documentation - [ ] Other ## Module Information <!-- Delete this section if not applicable --> **Path:** `registry/[namespace]/modules/[module-name]` **New version:** `v1.0.0` **Breaking change:** [ ] Yes [ ] No ## Testing & Validation - [x] Tests pass (`bun test`) - [x] Code formatted (`bun run fmt`) - [ ] Changes tested locally ## Related Issues <!-- Link related issues or write "None" if not applicable --> --------- Co-authored-by: YEVHENII SHCHERBINA <yevhenii@coder.com>
This commit is contained in:
parent
e34320cb0b
commit
a35986d7df
1
.github/typos.toml
vendored
1
.github/typos.toml
vendored
@ -5,6 +5,7 @@ Hashi = "Hashi"
|
|||||||
HashiCorp = "HashiCorp"
|
HashiCorp = "HashiCorp"
|
||||||
mavrickrishi = "mavrickrishi" # Username
|
mavrickrishi = "mavrickrishi" # Username
|
||||||
mavrick = "mavrick" # Username
|
mavrick = "mavrick" # Username
|
||||||
|
inh = "inh" # Option in setpriv command
|
||||||
|
|
||||||
[files]
|
[files]
|
||||||
extend-exclude = ["registry/coder/templates/aws-devcontainer/architecture.svg"] #False positive
|
extend-exclude = ["registry/coder/templates/aws-devcontainer/architecture.svg"] #False positive
|
||||||
@ -192,6 +192,42 @@ variable "claude_md_path" {
|
|||||||
default = "$HOME/.claude/CLAUDE.md"
|
default = "$HOME/.claude/CLAUDE.md"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "enable_boundary" {
|
||||||
|
type = bool
|
||||||
|
description = "Whether to enable coder boundary for network filtering"
|
||||||
|
default = false
|
||||||
|
}
|
||||||
|
|
||||||
|
variable "boundary_version" {
|
||||||
|
type = string
|
||||||
|
description = "Boundary version, valid git reference should be provided (tag, commit, branch)"
|
||||||
|
default = "main"
|
||||||
|
}
|
||||||
|
|
||||||
|
variable "boundary_log_dir" {
|
||||||
|
type = string
|
||||||
|
description = "Directory for boundary logs"
|
||||||
|
default = "/tmp/boundary_logs"
|
||||||
|
}
|
||||||
|
|
||||||
|
variable "boundary_log_level" {
|
||||||
|
type = string
|
||||||
|
description = "Log level for boundary process"
|
||||||
|
default = "WARN"
|
||||||
|
}
|
||||||
|
|
||||||
|
variable "boundary_additional_allowed_urls" {
|
||||||
|
type = list(string)
|
||||||
|
description = "Additional URLs to allow through boundary (in addition to default allowed URLs)"
|
||||||
|
default = []
|
||||||
|
}
|
||||||
|
|
||||||
|
variable "boundary_proxy_port" {
|
||||||
|
type = string
|
||||||
|
description = "Port for HTTP Proxy used by Boundary"
|
||||||
|
default = "8087"
|
||||||
|
}
|
||||||
|
|
||||||
resource "coder_env" "claude_code_md_path" {
|
resource "coder_env" "claude_code_md_path" {
|
||||||
count = var.claude_md_path == "" ? 0 : 1
|
count = var.claude_md_path == "" ? 0 : 1
|
||||||
|
|
||||||
@ -229,6 +265,8 @@ locals {
|
|||||||
start_script = file("${path.module}/scripts/start.sh")
|
start_script = file("${path.module}/scripts/start.sh")
|
||||||
module_dir_name = ".claude-module"
|
module_dir_name = ".claude-module"
|
||||||
remove_last_session_id_script_b64 = base64encode(file("${path.module}/scripts/remove-last-session-id.sh"))
|
remove_last_session_id_script_b64 = base64encode(file("${path.module}/scripts/remove-last-session-id.sh"))
|
||||||
|
# Extract hostname from access_url for boundary --allow flag
|
||||||
|
coder_host = replace(replace(data.coder_workspace.me.access_url, "https://", ""), "http://", "")
|
||||||
|
|
||||||
# Required prompts for the module to properly report task status to Coder
|
# Required prompts for the module to properly report task status to Coder
|
||||||
report_tasks_system_prompt = <<-EOT
|
report_tasks_system_prompt = <<-EOT
|
||||||
@ -299,6 +337,13 @@ module "agentapi" {
|
|||||||
ARG_PERMISSION_MODE='${var.permission_mode}' \
|
ARG_PERMISSION_MODE='${var.permission_mode}' \
|
||||||
ARG_WORKDIR='${local.workdir}' \
|
ARG_WORKDIR='${local.workdir}' \
|
||||||
ARG_AI_PROMPT='${base64encode(var.ai_prompt)}' \
|
ARG_AI_PROMPT='${base64encode(var.ai_prompt)}' \
|
||||||
|
ARG_ENABLE_BOUNDARY='${var.enable_boundary}' \
|
||||||
|
ARG_BOUNDARY_VERSION='${var.boundary_version}' \
|
||||||
|
ARG_BOUNDARY_LOG_DIR='${var.boundary_log_dir}' \
|
||||||
|
ARG_BOUNDARY_LOG_LEVEL='${var.boundary_log_level}' \
|
||||||
|
ARG_BOUNDARY_ADDITIONAL_ALLOWED_URLS='${join(" ", var.boundary_additional_allowed_urls)}' \
|
||||||
|
ARG_BOUNDARY_PROXY_PORT='${var.boundary_proxy_port}' \
|
||||||
|
ARG_CODER_HOST='${local.coder_host}' \
|
||||||
/tmp/start.sh
|
/tmp/start.sh
|
||||||
EOT
|
EOT
|
||||||
|
|
||||||
|
|||||||
@ -188,6 +188,32 @@ run "test_claude_code_permission_mode_validation" {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
run "test_claude_code_with_boundary" {
|
||||||
|
command = plan
|
||||||
|
|
||||||
|
variables {
|
||||||
|
agent_id = "test-agent-boundary"
|
||||||
|
workdir = "/home/coder/boundary-test"
|
||||||
|
enable_boundary = true
|
||||||
|
boundary_log_dir = "/tmp/test-boundary-logs"
|
||||||
|
}
|
||||||
|
|
||||||
|
assert {
|
||||||
|
condition = var.enable_boundary == true
|
||||||
|
error_message = "Boundary should be enabled"
|
||||||
|
}
|
||||||
|
|
||||||
|
assert {
|
||||||
|
condition = var.boundary_log_dir == "/tmp/test-boundary-logs"
|
||||||
|
error_message = "Boundary log dir should be set correctly"
|
||||||
|
}
|
||||||
|
|
||||||
|
assert {
|
||||||
|
condition = local.coder_host != ""
|
||||||
|
error_message = "Coder host should be extracted from access URL"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
run "test_claude_code_system_prompt" {
|
run "test_claude_code_system_prompt" {
|
||||||
command = plan
|
command = plan
|
||||||
|
|
||||||
|
|||||||
@ -17,6 +17,12 @@ ARG_DANGEROUSLY_SKIP_PERMISSIONS=${ARG_DANGEROUSLY_SKIP_PERMISSIONS:-}
|
|||||||
ARG_PERMISSION_MODE=${ARG_PERMISSION_MODE:-}
|
ARG_PERMISSION_MODE=${ARG_PERMISSION_MODE:-}
|
||||||
ARG_WORKDIR=${ARG_WORKDIR:-"$HOME"}
|
ARG_WORKDIR=${ARG_WORKDIR:-"$HOME"}
|
||||||
ARG_AI_PROMPT=$(echo -n "${ARG_AI_PROMPT:-}" | base64 -d)
|
ARG_AI_PROMPT=$(echo -n "${ARG_AI_PROMPT:-}" | base64 -d)
|
||||||
|
ARG_ENABLE_BOUNDARY=${ARG_ENABLE_BOUNDARY:-false}
|
||||||
|
ARG_BOUNDARY_VERSION=${ARG_BOUNDARY_VERSION:-"main"}
|
||||||
|
ARG_BOUNDARY_LOG_DIR=${ARG_BOUNDARY_LOG_DIR:-"/tmp/boundary_logs"}
|
||||||
|
ARG_BOUNDARY_LOG_LEVEL=${ARG_BOUNDARY_LOG_LEVEL:-"WARN"}
|
||||||
|
ARG_BOUNDARY_PROXY_PORT=${ARG_BOUNDARY_PROXY_PORT:-"8087"}
|
||||||
|
ARG_CODER_HOST=${ARG_CODER_HOST:-}
|
||||||
|
|
||||||
echo "--------------------------------"
|
echo "--------------------------------"
|
||||||
|
|
||||||
@ -27,6 +33,12 @@ printf "ARG_DANGEROUSLY_SKIP_PERMISSIONS: %s\n" "$ARG_DANGEROUSLY_SKIP_PERMISSIO
|
|||||||
printf "ARG_PERMISSION_MODE: %s\n" "$ARG_PERMISSION_MODE"
|
printf "ARG_PERMISSION_MODE: %s\n" "$ARG_PERMISSION_MODE"
|
||||||
printf "ARG_AI_PROMPT: %s\n" "$ARG_AI_PROMPT"
|
printf "ARG_AI_PROMPT: %s\n" "$ARG_AI_PROMPT"
|
||||||
printf "ARG_WORKDIR: %s\n" "$ARG_WORKDIR"
|
printf "ARG_WORKDIR: %s\n" "$ARG_WORKDIR"
|
||||||
|
printf "ARG_ENABLE_BOUNDARY: %s\n" "$ARG_ENABLE_BOUNDARY"
|
||||||
|
printf "ARG_BOUNDARY_VERSION: %s\n" "$ARG_BOUNDARY_VERSION"
|
||||||
|
printf "ARG_BOUNDARY_LOG_DIR: %s\n" "$ARG_BOUNDARY_LOG_DIR"
|
||||||
|
printf "ARG_BOUNDARY_LOG_LEVEL: %s\n" "$ARG_BOUNDARY_LOG_LEVEL"
|
||||||
|
printf "ARG_BOUNDARY_PROXY_PORT: %s\n" "$ARG_BOUNDARY_PROXY_PORT"
|
||||||
|
printf "ARG_CODER_HOST: %s\n" "$ARG_CODER_HOST"
|
||||||
|
|
||||||
echo "--------------------------------"
|
echo "--------------------------------"
|
||||||
|
|
||||||
@ -35,6 +47,14 @@ echo "--------------------------------"
|
|||||||
# avoid exiting if the script fails
|
# avoid exiting if the script fails
|
||||||
bash "/tmp/remove-last-session-id.sh" "$(pwd)" 2> /dev/null || true
|
bash "/tmp/remove-last-session-id.sh" "$(pwd)" 2> /dev/null || true
|
||||||
|
|
||||||
|
function install_boundary() {
|
||||||
|
# Install boundary from public github repo
|
||||||
|
git clone https://github.com/coder/boundary
|
||||||
|
cd boundary
|
||||||
|
git checkout $ARG_BOUNDARY_VERSION
|
||||||
|
go install ./cmd/...
|
||||||
|
}
|
||||||
|
|
||||||
function validate_claude_installation() {
|
function validate_claude_installation() {
|
||||||
if command_exists claude; then
|
if command_exists claude; then
|
||||||
printf "Claude Code is installed\n"
|
printf "Claude Code is installed\n"
|
||||||
@ -76,7 +96,47 @@ function start_agentapi() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
printf "Running claude code with args: %s\n" "$(printf '%q ' "${ARGS[@]}")"
|
printf "Running claude code with args: %s\n" "$(printf '%q ' "${ARGS[@]}")"
|
||||||
|
|
||||||
|
if [ "${ARG_ENABLE_BOUNDARY:-false}" = "true" ]; then
|
||||||
|
install_boundary
|
||||||
|
|
||||||
|
mkdir -p "$ARG_BOUNDARY_LOG_DIR"
|
||||||
|
printf "Starting with coder boundary enabled\n"
|
||||||
|
|
||||||
|
# Build boundary args with conditional --unprivileged flag
|
||||||
|
BOUNDARY_ARGS=(--log-dir "$ARG_BOUNDARY_LOG_DIR")
|
||||||
|
# Add default allowed URLs
|
||||||
|
BOUNDARY_ARGS+=(--allow "*anthropic.com" --allow "registry.npmjs.org" --allow "*sentry.io" --allow "claude.ai" --allow "$ARG_CODER_HOST")
|
||||||
|
|
||||||
|
# Add any additional allowed URLs from the variable
|
||||||
|
if [ -n "$ARG_BOUNDARY_ADDITIONAL_ALLOWED_URLS" ]; then
|
||||||
|
IFS=' ' read -ra ADDITIONAL_URLS <<< "$ARG_BOUNDARY_ADDITIONAL_ALLOWED_URLS"
|
||||||
|
for url in "${ADDITIONAL_URLS[@]}"; do
|
||||||
|
BOUNDARY_ARGS+=(--allow "$url")
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set HTTP Proxy port used by Boundary
|
||||||
|
BOUNDARY_ARGS+=(--proxy-port $ARG_BOUNDARY_PROXY_PORT)
|
||||||
|
|
||||||
|
# Set log level for boundary
|
||||||
|
BOUNDARY_ARGS+=(--log-level $ARG_BOUNDARY_LOG_LEVEL)
|
||||||
|
|
||||||
|
# Remove --dangerously-skip-permissions from ARGS when using boundary (it doesn't work with elevated permissions)
|
||||||
|
# Create a new array without the dangerous permissions flag
|
||||||
|
CLAUDE_ARGS=()
|
||||||
|
for arg in "${ARGS[@]}"; do
|
||||||
|
if [ "$arg" != "--dangerously-skip-permissions" ]; then
|
||||||
|
CLAUDE_ARGS+=("$arg")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
agentapi server --allowed-hosts="*" --type claude --term-width 67 --term-height 1190 -- \
|
||||||
|
sudo -E env PATH=$PATH setpriv --inh-caps=+net_admin --ambient-caps=+net_admin --bounding-set=+net_admin boundary "${BOUNDARY_ARGS[@]}" -- \
|
||||||
|
claude "${CLAUDE_ARGS[@]}"
|
||||||
|
else
|
||||||
agentapi server --type claude --term-width 67 --term-height 1190 -- claude "${ARGS[@]}"
|
agentapi server --type claude --term-width 67 --term-height 1190 -- claude "${ARGS[@]}"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
validate_claude_installation
|
validate_claude_installation
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user